Commit Graph

182 Commits

Author SHA1 Message Date
akosse
3de2cb7a4a fix parameters error 2020-01-23 16:53:37 +03:00
79f9c9338c
Merge pull request #31 from apuc/sum_and_calendar
backend change password
2020-01-23 15:42:55 +03:00
akosse
dfbcdbae6e backend change password 2020-01-23 13:16:54 +03:00
56a22f6f1c
Merge pull request #30 from apuc/sum_and_calendar
change password
2020-01-22 18:00:18 +03:00
akosse
8322d58066 change password 2020-01-22 12:18:03 +03:00
45b6bb480a
Merge pull request #29 from apuc/sum_and_calendar
Sum and calendar
2020-01-21 17:47:24 +03:00
akosse
cb10af1bce user card edit form 2020-01-21 17:46:03 +03:00
akosse
6880eaa2ba accesses new 2020-01-21 17:33:07 +03:00
akosse
188758c79c bd calendar and salary sum 2020-01-17 16:28:25 +03:00
akosse
88b0b13a2a theme & comment 2019-12-10 17:22:20 +03:00
3264f1c944
Merge pull request #28 from apuc/NotesAdd
Notes add
2019-12-09 17:29:58 +02:00
Leorne
34e56f9fcc remove descriptions from notes list 2019-12-09 17:25:43 +03:00
Leorne
8200544531 cities for profiles 2019-12-09 10:54:39 +03:00
ff5f421d9c
Merge pull request #27 from apuc/NotesAdd
Notes add
2019-12-06 16:01:07 +02:00
Leorne
86b5476998 default file image 2019-12-06 15:40:57 +03:00
Leorne
7b7fa6c51d spaces and symbols in files names 2019-12-06 15:40:41 +03:00
Leorne
deee41345d spaces and symbolse in files names 2019-12-06 15:39:19 +03:00
b27a033802
Merge pull request #26 from apuc/NotesAdd
Notes add
2019-12-06 13:50:27 +02:00
Leorne
8c1c2cf5cd change accesses table access column to text type 2019-12-06 13:46:06 +03:00
Leorne
888080229a left bar company active fix and add icons 2019-12-06 13:28:22 +03:00
Leorne
325d247006 left bar company active fix and add icons 2019-12-06 12:55:04 +03:00
Leorne
a8e2543313 translate buttons and breadcrumbs 2019-12-06 12:05:14 +03:00
Leorne
48001992ff view items translate 2019-12-06 11:30:11 +03:00
Leorne
75d0b2191e FieldsValueNew some refactoring 2019-12-06 11:11:31 +03:00
Leorne
9db4ea8abd addition fields images 2019-12-06 11:06:21 +03:00
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