Commit Graph

7445 Commits

Author SHA1 Message Date
07425ded19
Merge pull request #728 from ONLYOFFICE/feature/rooms-filter
Feature/rooms filter
2022-07-20 15:17:12 +04:00
mushka
628959b1c4 Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign 2022-07-19 17:47:54 +03:00
mushka
2f774803f4 added close button to Connecting account dialog 2022-07-19 17:47:17 +03:00
067e105814 Merge branch 'develop' into feature/modal-redesign 2022-07-19 16:58:02 +03:00
1d0db523a8 Merge branch 'develop' into feature/rooms-filter 2022-07-18 17:27:57 +03:00
e849ccd635 Files: refactor 2022-07-18 17:15:17 +03:00
cab55d68f3 Files: fix filter, refactor, removed unnecessary 2022-07-18 17:11:50 +03:00
fe993907ad Merge branch 'feature/modal-redesign' of https://github.com/ONLYOFFICE/AppServer into feature/add-17keys 2022-07-15 15:09:49 +03:00
bb51d53cc4 add new keys-17 2022-07-15 15:02:07 +03:00
d8980cc3a7 fix 57917 2022-07-14 20:00:43 +03:00
mushka
d106647ecf tweaked DownloadDialog and fixed overall aside body scroll 2022-07-14 17:45:18 +03:00
mushka
1b895976f5 fixed DownloadAs panel 2022-07-14 17:26:21 +03:00
ee9e381b26 fixed async 2022-07-13 20:09:43 +03:00
mushka
41731b9b36 removed Move translation key 2022-07-13 18:07:41 +03:00
mushka
f63c570349 fixed ConvertDialog translations 2022-07-13 17:55:30 +03:00
mushka
25941ceb50 fixed missed translation key bug in ConflictResolve dialog 2022-07-13 16:02:11 +03:00
mushka
523b974fc5 deleted unused translation keys 2022-07-13 15:26:52 +03:00
552d2adda8 Files: deleted unnecessary 2022-07-13 13:42:40 +03:00
256885f4e3 Files: fix, deleted unnecessary 2022-07-13 13:42:17 +03:00
ea00433ff1 Files: tests. refactoring 2022-07-13 13:00:08 +03:00
120a57c1bf Merge branch 'develop' into feature/room_tests 2022-07-13 11:56:48 +03:00
e7831d9b94 Files: moved parameter from body to query 2022-07-13 11:47:15 +03:00
06a98c508e Merge branch 'develop' into feature/room_tests
# Conflicts:
#	.gitignore
2022-07-12 22:48:47 +03:00
a8ba7ae685 removed logo test 2022-07-12 22:44:10 +03:00
a2129001c9 Files: added withoutTags, withoutMe parameters, refactor 2022-07-12 19:25:34 +03:00
bab140aaf3 Files: reworked rooms filter, added withoutTags, withoutMe parameters 2022-07-12 19:24:39 +03:00
mushka
30ed90b8e9 Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign 2022-07-12 18:25:36 +03:00
mushka
9242d571b8 deleted InfoPanel/views folder 2022-07-12 18:25:21 +03:00
536282eaf3 Merge branch 'develop' into feature/modal-redesign 2022-07-12 17:53:37 +03:00
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +03:00
72b00ffe94 Merge branch 'develop' into feature/modal-redesign 2022-07-12 14:24:11 +03:00
fa8898d522 Files: fixed converter 2022-07-12 14:18:26 +03:00
mushka
96e85f9cb3 Merge branch 'develop' into feature/modal-redesign 2022-07-12 12:34:43 +03:00
b2b55bfa5b fixed subfolders method 2022-07-11 22:22:56 +03:00
mushka
75a3a741c6 fixed SelectFile and SelectFolder styles 2022-07-11 21:20:52 +03:00
mushka
35bde337bc fixed dialogs for create and rename global actions 2022-07-11 19:31:59 +03:00
mushka
9d13e3a4c4 Merge branch 'develop' into feature/modal-redesign 2022-07-11 17:39:20 +03:00
TimofeyBoyko
58bd9509a1 Web:Files:Hocs: fix keyup on create docx after merge 2022-07-11 17:13:51 +03:00
1face3ea40 Files: added searching rooms without tags only 2022-07-11 17:13:30 +03:00
TimofeyBoyko
a0651ecca4 Web:Files:HOCs: fix create operation with hotkeys 2022-07-11 16:36:46 +03:00
TimofeyBoyko
91ca312871 Merge branch 'develop' into feature/create-from-modal 2022-07-11 14:51:45 +03:00
45ae2510ab Merge branch 'bugfix/fix-rooms-filter' into feature/rooms-api 2022-07-11 13:41:43 +03:00
70c1476686 Files: added sorting by room type/tags 2022-07-08 17:31:37 +03:00
mushka
58e68c1c12 Merge branch 'develop' into feature/modal-redesign 2022-07-08 17:23:02 +03:00
63c2c34d44 refactoring tests 2022-07-08 15:31:07 +03:00
mushka
3facc47665 removed reasssign data link and unuseful comment from DeleteUser and ConnectCloud 2022-07-08 12:50:44 +03:00
0504838691 fix tests 2022-07-08 11:46:34 +03:00
mushka
89dd7ab365 fixed translations, styles and dark theme for ConnectCloud 2022-07-07 19:25:31 +03:00
b8a2cf5292 Files: update docstore submodule
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
2022-07-07 18:11:42 +03:00
c8458858e0 Merge branch 'develop' into feature/room_tests 2022-07-07 17:56:40 +03:00