Commit Graph

12938 Commits

Author SHA1 Message Date
ae17671043 Merge branch 'develop' into feature/backup
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/store/SettingsSetupStore.js
2021-06-18 18:08:38 +03:00
95aaff4e68 Web: api: Changed parameters at url. 2021-06-18 11:07:06 +03:00
3024cb8fff Web: Files: SelectFileDialog: Rename function. 2021-06-18 11:06:12 +03:00
a1df9b74db Web: Files: SelectFileDialog: Added loadNextPage and Added new functions for modalView for save and close modal dialog. 2021-06-18 11:04:14 +03:00
688de9106b Web: Files: SelectFileDialog: Added infinity scroll for files list. 2021-06-18 10:58:01 +03:00
a226cca872 Files: update document templates 2021-06-18 10:45:45 +03:00
52cd479c5c
Merge pull request #279 from ONLYOFFICE/feature/tree-menu-bugfix
Feature/tree menu bugfix
2021-06-17 15:36:00 +03:00
Artem Tarasov
6c61ee105c Merge branch 'develop' into feature/tree-menu-bugfix 2021-06-17 15:02:41 +03:00
Artem Tarasov
a8fe50142c Web: Tree: fixed position of scrollbar on tablet 2021-06-17 15:01:35 +03:00
Sergey Kirichenko
a91ea81e89
Modify elasticsearch configuration (#281)
* Modify elasticsearch config

* Modify version ELK

* Cosmetic modify
2021-06-17 12:49:39 +03:00
a3298a49ac Web: Files: fixed createTreeFolders 2021-06-17 12:04:01 +03:00
d7c8f22ea3 Merge branch 'develop' into feature/tree-menu-bugfix 2021-06-17 11:09:19 +03:00
3fe118fc3d Web: Components: SaveCancelButtons: Added propType. 2021-06-17 09:31:35 +03:00
39b1b24262 Web:Files: SelecFolderDialog: Added store to folderTreeBody. 2021-06-17 09:16:33 +03:00
8fc9bef6c6 Core: fix cache 2021-06-16 22:25:02 +03:00
b6d4408ce0 Files: fixed subfolders method 2021-06-16 21:53:56 +03:00
a8527e1a57 WebApi: sendsms, setphone 2021-06-16 20:46:24 +03:00
7ad56c275b Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2021-06-16 20:17:23 +03:00
01639a56cc RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
53ee0ef484 fixed warnings 2021-06-16 18:00:27 +03:00
3018e1822f crm: fix path 2021-06-16 17:30:31 +03:00
c22c25e5bf bug fix: DistributedTask.Exception clean up when OnCompleted 2021-06-16 17:24:48 +03:00
050bc214df Web: Settings: Backup/Restore Backup: Changed styles. 2021-06-16 17:04:50 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
2021-06-16 17:02:46 +03:00
056d34a66d Web: Files: Added resize listener. 2021-06-16 15:35:05 +03:00
1250201319 Web: Files: fixed upload progress 2021-06-16 14:31:13 +03:00
c257b501fe Web: Files: SelectFileDialog: Changed api parameters. 2021-06-16 14:17:12 +03:00
1a0bc83c27 Web: Files: Added modal view and aside view for SelectFileDialog component. 2021-06-16 14:06:49 +03:00
0ff78c5192 Merge branch 'develop' into feature/tree-menu-bugfix 2021-06-16 13:47:56 +03:00
7d0a1d340d Web: Files: fixed files render, removed log 2021-06-16 13:47:15 +03:00
b738bbc268 Web: Files: fixed files render 2021-06-16 13:38:18 +03:00
469678ac85 Api: fix settings 2021-06-16 13:03:41 +03:00
c18df100ea Web: Settings/Files: Added SelectFile component for the third-party resources module. 2021-06-16 09:44:10 +03:00
a360e6cb6e Web: Files: SelectedFile: Added loader for files list. 2021-06-16 09:39:43 +03:00
db7cfacd62 Files: remove warnings 2021-06-15 22:46:26 +03:00
429f5a1ea2 Smtp: fix warning 2021-06-15 21:40:36 +03:00
91e4d844fb Files: fix download 2021-06-15 21:40:12 +03:00
7d59d8f3a6 Web: Files: fixed deleteThirdParty 2021-06-15 18:59:07 +03:00
3a5d9be209 Web: Settings: Restore Backup: Changed the location components of selection files. 2021-06-15 18:22:18 +03:00
058445461b Web: Files: Added SelectFile component for documents, refactoring. 2021-06-15 18:11:48 +03:00
d2fa149247 Jenkins: fix 2021-06-15 17:32:25 +03:00
456a82a3fc Web: Files: fixed tree menu update 2021-06-15 17:23:07 +03:00
58deff8f26
Merge pull request #277 from ONLYOFFICE/hotfix/package_version_increment
package version increment
2021-06-15 17:21:33 +03:00
ee029d557b fixed tests 2021-06-15 17:20:53 +03:00
73547f421e Common: install newtonsoft 2021-06-15 16:44:53 +03:00
f9ee63f723 Web: Components: FileInput: Deleted debugger. 2021-06-15 16:38:33 +03:00
ad52d25d28 Web: Files: added tree menu update after folder deletion 2021-06-15 16:12:15 +03:00
dc1afaeafc Merge branch 'develop' into hotfix/package_version_increment 2021-06-15 16:01:19 +03:00
9c5dee7752 Index: separate configs 2021-06-15 15:57:16 +03:00
605d5ce043 removed unused references 2021-06-15 15:52:29 +03:00