Commit Graph

28972 Commits

Author SHA1 Message Date
6909826eb5 Update package.json
Restore default client api origin
2022-12-06 21:49:42 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
d295f82b8f Update FilesStore.js
Extended logging
2022-12-06 17:47:30 +03:00
fa863d3055 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-06 17:29:26 +03:00
a976c1523a Web: Components: Scroll: fixed theme colors 2022-12-06 17:29:20 +03:00
f52d67b1a8 Update FilesStore.js
Fix negative badge count
2022-12-06 17:18:25 +03:00
Viktor Fomin
5e23a21b4e Client: PortalSettings: SSO: fix style 2022-12-06 16:46:08 +03:00
eac08833bb Web: PortalSettings: Restore: Fixed text color. 2022-12-06 16:33:10 +03:00
1a257527d5
Merge pull request #1108 from ONLYOFFICE/feature/desktop-editors-nginx-config
feature/desktop editors nginx config
2022-12-06 16:07:48 +03:00
151962311b Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-06 15:57:39 +03:00
Timofey Boyko
0ca58b19fe Add nginx location for open docspace at desktop editors 2022-12-06 15:57:19 +03:00
f57215053a Web: Fixed icons hover. 2022-12-06 15:54:24 +03:00
7d0cc5a396
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
Bugfix/room admin permissions
2022-12-06 15:22:47 +03:00
108e73c22a Update FilesStore.js
Fix create file on socket
2022-12-06 14:53:35 +03:00
Viktor Fomin
49bb0be1de Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-06 14:05:06 +03:00
Viktor Fomin
b73c4e1968 Components: CatalogItem: fix color 2022-12-06 14:04:42 +03:00
Viktor Fomin
40f199211d Components: Themes: add colors 2022-12-06 14:04:26 +03:00
bcdd69decc Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-06 14:04:20 +03:00
2b2927f40d Web: Components: ComboBox: fixed dark theme 2022-12-06 14:04:15 +03:00
Viktor Fomin
81c9aae6de Components: Combobox: align arrow 2022-12-06 13:44:28 +03:00
c74d98edb9 Web: Files: fixed arrow icon 2022-12-06 12:27:32 +03:00
6db14e1da7 Update FilesStore.js
Added update of root folders on new count changes
2022-12-06 10:49:14 +03:00
42b376dd8d Web.Core: changed permissions validation logic 2022-12-06 01:58:15 +03:00
2d1a5f1fb2 Web.Api: changed permissions validation logic 2022-12-06 01:58:03 +03:00
837cee5b8f People: changed permissions validation logic 2022-12-06 01:57:55 +03:00
346c8d08e3 Core.Common: changed permissions validation logic 2022-12-06 01:57:45 +03:00
1596b4392b Core.Common: added rules matching support 2022-12-06 01:55:33 +03:00
3ee45f256b Core.Common: added new secuirty objects 2022-12-06 01:55:13 +03:00
6202e65932 Core.Common: added default rules 2022-12-06 01:54:35 +03:00
cd23ed5efc Core.Common: added rule 2022-12-06 01:54:18 +03:00
5e026445f5 Core.Common: added check for default rules 2022-12-06 01:49:57 +03:00
52f77ac06b Common: added interface IRuleData 2022-12-06 01:48:02 +03:00
68cde355e7 Update FilesStore.js
Added setup file status new
2022-12-05 22:22:38 +03:00
f9a863f6dd Update FilesStore.js
Added setup folder new count
2022-12-05 22:08:51 +03:00
26b5290de5 Update EmptyFolderContainer.js
Simplified condition
2022-12-05 20:02:36 +03:00
850d39a789 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 19:24:07 +03:00
ec5439b97e Update EmptyFolderContainer.js
Fix detect of root room empty screen
2022-12-05 19:23:58 +03:00
54a6eb9eec Update Files.json
Removed !
2022-12-05 19:23:23 +03:00
Akmal Isomadinov
f15eddf917 Web:Common:Componnets:ColorTheme:Styled:Button Fix: removed the accent color from the ghost button 2022-12-05 21:12:14 +05:00
b453f4f904 Merge branch 'develop' into release/rc-v1.2.0 2022-12-05 18:50:20 +03:00
ad2a28c109 Update yarn.lock 2022-12-05 18:50:01 +03:00
9bfb819505 Web: Components: AccessRightSelect: Added ColorTheme property for badge 2022-12-05 18:27:34 +03:00
Akmal Isomadinov
3ab0eb4391 Web:Components: Removed accent color from input component 2022-12-05 19:27:54 +05:00
7afd2775d5 Web: Components: AccessRightSelect: Fixed description color 2022-12-05 17:09:58 +03:00
39d4e2bd4d Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 16:57:46 +03:00
6a3fb0717d Web: Components: Checkbox: Fixed theme usage 2022-12-05 16:57:38 +03:00
3a6b699a96 Web: Files: fixed tiles theme 2022-12-05 16:31:25 +03:00
337a1969e4 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 16:07:49 +03:00
49d8146cfd Web: Files: fixed rooms tile 2022-12-05 16:07:40 +03:00
f5a16c7e64 Merge branch 'develop' into feature/socket-newtag 2022-12-05 15:55:26 +03:00