Commit Graph

2891 Commits

Author SHA1 Message Date
be698591d2 Merge branch 'develop' into bugfix/room-logo 2022-12-12 18:07:59 +03:00
965867e3f5 Merge branch 'develop' into feature/fix-whitelable 2022-12-12 17:22:03 +03:00
Timofey Boyko
9004710aca Web:Client:WithFileActions: remove loader while room logo loading 2022-12-12 13:22:16 +03:00
Timofey Boyko
b50ea74177 Web:Client:GlobalEvents: fix createRoom and editRoom events 2022-12-11 23:13:16 +03:00
Timofey Boyko
cd4e427ca4 Web:Client:FilesStore: fix getRoomLogo for first fetch 2022-12-11 23:08:04 +03:00
Timofey Boyko
68324dd5f1 Web: delete useless 2022-12-11 23:02:25 +03:00
Timofey Boyko
c7e4e98aa1 Web:Client:EditRoomEvent: update editRoomEvent with getRoomLogo 2022-12-11 23:02:11 +03:00
Timofey Boyko
9026a4fabc Web:Client:CreateRoomEvent: update createRoomEvent with getRoomLogo 2022-12-11 22:57:27 +03:00
Timofey Boyko
d32a75e42f Web:Client:WithFileActions: update inProgress 2022-12-11 22:56:29 +03:00
Timofey Boyko
c0669e32ee Web:Client:FilesStore: add getRoomLogo method, update fetchRoom with getRoomLogo 2022-12-11 22:55:59 +03:00
Viktor Fomin
0bd6621138 Client: Confirm: fix auth redirect 2022-12-09 12:00:21 +03:00
Viktor Fomin
853240f18f Client: Confirm: fix 2022-12-09 10:40:47 +03:00
Viktor Fomin
bddae03b52 Client: Confirm: add auth confirm page 2022-12-09 10:33:21 +03:00
ea1f2ba1b7 Merge branch 'develop' into feature/socket-newtag 2022-12-07 16:16:59 +03:00
ab4206d8f2 Commented old badges operations 2022-12-07 14:21:54 +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
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
15ff7aa19d Merge branch 'develop' into feature/fix-whitelable 2022-12-06 16:50:55 +03:00
108e73c22a Update FilesStore.js
Fix create file on socket
2022-12-06 14:53:35 +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
f5a16c7e64 Merge branch 'develop' into feature/socket-newtag 2022-12-05 15:55:26 +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
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
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
Viktor Fomin
5dd6833801 Client: PortalSettings: fix 2022-12-02 15:46:08 +03:00
Viktor Fomin
9859db3ced Client: DocSpaceLogo: fix 2022-12-02 15:36:29 +03:00
Viktor Fomin
b8b0fe9139 Merge branch 'develop' into feature/fix-whitelable 2022-12-02 14:55:23 +03:00
0f96d279d3 Fix some UselessTranslationKeysTest issues 2022-12-02 14:28:02 +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
1058e30a9b
Merge pull request #1096 from ONLYOFFICE/combobox-arrow
fixed bug with arrow
2022-12-01 17:56:30 +03:00
Timofey Boyko
73b45d7820 Web:Client:Home: fix filter by subject 2022-12-01 16:53:47 +03:00
4f48b93572 Merge branch 'develop' into feature/accounts-room-list 2022-12-01 15:29:38 +03:00
3e734bb2a1
Merge pull request #1092 from ONLYOFFICE/bugfix/create-room-tag-input
Bugfix/create room tag input
2022-12-01 14:47:08 +03:00
Mushka Nikita
018e9789c2 cleaned up code 2022-12-01 14:45:18 +03:00
3b70343764 Fix NotAllLanguageTranslatedTest issues 2022-12-01 13:38:03 +03:00
Elyor Djalilov
2433ca0705 fixed bug with arrow 2022-12-01 14:28:50 +05:00
Timofey Boyko
e4df954e8e Web: delete console log 2022-12-01 11:55:29 +03:00
Timofey Boyko
04e0d9bf2b Merge branch 'develop' into feature/accounts-room-list 2022-12-01 11:53:22 +03:00
Timofey Boyko
a37f503651 Web:Client:Home: fix filter 2022-12-01 11:51:57 +03:00