Commit Graph

2983 Commits

Author SHA1 Message Date
Mushka Nikita
4cf45e78f1 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-08 13:36:40 +03:00
9a463f9bc8 Web: Files: fixed tile view 2022-12-08 11:56:52 +03:00
Timofey Boyko
2aca92bf3b Web: fix combobox dropdown width for modern view 2022-12-08 11:51:50 +03:00
Timofey Boyko
f2f5c20757 Web:Client: delete console log 2022-12-08 10:54:54 +03:00
Timofey Boyko
3aa3fbfddc Web:Client: delete console log 2022-12-08 10:54:10 +03:00
Timofey Boyko
2a85c31a9e Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-08 10:52:43 +03:00
Timofey Boyko
8747d65400 Web:Client: fix copy link room into room 2022-12-08 10:52:38 +03:00
Akmal Isomadinov
1b0a2e6f32 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-08 11:43:44 +05:00
Akmal Isomadinov
1228ff5026 Web:Client:Components: Fixed empty container 2022-12-08 11:43:18 +05:00
4affc5f58f Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 18:50:14 +03:00
Timofey Boyko
c868251a53 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 16:24:44 +03:00
Timofey Boyko
eb85bca282 Web:Client:Accounts: fix open room list at desktop editors 2022-12-07 16:24:39 +03:00
a03b50bd7c Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 16:20:29 +03:00
ea1f2ba1b7 Merge branch 'develop' into feature/socket-newtag 2022-12-07 16:16:59 +03:00
Timofey Boyko
8195f804a6 Web:Client:Accounts: delete useless TODO 2022-12-07 14:40:07 +03:00
Timofey Boyko
6a628d1407 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 14:38:38 +03:00
Timofey Boyko
294d1eeee8 Web:Client:Accounts: update filter clicked for paid badge 2022-12-07 14:38:32 +03:00
8c8f9e4f22 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 14:29:37 +03:00
017bb3da76 Web: CreateEditRoomDialog: Added theme provider to the link. 2022-12-07 14:29:17 +03:00
ab4206d8f2 Commented old badges operations 2022-12-07 14:21:54 +03:00
Timofey Boyko
de98bd954c Web:Client:Accounts: fix clear search for empty screen 2022-12-07 14:11:18 +03:00
Timofey Boyko
af4544267f Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 13:13:40 +03:00
Timofey Boyko
da0362fa84 Web:Client:InfoPanel: fix icon for files item title 2022-12-07 13:13:36 +03:00
d3976cff14 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 12:46:46 +03:00
895995f8bb Web: Files: fixed group-menu styles, added new translation Pin 2022-12-07 12:46:32 +03:00
Timofey Boyko
29f5925b89 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 12:35:00 +03:00
Timofey Boyko
1278f5e722 Web:Client: fix double tab at desktop editors 2022-12-07 12:29:28 +03:00
Elyor Djalilov
1c98049afe fix color 2022-12-07 14:21:00 +05:00
Elyor Djalilov
cd75b1a668 fixed display tooltip 2022-12-07 14:12:26 +05:00
Elyor Djalilov
a687cd3152 fix color 2022-12-07 13:57:22 +05:00
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
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
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
7cc108a13e Web: GlobalEvents: Fixed after merge. 2022-12-07 11:00:26 +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
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
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
f57215053a Web: Fixed icons hover. 2022-12-06 15:54:24 +03:00
108e73c22a Update FilesStore.js
Fix create file on socket
2022-12-06 14:53:35 +03:00
2b2927f40d Web: Components: ComboBox: fixed dark theme 2022-12-06 14:04:15 +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
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
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
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
Viktor Fomin
68a074da10 Client: Profile: fix 2022-12-05 15:41:38 +03:00
02b5e6e938 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 14:49:30 +03:00
83c1946399 Web: PortalSettings: Security: Fixed styles. 2022-12-05 14:49:24 +03:00
Viktor Fomin
6174c37676 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 14:13:26 +03:00
Viktor Fomin
02a7f78d3e Client: Profile: ActiveSessions: fix color 2022-12-05 14:12:46 +03:00
bd040302c7 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 14:07:59 +03:00
1a60d4ed39 Web: PortalSettings: Backup: Fixed styles. 2022-12-05 14:07:35 +03:00
Viktor Fomin
39f03f1d5f Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 14:07:09 +03:00
Viktor Fomin
c2712f33e4 Client: Profile: ActiveSessions: fix color 2022-12-05 14:07:00 +03:00
26ca74b440 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 13:47:01 +03:00
78cac85e69 Web: PortalSettings: Deleted useless code. 2022-12-05 13:42:54 +03:00
bc01d0ef49 Web: Added new icon for payment page. 2022-12-05 13:38:29 +03:00
d01a3b8af9 Web: PortalSettings: Payments: Fixed styles. 2022-12-05 13:34:14 +03:00
Viktor Fomin
a449330c35 Client: Profile: fix color 2022-12-05 13:22:53 +03:00
c3a7e4d02c Web: Files: removed portal settings title 2022-12-05 11:39:03 +03:00
9a654120a3 Web: Files: removed Rooms title 2022-12-05 11:22:00 +03:00
af22ce1b55 Web: Components: fixed badges theme 2022-12-05 11:12:47 +03:00
2cd587a829 Web: Files: fixed edit room dialog 2022-12-05 09:51:13 +03:00
8e0bc0a732 Merge branch 'develop' into release/rc-v1.2.0 2022-12-02 19:56:43 +03:00
c3578d1661 Fix EnDublicatesByContentTest issues 2022-12-02 18:58:36 +03:00
d683aa65b3 Fix all UselessTranslationKeysTest issues 2022-12-02 18:33:25 +03:00
Mushka Nikita
e5ebca27ee Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-02 17:39:48 +03:00
Mushka Nikita
b4dcc58d4f cleaned up code 2022-12-02 17:34:10 +03:00
Mushka Nikita
51e687d8d7 after-merge fixes 2022-12-02 17:27:39 +03:00
Mushka Nikita
131d8bcf50 Merge branch 'feature/new-docspace-translations' of github.com:ONLYOFFICE/AppServer into feature/new-docspace-translations 2022-12-02 17:27:19 +03:00
Mushka Nikita
35aafe6058 fixed createRoomDialog translations 2022-12-02 17:18:30 +03:00
fa4674f2b0 Web: Files: FormGallery: fixed tiles display 2022-12-02 17:12:04 +03:00
dd4260acaa Update Settings.json
Fix NotFoundKeysTest issues
2022-12-02 17:02:55 +03:00
b73c4a8762 Web: Removed useless translations 2022-12-02 16:29:52 +03:00
c0d1645b45 Fix some UselessTranslationKeysTest issues 2022-12-02 15:56:05 +03:00
Akmal Isomadinov
72a7240cb8 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-02 17:03:01 +05:00
Akmal Isomadinov
a38a85ebbf Web:Client:Components:GlobalEvents:EditRoomEvent Added reloadSelection for update state info panel 2022-12-02 17:00:49 +05:00
Akmal Isomadinov
195a3ce167 Web:Client:Store:FilesStore Added updateSelection method and duplicate methods removed 2022-12-02 16:59:46 +05:00
0f96d279d3 Fix some UselessTranslationKeysTest issues 2022-12-02 14:28:02 +03:00
Viktor Fomin
5293738b49 Client: Confirm: CreateUser: fix style 2022-12-01 19:07:19 +03:00
80273d8392 Fix NotFoundKeysTest issues 2022-12-01 18:55:05 +03:00
b0a8c93054 Merge branch 'develop' into feature/new-docspace-translations 2022-12-01 18:43:19 +03:00
Viktor Fomin
ae9e16238b Client: Confirm: fix style 2022-12-01 18:32:59 +03:00
Viktor Fomin
05db34e801 Client: Confirm: delete useless 2022-12-01 18:31:25 +03:00
Viktor Fomin
c4d5f3b5ff Client: Confirm: get data from store 2022-12-01 18:27:46 +03:00
Viktor Fomin
2c9c5a7dfc Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-01 18:09:28 +03:00