Commit Graph

22922 Commits

Author SHA1 Message Date
mushka
523b974fc5 deleted unused translation keys 2022-07-13 15:26:52 +03:00
595cfcc2d2 fixed loginevent 2022-07-13 15:15:13 +03:00
ed7ef58b53 Api: fixed loginevent 2022-07-13 14:21:25 +03:00
Artem Tarasov
1e321859d7 Web: Doceditor: added ejs 2022-07-13 14:08:20 +03:00
Artem Tarasov
776c0874d1 Web: Doceditor: added babel.config.js to be able to use import in server 2022-07-13 14:07:49 +03:00
Artem Tarasov
a612c8490a Web: Doceditor: rewrite server to CommonJs 2022-07-13 14:06:03 +03:00
04d2c2d51c Web: move profile block to common article 2022-07-13 14:03:08 +03:00
b1baddce99 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-13 13:46:36 +03:00
48a743e01e
Merge pull request #722 from ONLYOFFICE/bugfix/Bug53348
Bug 53348 - Client.Account termination. Account deletion confirmation…
2022-07-13 13:43:03 +03:00
552d2adda8 Files: deleted unnecessary 2022-07-13 13:42:40 +03:00
04603f1314 Merge branch 'develop' into bugfix/Bug53348 2022-07-13 13:42:24 +03:00
256885f4e3 Files: fix, deleted unnecessary 2022-07-13 13:42:17 +03:00
a88d5b6d41
Merge pull request #715 from ONLYOFFICE/feature/room_tests
Feature/room tests
2022-07-13 13:03:41 +03:00
ea00433ff1 Files: tests. refactoring 2022-07-13 13:00:08 +03:00
Vashchuk Nikita
9348ad1a46 fix files tests 2022-07-13 12:52:13 +03:00
cad67a6f57 Web: RestoreBackup: Refactoring. 2022-07-13 12:20:33 +03:00
b0eb883e20 Web: Fixed saving settings, refactoring. 2022-07-13 12:20:33 +03:00
48ac6f24d3 Web: Moved the function to a shared file. 2022-07-13 12:20:33 +03:00
20bb2d107d Web: Part of the code moved in a shared file. 2022-07-13 12:20:32 +03:00
50f8dbd6dd Web: AutoBackup: Fixed width pf toggle wrapper, added the same length if button turn on and turn off. 2022-07-13 12:20:31 +03:00
57d583687f Web: RestoreBackup: Added new option for third-party accounts. 2022-07-13 12:20:31 +03:00
51418fc141 WEb: AutoBackup: Added new option for third-party accounts. 2022-07-13 12:20:30 +03:00
05db277f00 Web: AutoBackup: Added disable input if folder was deleted, added removing folder when switch between options. 2022-07-13 12:20:30 +03:00
41a2c421b1 Web: ManualBackup: Added new option for Third-party accounts.
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/DesktopView.js
2022-07-13 12:20:29 +03:00
1eb930583c Web: Restore: Refactoring storage container.
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
2022-07-13 12:20:17 +03:00
879b8e1dcb Web: Refactoring storage containers. 2022-07-13 12:19:59 +03:00
7140c667e6 Web: AutoBackup: Deleted useless code. 2022-07-13 12:19:59 +03:00
8f92458307 Web: AutoBackup: Moved the parameter to the store. 2022-07-13 12:19:58 +03:00
c894454bfc Web: Deleted useless state. 2022-07-13 12:19:58 +03:00
b94989f5a9 Web: Optimization amazon container of manual backup. 2022-07-13 12:19:57 +03:00
fdd467f369 Web: Optimization amazon container of auto backup. 2022-07-13 12:19:57 +03:00
02ec398cc0 Web: Rewrote logic of amazon settings container. 2022-07-13 12:19:56 +03:00
4addb0e64d Web: Fixed settings title. 2022-07-13 12:19:56 +03:00
d9b20300e2 Web: Settings: Added tips.
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2022-07-13 12:19:55 +03:00
78c9bbbc3e Web: ManualBackup: Added new options for Amazon storage. 2022-07-13 12:18:45 +03:00
39557164d8 Web: Added restore backup to the article. 2022-07-13 12:18:45 +03:00
10c37ee2d6 Web: ManualBackup: Added new input methods. 2022-07-13 12:18:44 +03:00
0bd1b0eeb7 Web: Files: returned set filter url. 2022-07-13 12:18:43 +03:00
2279393fc5 Web: Files: Deleted useless code. 2022-07-13 12:18:34 +03:00
bc472af290 Web: Redesign manual backup and auto backup modules.
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
2022-07-13 12:12:19 +03:00
120a57c1bf Merge branch 'develop' into feature/room_tests 2022-07-13 11:56:48 +03:00
62ce169017
Merge pull request #724 from ONLYOFFICE/feature/room-api-refactor
feature/room-api-refactor
2022-07-13 11:49:20 +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
72caeb475c People: fixed change theme mathod 2022-07-12 20:45:12 +03:00
c9680ae830 fix tfaapp 2022-07-12 19:36:39 +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
TimofeyBoyko
77e62baad1 Web:Files:VirtualRooms: add fetching tags after fetching rooms 2022-07-12 19:07:58 +03:00