Commit Graph

557 Commits

Author SHA1 Message Date
ded92c5d3e
Merge pull request #25 from apuc/NotesAdd
Notes add
2019-12-06 08:55:56 +02:00
Leorne
5cff041241 fix links to not exists files 2019-12-05 17:20:25 +03:00
Leorne
5ebdc16a8a note files data 2019-12-05 17:03:00 +03:00
Leorne
f7177975a8 add Notes 2019-12-05 15:05:33 +03:00
2279783ca8
Merge pull request #24 from apuc/show_user_info
Show user info
2019-11-26 15:06:05 +02:00
Glambertessa
6dec3dfbd0 Merge branch 'master' of https://github.com/apuc/guild into show_user_info 2019-11-18 17:43:46 +03:00
Glambertessa
76decb4fd8 Перенос кнопки Добавить 2019-11-18 17:43:29 +03:00
8515317562
Merge pull request #23 from apuc/show_user_info
Show user info
2019-11-18 16:40:20 +02:00
Glambertessa
1ee8f198ac Настроен behaviors для профиля 2019-11-18 17:04:32 +03:00
Glambertessa
028cce3bef Редактирование skills 2019-11-18 16:14:06 +03:00
Glambertessa
6037c69b85 меню фронтенд 2019-11-18 13:39:26 +03:00
Glambertessa
2ff6ed6414 Merge branch 'master' of https://github.com/apuc/guild into show_user_info 2019-11-18 13:33:22 +03:00
Glambertessa
3f7507918f Информация о пользователе 2019-11-18 13:33:08 +03:00
14044057e3
Merge pull request #22 from apuc/show_user_info
Информация о пользователе frontend
2019-11-18 12:23:43 +02:00
Glambertessa
772b93b321 Информация о пользователе frontend 2019-11-18 13:22:20 +03:00
dcfdaa6c30
Merge pull request #21 from apuc/show_user_info
Show user info
2019-11-18 12:08:28 +02:00
Glambertessa
5ecee3cb65 Merge branch 'master' of https://github.com/apuc/guild into show_user_info 2019-11-18 13:07:16 +03:00
Glambertessa
3d9bbb6744 Информация о пользователе, генерация связей 2019-11-18 13:06:54 +03:00
d35ebc680b
Merge pull request #20 from apuc/show_user_info
Show user info
2019-11-18 09:58:18 +02:00
Glambertessa
6640bf5ed9 информация о пользователе 2019-11-18 10:55:53 +03:00
Glambertessa
1f9ddd8c09 информация о пользователе 2019-11-18 10:36:13 +03:00
c9baee8d5a
Merge pull request #19 from apuc/user_generate
User generate
2019-11-15 13:30:50 +02:00
Glambertessa
d134757c97 меню 2019-11-15 13:46:13 +03:00
Glambertessa
4cf54e2ba6 меню 2019-11-15 13:25:48 +03:00
Glambertessa
18ce2ce5fc модуль генерации пользователей с secure 2019-11-14 17:36:26 +03:00
Glambertessa
f8222eb89c модуль генерации пользователей 2019-11-14 17:21:34 +03:00
601b62aa8d
Merge pull request #18 from apuc/access
access - модуль
2019-10-23 10:39:43 +03:00
34dd9f3f37 access - модуль 2019-10-22 18:03:40 +03:00
562c4a925e
Merge pull request #17 from apuc/add_holidays
Add holidays
2019-09-05 17:52:04 +03:00
SoHardKI
137325e9b1 Merge branch 'master' of https://github.com/apuc/guild into add_holidays 2019-09-05 17:37:03 +03:00
SoHardKI
2a01641346 fix resume in user-card 2019-09-05 17:36:54 +03:00
9daff7afb3
Merge pull request #16 from apuc/add_holidays
add_download
2019-07-26 16:23:00 +03:00
SoHardKI
53eea4d130 add_download 2019-07-26 16:21:32 +03:00
bf52f0b048
Merge pull request #15 from apuc/add_holidays
Add holidays
2019-07-26 16:03:44 +03:00
SoHardKI
e8adc409c0 Merge branch 'master' of https://github.com/apuc/guild into add_holidays 2019-07-26 16:02:43 +03:00
SoHardKI
2b474916fd add_download 2019-07-26 16:02:35 +03:00
6409bca752
Merge pull request #14 from apuc/add_holidays
Add holidays
2019-07-26 15:34:16 +03:00
SoHardKI
a0ad962474 Merge branch 'master' of https://github.com/apuc/guild into add_holidays 2019-07-26 15:31:58 +03:00
SoHardKI
ea96cfe152 add_file_input 2019-07-26 15:31:39 +03:00
SoHardKI
9560efc7bc add_clone_button 2019-07-26 12:32:43 +03:00
4dc254d38e
Merge pull request #13 from apuc/add_holidays
fixes
2019-07-16 12:26:04 +03:00
SoHardKI
c719266a22 fixes 2019-07-16 12:25:00 +03:00
4d7774620d
Merge pull request #12 from apuc/add_holidays
Add holidays
2019-07-16 12:17:33 +03:00
SoHardKI
3d915d77bc fixes 2019-07-16 12:16:13 +03:00
SoHardKI
c708dd902a Merge branch 'master' of https://github.com/apuc/guild into add_holidays 2019-07-16 11:58:25 +03:00
SoHardKI
e961c3f35f add_holidays 2019-07-16 11:58:05 +03:00
ff423ab723
Merge pull request #11 from apuc/change_profile
Change profile
2019-07-05 13:15:21 +03:00
SoHardKI
3af5bcab71 Merge branch 'master' of https://github.com/apuc/guild into change_profile 2019-07-05 11:25:35 +03:00
SoHardKI
bd1f4f6828 fix_filter_balance 2019-07-05 11:25:15 +03:00
555686ea96
Merge pull request #10 from apuc/change_profile
Change profile
2019-07-04 13:11:30 +03:00