Commit Graph

23488 Commits

Author SHA1 Message Date
3632634318 PortalSettings: WhiteLabel: delete useless 2022-08-26 15:11:01 +03:00
524576cb80 PortalSettings: Branding: add paid view 2022-08-25 19:40:21 +03:00
ecb581c969 PortalSettings: Branding: fix styles, add base logic 2022-08-25 19:25:05 +03:00
8ecddf3d8a Web: add translates 2022-08-25 19:24:32 +03:00
a8142c3446 Client: add translates 2022-08-25 19:24:20 +03:00
53fb87beb1 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-08-25 13:35:41 +03:00
cc0e95adf1 PortalSettings: Branding: refactoring 2022-08-25 13:35:32 +03:00
543c6a222d Client: add translates 2022-08-25 13:35:15 +03:00
1354b95534 Client: delete useless translates 2022-08-25 13:00:22 +03:00
2aa0ffa8f2
Merge pull request #760 from ONLYOFFICE/feature/push
Feature/push
2022-08-25 11:32:56 +03:00
1b158e1e5e Merge branch 'develop' into feature/push 2022-08-25 11:22:07 +03:00
6797d04f8a
Merge pull request #772 from ONLYOFFICE/feature/room-filter
Feature/room filter
2022-08-25 11:14:32 +03:00
6ee5cdb0c3 Merge branch 'develop' into feature/room-filter 2022-08-25 10:23:24 +03:00
e2472b392e Files: fix doceditor link 2022-08-24 20:27:20 +03:00
ceedc9a187 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-08-24 20:04:37 +03:00
e9f0da2bd0
Merge pull request #770 from ONLYOFFICE/bugfix/fix-editor-logpath
Bugfix/fix editor logpath
2022-08-24 18:05:48 +03:00
1a17b5734b
Merge branch 'develop' into bugfix/fix-editor-logpath 2022-08-24 18:05:15 +03:00
Artem Tarasov
2b915db425 Web: Doceditor: applied nconf, logPath is now taken from appsettings.services.json 2022-08-24 16:30:37 +03:00
Artem Tarasov
ee757db2a8 Web: Doceditor: added nconf 2022-08-24 16:28:10 +03:00
26128f0bf2
Merge pull request #771 from ONLYOFFICE/bugfix/thirdparty-fix
Bugfix/thirdparty fix
2022-08-24 17:26:00 +04:00
00e580438f Files: fix rename room 2022-08-24 16:13:20 +03:00
3d706635f5 Files: fix rename room 2022-08-24 16:09:43 +03:00
9523560b16 Push: fix api 2022-08-24 14:26:45 +03:00
Artem Tarasov
b8efdefbcd Web: Doceditor: fixed variable name for getting path to logs from environment 2022-08-24 13:35:57 +03:00
ae49029f91 Push: fix api 2022-08-24 13:21:18 +03:00
ed41675476 Firebase: optimization 2022-08-24 12:34:30 +03:00
5967f4db97 Merge branch 'feature/push' of https://github.com/ONLYOFFICE/DocSpace into feature/push 2022-08-24 00:11:05 +03:00
d282aa74f7 Push: fixed message sending function 2022-08-24 00:10:37 +03:00
8f248f6ac2 Push: fix 2022-08-23 23:35:26 +03:00
632d7fbc41 Firebase: model 2022-08-23 20:03:02 +03:00
7be5fd3de7
Merge pull request #768 from ONLYOFFICE/bugfix/room-logo
Bugfix/room logo
2022-08-23 18:05:23 +03:00
0e9099017a
Merge branch 'develop' into bugfix/room-logo 2022-08-23 18:05:14 +03:00
1ae7d3b11d Api: push controller. Removed projects 2022-08-23 18:03:00 +03:00
58b48df3ab Files: added folders only filter for rooms 2022-08-23 17:22:50 +03:00
b633dcb4e6 update DocStore 2022-08-23 17:19:21 +03:00
718d87c7d6 Files: forms. remove caching 2022-08-23 17:16:15 +03:00
0288030406
Merge pull request #769 from ONLYOFFICE/feature/fix-forms
Files: removed oformservice
2022-08-23 17:07:07 +03:00
34232bc735 Files: removed oformservice 2022-08-23 16:34:54 +03:00
e7fa60d13c Merge branch 'develop' into feature/push 2022-08-23 15:32:06 +03:00
53ee8e9e15 Files: fix security 2022-08-23 15:18:37 +03:00
734670404e Files: fix access 2022-08-23 14:55:03 +03:00
4c923b5117 Files: fix access 2022-08-23 14:54:51 +03:00
26d493f498 Push: fix 2022-08-23 14:28:42 +03:00
9162875a60
Merge pull request #766 from ONLYOFFICE/bugfix/rooms
Bugfix/rooms
2022-08-23 14:21:59 +03:00
d059240a00
Merge branch 'develop' into bugfix/rooms 2022-08-23 14:06:46 +03:00
c470b590b9 PortalSettings: WhiteLabel: fix layout 2022-08-23 14:06:39 +03:00
44dd57910f PortalSettings: Branding: fix max width 2022-08-23 14:06:19 +03:00
5e3a65cce3 Client: add translates, remove duplicate 2022-08-23 14:05:56 +03:00
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
971d4960c1 Push: fix 2022-08-23 13:23:00 +03:00