Commit Graph

23783 Commits

Author SHA1 Message Date
62ff488d63
Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 16:28:48 +03:00
39a6776066 Web: Files: fixed Tile view 2022-08-29 16:18:18 +03:00
2d91c42194 Web: Files: fixed filterTotal 2022-08-29 16:13:24 +03:00
20b6c667fd Web: Files: fixed roomsFilter total 2022-08-29 15:49:02 +03:00
f9c40397d5 Web: Files: restore hasMoreFiles logs 2022-08-29 15:43:52 +03:00
8f28612519 Web: Files: fixed hasMoreFiles 2022-08-29 15:41:13 +03:00
34969029a0 fixed warnings 2022-08-29 15:27:50 +03:00
d4ebaa1b49 Web: Files: added logs to hasMoreFiles 2022-08-29 14:39:30 +03:00
3e6c19221f Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 14:01:52 +03:00
a16d23d32e Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2022-08-29 14:00:31 +03:00
3413367480
Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 12:21:19 +03:00
8ad2cc8eb8
Merge pull request #774 from ONLYOFFICE/bugfix/sharpbox
Bugfix/sharpbox
2022-08-29 12:06:01 +03:00
16c7d80398 Files: fix root files 2022-08-29 11:57:48 +03:00
ab654bc889 Web: Fix same key duplication warning 2022-08-29 11:33:52 +03:00
24ece95419 Web: Fix invalid plugins check on login 2022-08-29 11:29:08 +03:00
a8972c7cba Files: fix rooms sorting 2022-08-29 10:47:54 +03:00
d11e228792 Merge branch 'develop' into bugfix/sharpbox 2022-08-29 10:27:50 +03:00
8abc7f4095 Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 09:51:34 +03:00
85b3b3b570
Merge pull request #761 from ONLYOFFICE/feature/docspace-backup
Feature/docspace backup
2022-08-26 19:03:56 +03:00
a9b8a64e61 Web: Added translation for rooms module. 2022-08-26 18:59:28 +03:00
ed5f62a877 Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
2022-08-26 18:48:20 +03:00
d084a0e709
Merge pull request #767 from ONLYOFFICE/feature/system-plugin-v2
Feature/plugin system
2022-08-26 18:19:43 +03:00
51e814a52c
Merge branch 'develop' into feature/system-plugin-v2 2022-08-26 18:18:39 +03:00
899d103639 Web: Restored work of auto-changelog and debug-info with local packages/auto-changelog-2.3.1.tgz 2022-08-26 17:59:52 +03:00
45f83c070c Web: Fixed tree. 2022-08-26 17:59:51 +03:00
8e24f343a7 Web: Renamed files. 2022-08-26 17:58:34 +03:00
2bfa12f8b6 Web: Changed translations, deleted useless translations. 2022-08-26 17:54:50 +03:00
b67e479ed0 Web: Deleted useless button. 2022-08-26 17:39:38 +03:00
303de70cad Web: Added parameters to the local storage. 2022-08-26 17:35:29 +03:00
TimofeyBoyko
f92ffe10e5 Plugin: delete useless save 2022-08-26 17:13:22 +03:00
TimofeyBoyko
4c4fa75af9 Plugins: add validation for uploading file 2022-08-26 16:49:41 +03:00
07a8adc8e8 Web: Added a personal room to folder list. Disabled the selection of a shared room to save a backup. 2022-08-26 15:27:42 +03:00
TimofeyBoyko
30906a305f Plugins: fix warnings 2022-08-26 14:05:13 +03:00
TimofeyBoyko
908349a111 Plugins: remfraf dist after start 2022-08-26 14:04:50 +03:00
4797576a0c Files: fix open in editor 2022-08-26 13:54:22 +03:00
5a2b269709 Update yarn.lock 2022-08-26 13:44:53 +03:00
TimofeyBoyko
e61a79648d Resolve confilcts after merge 'develop' 2022-08-26 13:32:41 +03:00
TimofeyBoyko
7eeda0ba6a Resolve confilcts after merge 'develop' 2022-08-26 13:30:45 +03:00
TimofeyBoyko
3803163ff3 Merge branch 'develop' into feature/system-plugin-v2 2022-08-26 13:26:41 +03:00
TimofeyBoyko
bf170b594e Plugins: delete useless code 2022-08-26 13:22:13 +03:00
b4a5fb253f Files: fix rename for SharpBox, SharePoint providers 2022-08-26 13:08:03 +03:00
1be967fe3f Files: added id conversion in base64 string 2022-08-26 13:07:27 +03:00
TimofeyBoyko
0748afe854 Plugins: add logs, config and change service start 2022-08-26 12:51:43 +03:00
3a3a3bbc76 Web: Fixed styles. 2022-08-26 11:35:57 +03:00
ac47004401 Web: Fixed translations. 2022-08-26 10:25:56 +03:00
8998c9ee5b Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup 2022-08-26 10:21:08 +03:00
084cea375a Web: Fixed translation for module documents. 2022-08-26 10:18:54 +03:00
eb3ed80b70 Web: Fixed folder tree (removed basic tree), refactoring. 2022-08-26 09:50:56 +03:00
ce79ef38d7
Merge branch 'develop' into feature/inifinite-scroll 2022-08-26 09:40:49 +03:00
20e8d3ebd7 Web: Added FloatingButton. 2022-08-26 08:51:18 +03:00