Commit Graph

1219 Commits

Author SHA1 Message Date
NikolayRechkin
e42ae50254 Calendar: core: api 2020-03-16 11:41:25 +03:00
NikolayRechkin
3ccf3d3845 Calendar: core: api 2020-03-13 11:53:32 +03:00
NikolayRechkin
e150f0e271 Calendar: core: api 2020-03-12 14:45:21 +03:00
NikolayRechkin
1d340c569a Calendar: core: api 2020-03-11 16:18:32 +03:00
NikolayRechkin
32dbfbb2b8 Calendar: core: api 2020-03-10 15:52:20 +03:00
NikolayRechkin
de7c2c8bb4 Calendar: core: api 2020-03-10 14:49:09 +03:00
NikolayRechkin
7fdde32785 Calendar: core: api 2020-03-10 11:05:31 +03:00
NikolayRechkin
f4f7630f77 Calendar: core: fix api 2020-03-10 10:08:37 +03:00
NikolayRechkin
b262f8f705 Calendar: core: api 2020-03-06 13:44:26 +03:00
NikolayRechkin
005d287f1e Merge branch 'master' into feature/calendar 2020-03-06 10:02:14 +03:00
NikolayRechkin
84ae709049 Calendar: core: api. event creation 2020-03-06 09:56:05 +03:00
c780a881df Files: fixed removing file method 2020-03-04 10:42:43 +03:00
NikolayRechkin
8d1ac41176 Calendar: core: api 2020-03-03 15:29:07 +03:00
697b03ab6f Files: fixed @share 2020-02-27 18:25:59 +03:00
NikolayRechkin
3eb42ee5a6 Calendar: core: fixed a wrappers 2020-02-27 17:15:25 +03:00
NikolayRechkin
edf8915867 Merge branch 'master' into feature/calendar 2020-02-27 16:52:11 +03:00
4e0fef6c95 Files: Fixed product path 2020-02-27 13:46:16 +03:00
3ac06f934d Files: fix 2020-02-27 11:51:05 +03:00
NikolayRechkin
8cced60123 Calendar: core: api 2020-02-27 11:50:06 +03:00
9a1a118f79 Merge branch 'master' into feature/elastic 2020-02-27 11:24:14 +03:00
190341c716 Files: renamed filescontroller 2020-02-27 11:22:42 +03:00
cae7c0f8c1 Web: People: fixed translation files 2020-02-27 11:12:11 +03:00
00e5f0c9cf Web: People: added truncate prop to checkbox, added border to users list container 2020-02-26 16:18:55 +03:00
888d735790 Web: People: fixed user list styles 2020-02-26 15:35:12 +03:00
d33895d8d5 Web: People: added custom scroll to list users 2020-02-26 15:26:54 +03:00
dcff29c806 File: FileStorageService renamed 2020-02-26 14:52:55 +03:00
NikolayRechkin
c18543485b Merge branch 'master' into feature/calendar 2020-02-26 14:46:42 +03:00
NikolayRechkin
44ea8db96f Calendar: core: api 2020-02-26 14:44:32 +03:00
1b4198b36d Files: ProductEntryPoint 2020-02-26 14:34:27 +03:00
c1c8bab59d Files: api 2020-02-26 13:01:12 +03:00
a192178156 Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic 2020-02-26 11:06:55 +03:00
a78dad4064 web: files: Fixed proxy configure for images and socketjs 2020-02-26 11:04:26 +03:00
044147baa4 web: files: Added nav.log svgs 2020-02-26 11:02:55 +03:00
1bc8f58df4 Merge branch 'master' into feature/user-actions-changes 2020-02-26 10:55:17 +03:00
ac5017da99 Merge branch 'master' into feature/elastic
# Conflicts:
#	build/build.bat
#	build/rebuild.bat
2020-02-26 10:46:37 +03:00
e4af4d168f Update yarn.lock files 2020-02-26 10:23:38 +03:00
2ccd226940 web: clients: Fixed CRA proxy bug; 2020-02-26 10:02:37 +03:00
30dbb2a6ca Web: People: added send email function 2020-02-25 16:58:34 +03:00
NikolayRechkin
0c1f99005d Calendar: core: fixed a wrappers 2020-02-25 16:36:20 +03:00
935772d783 Web: People: renamed DeleteGroupUsersDialog to DeleteUsersDialog 2020-02-25 16:20:48 +03:00
35e2e20049 Files: added model 2020-02-25 15:21:48 +03:00
31dc839d22 web: Files: Fixed load Files home page 2020-02-25 14:47:50 +03:00
48513d7356 Web: People: renamed an array of users 2020-02-25 14:20:35 +03:00
fa4a088692 Web: People: fixed onChange checkbox function 2020-02-25 14:18:28 +03:00
e476681495 Web: People: added display of all users in the list in DeleteGroupUsersDialog, fixed display of the list of users 2020-02-25 13:14:44 +03:00
d9522e48ef Web: People: added display of all users in the list in ChangeUserStatusDialog, fixed display of the list of users 2020-02-25 11:58:04 +03:00
ce312b16c1 Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic 2020-02-25 11:56:50 +03:00
af40cd8ca7 web: files: Fixed TypeError [ERR_INVALID_ARG_TYPE]: The "path" argument must be of type string. Received type undefined 2020-02-25 11:56:41 +03:00
8737369a1c Web: People: added display of all users in the list in ChangeUserTypeDialog, fixed display of the list of users 2020-02-25 11:35:34 +03:00
ee31bb29b5 Web: People: fixed dialog class names 2020-02-25 11:32:17 +03:00