Commit Graph

29239 Commits

Author SHA1 Message Date
Elyor Djalilov
6cd251efe0 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 13:48:11 +05:00
Elyor Djalilov
56eff4a55b fix color 2022-12-07 13:47:58 +05:00
35f694e722 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 11:39:50 +03:00
d2538e677e Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 11:38:47 +03:00
Viktor Fomin
8ef407a8ed Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 11:38:44 +03:00
Viktor Fomin
a6bdce28c8 Client: CreateEditRoomDialog: TagInput: fix style 2022-12-07 11:38:39 +03:00
918bd1cc0b Web: Added color for filter tags on hover, change color for dark theme. 2022-12-07 11:38:26 +03:00
Viktor Fomin
eb37008dd4 Components: Themes: add colors 2022-12-07 11:38:09 +03:00
Akmal Isomadinov
510adbf43e Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 13:35:25 +05:00
Akmal Isomadinov
b38fd74f7d Web:Client:Pages:Home:Section:Filter Fixed warning, removed duplicate item 2022-12-07 13:35:13 +05:00
Elyor Djalilov
29663b39af Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 13:04:55 +05:00
Elyor Djalilov
e45a063e22 fixed display tooltip 2022-12-07 13:04:49 +05:00
641dc357b4 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 11:00:40 +03:00
7cc108a13e Web: GlobalEvents: Fixed after merge. 2022-12-07 11:00:26 +03:00
721f50e95d Files: fix new tag 2022-12-07 10:53:45 +03:00
Timofey Boyko
8d6c2cdb9e Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 10:53:05 +03:00
Timofey Boyko
6b94bf83a4 Web:Common:Navigation: fix height for desktop editors for open navigation 2022-12-07 10:53:01 +03:00
4d090c4873 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 10:27:02 +03:00
dfd3f8a6ce Web: Components: Added a component update if the isDisable parameter was changed. 2022-12-07 10:26:43 +03:00
Akmal Isomadinov
b1aa666620 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 12:13:42 +05:00
Akmal Isomadinov
7698f5694f Web:Components Fixed the color of the filter icon and sorting on hover 2022-12-07 12:13:30 +05:00
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
Viktor Fomin
402be13e4e Client: PortalSettings: Branding: fix colors 2022-12-06 18:42:08 +03:00
Viktor Fomin
cb42aeef3c Components: Themes: add colors 2022-12-06 18:41:54 +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
89ef1ab18b Components: Themes: fix colors 2022-12-06 16:55:21 +03:00
Viktor Fomin
2b784607ee Components: Themes: fix color 2022-12-06 16:53:46 +03:00
Viktor Fomin
15ff7aa19d Merge branch 'develop' into feature/fix-whitelable 2022-12-06 16:50:55 +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