Commit Graph

22090 Commits

Author SHA1 Message Date
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
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
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +03:00
fa8898d522 Files: fixed converter 2022-07-12 14:18:26 +03:00
df65b26ce9
Merge pull request #723 from ONLYOFFICE/feature/security-settings
Feature/security settings
2022-07-12 14:16:53 +03:00
a9d5080f5d Web: Client: Settings: disabled autofocus 2022-07-12 13:50:55 +03:00
7b19b2f730 Web: Client: Settings: SessionLifetime: fix show reminder 2022-07-12 13:41:50 +03:00
0d0eed6d1a Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-12 12:57:57 +03:00
71ca12b8e2 Update .gitignore with radicale plugin files 2022-07-12 12:53:30 +03:00
e9a15cc2a4 added [HttpGet("iprestrictions/settings")] 2022-07-12 12:20:59 +03:00
c9f7e95d5c fixed iprestrictions method 2022-07-12 12:06:38 +03:00
fd986320f2 Api: fixed maildomainsettings 2022-07-12 11:47:05 +03:00
b2b55bfa5b fixed subfolders method 2022-07-11 22:22:56 +03:00
477f386047
Merge pull request #698 from ONLYOFFICE/feature/create-from-modal
Feature/create from modal
2022-07-11 17:28:09 +03:00
14ec770253
Merge branch 'develop' into feature/create-from-modal 2022-07-11 17:19:39 +03:00
TimofeyBoyko
58bd9509a1 Web:Files:Hocs: fix keyup on create docx after merge 2022-07-11 17:13:51 +03:00
TimofeyBoyko
a0651ecca4 Web:Files:HOCs: fix create operation with hotkeys 2022-07-11 16:36:46 +03:00
16acccc4e3 Sql: Added hosting_instance_registration table 2022-07-11 15:48:53 +03:00
TimofeyBoyko
91ca312871 Merge branch 'develop' into feature/create-from-modal 2022-07-11 14:51:45 +03:00
baea63043c Web: Components: Utils: fix hugeMobile size 2022-07-11 14:48:25 +03:00
136a0d45bf Web: Client: TfaActivation: fix layout 2022-07-11 14:47:57 +03:00
65a739d871 Removed ASC.Web.Campaigns (moved to separated repository) 2022-07-11 14:15:51 +03:00
3cbfa3d952 Web: Client: TfaAuth: fix layout 2022-07-11 13:57:58 +03:00
6719ff0e72 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-11 12:39:34 +03:00
a9e94046c8 Merge branch 'master' into develop 2022-07-11 12:16:37 +03:00
b3324ad875 Web: Client: NavMenu: fix namespace 2022-07-11 11:28:25 +03:00
15fc78111a
Merge pull request #718 from ONLYOFFICE/release/v1.2
Release/v1.2
2022-07-11 10:47:33 +03:00
1f3dfb9ccc Web: Client: AdminMessage: fix save 2022-07-08 16:46:26 +03:00
f69194b034 Web: Client: TfaActivation: fix error 2022-07-08 16:22:30 +03:00
6a690fc175 Web: Client: fix confirmLinkData 2022-07-08 16:22:08 +03:00
7e3abdc498
Merge pull request #712 from ONLYOFFICE/feature/new-files
Files: update docstore submodule
2022-07-08 15:11:18 +03:00
0da612710d Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-07 19:39:12 +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