|
3b8cf0a275
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-08-19 10:08:14 +03:00 |
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
|
46a97efb52
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
|
2021-08-18 16:59:00 +03:00 |
|
|
03a030ebd0
|
Web: Editor: Added missing await syntactic.
|
2021-08-18 09:57:55 +03:00 |
|
|
34408c6e41
|
Web: Components: added style props for snackbar
|
2021-08-17 21:20:31 +03:00 |
|
|
0f2bb18bb4
|
Web: Editor: Deleted useless code.
|
2021-08-17 12:53:23 +03:00 |
|
|
c6ec0fbee6
|
Web: Editor: Refactoring.
|
2021-08-17 12:52:33 +03:00 |
|
|
e634b5c72f
|
Web: Editor: Fixed converting file when open in new tab.
|
2021-08-16 13:17:49 +03:00 |
|
|
92f0126e5d
|
Web: Editor: Added displaying tooltip with the message instead of info toastr.
|
2021-08-16 11:21:14 +03:00 |
|
|
9715719994
|
Merge branch 'develop' into bugfix/canShare
|
2021-08-16 11:07:30 +03:00 |
|
|
e60815b15d
|
Web: Refactoring and API calls optimization
|
2021-08-13 20:32:50 +03:00 |
|
|
e992b9f3e5
|
Web: Files: Re-written code to canShare and canEdit from Server's fileInfo
|
2021-08-13 19:26:37 +03:00 |
|
|
6e9ceea8c0
|
Web: Editor: Added link for insert image and mail merge.
|
2021-08-13 14:50:24 +03:00 |
|
|
922d25dcb4
|
WEb: Editor: Fixed sharing access (added canShare function), fixed rename function (added accessEdit function).
|
2021-08-12 17:38:17 +03:00 |
|
|
b9d242df6f
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2021-08-12 16:19:23 +03:00 |
|
|
fad2a178d8
|
Build: Added build.static.bat + change rimraf, mkdirp packages to single shx package (npm command line util)
|
2021-08-12 16:18:48 +03:00 |
|
|
9aafaa21ea
|
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
|
2021-08-12 15:00:53 +03:00 |
|
|
39b93080bd
|
Web: Editor: Added config id for editor.
|
2021-08-12 14:41:57 +03:00 |
|
|
4919b34fd0
|
Web: Webpack: increased performance maxEntrypointSize and maxAssetSize
|
2021-08-11 20:40:31 +03:00 |
|
|
a26e475c94
|
Web: fix no license warning
|
2021-08-11 20:39:24 +03:00 |
|
|
f642090c66
|
Web: Client: fixed
|
2021-08-11 10:44:00 +03:00 |
|
|
3f56790c85
|
Fix bug 51365: update avatar in header
|
2021-08-11 10:18:10 +03:00 |
|
|
999e1157d5
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-08-11 09:59:57 +03:00 |
|
|
0d10967912
|
Merge branch 'develop' into release/1.0.0
|
2021-08-10 18:48:36 +03:00 |
|
|
643b7b66dc
|
Optimization: removed autofac ILifetimeScope
|
2021-08-10 17:56:38 +03:00 |
|
|
75f659a9eb
|
WEb:Editor: Fixed removing current open document from recents.
|
2021-08-10 12:54:10 +03:00 |
|
|
b92b29e510
|
Web: Editor: Added error handler for recent folders.
|
2021-08-10 12:49:51 +03:00 |
|
|
94d1939613
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-08-09 19:53:21 +03:00 |
|
|
a0722a17d3
|
Editor: Optimized getting recent
|
2021-08-09 19:53:13 +03:00 |
|
|
b04b8c7edb
|
Fix bug 51828: about links
|
2021-08-09 16:39:03 +03:00 |
|
|
634ea15ec2
|
Fix bug 51815: editor favicon
|
2021-08-09 16:15:17 +03:00 |
|
|
dfa6e97c94
|
Fix bug 51437: no ability to share files available for viewing
|
2021-08-09 15:53:54 +03:00 |
|
|
546c1872a3
|
Added asp logging
|
2021-08-08 16:19:54 +03:00 |
|
|
5ec78df6ee
|
Fix Bug 51547 Client.Files. "When opened for viewing, the document is opened for editing"
|
2021-08-06 16:26:42 +03:00 |
|
|
9230d4c62d
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-08-05 19:11:20 +03:00 |
|
|
5687e6bca2
|
Merge branch 'develop' into release/1.0.0
|
2021-08-05 19:11:02 +03:00 |
|
|
a3fae3bc2a
|
Fix Bug 51695 Client.Files. ‘Firefox prevented this site from opening pop-up window’ on FF
|
2021-08-05 19:10:08 +03:00 |
|
|
88b55606bc
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-08-05 14:38:03 +03:00 |
|
|
3beec799e7
|
Web: Editor: Added action link.
|
2021-08-05 14:05:09 +03:00 |
|
|
514387652e
|
Web: Client: fixed about
|
2021-08-05 12:30:14 +03:00 |
|
|
89b79b8523
|
Web: Files/Editor: Fixed styles.
|
2021-08-04 12:42:59 +03:00 |
|
|
fbf0ee3bf0
|
Web: Client: added about dialog
|
2021-08-04 12:06:37 +03:00 |
|
|
a9734f78e1
|
Web: Client: added about content
|
2021-08-04 12:06:16 +03:00 |
|
|
98032d281c
|
Web: Editor: Added mail merge option.
|
2021-08-04 11:32:14 +03:00 |
|
|
d2fbca0a27
|
Web: Client: rewrite about page
|
2021-08-03 16:01:56 +03:00 |
|
|
fb922f04d6
|
Web: Client: change About translations
|
2021-08-03 16:01:31 +03:00 |
|
|
93f51a19e2
|
Web: Editor: Added possibility to save in folder where access is not denied.
|
2021-08-03 12:04:18 +03:00 |
|
|
e05aaf6042
|
Web:Editor: Added condition for footer
|
2021-08-03 10:09:08 +03:00 |
|
|
dddef0e03b
|
Web: Editor: Add option "Insert Image" only if user is logged in.
|
2021-08-02 11:05:30 +03:00 |
|
|
ba37ea8be6
|
Web: Editor: SelectFolder: Added header, refactoring, fixed height (aside view).
|
2021-07-30 19:23:23 +03:00 |
|
|
a20956e5c7
|
Web: Editor: Fixed styles.
|
2021-07-30 17:54:30 +03:00 |
|
|
fdefba1514
|
Web: Editor/Files: SelectFile: Added editor folders tree for select file component.
|
2021-07-30 17:50:02 +03:00 |
|
|
b85b2dfa52
|
Web: Editor/Files: SelectFile: Refactoring, the component has been extended.
|
2021-07-30 16:26:26 +03:00 |
|
|
4a0c42e97d
|
Web: Editor: Added translations.
|
2021-07-30 15:50:25 +03:00 |
|
|
52b1e2f741
|
Web: Editor: First selected folder from root is temporary commented out.
|
2021-07-30 15:24:59 +03:00 |
|
|
304df579ce
|
Web: Editor: Refactoring.
|
2021-07-30 15:16:53 +03:00 |
|
|
24c1b73a45
|
Web: Editor: Add option "Save as" only if user is logged in.
|
2021-07-30 15:13:10 +03:00 |
|
|
a7e3fd60cb
|
Web: Editor: Added selector folder.
|
2021-07-30 15:04:24 +03:00 |
|
|
4f593df4c4
|
WEb: Editor: The folder identifier of selected folder is temporary commented out.
|
2021-07-29 20:04:17 +03:00 |
|
|
9b7d74733a
|
Web: Editor: Added folder id and refactoring.
|
2021-07-29 19:41:49 +03:00 |
|
|
a7ba985ea0
|
Web: Files/Editor: Added tree folder for editor.
|
2021-07-29 15:52:30 +03:00 |
|
|
dba5275eb2
|
Web: Editor/Files: Component expansion for modal view, refactoring.
|
2021-07-29 14:35:27 +03:00 |
|
|
9697677ce4
|
Web: Editor: Added SaveAs method for selector folder component, extension select folder dialog.
|
2021-07-29 14:04:30 +03:00 |
|
|
b6258b4ff1
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withLoader.js
|
2021-07-28 20:15:09 +03:00 |
|
|
75e7ca893f
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-07-28 17:19:05 +03:00 |
|
|
5c5235cf3a
|
Merge branch 'develop' into feature/editor-extention
|
2021-07-28 13:43:49 +03:00 |
|
|
cf7d002bc1
|
Merge branch 'develop' into feature/calendar
|
2021-07-28 12:16:39 +03:00 |
|
|
48d94b4a2d
|
Merge branch 'develop' into feature/editor-extention
|
2021-07-28 11:53:36 +03:00 |
|
|
ede002065c
|
Web:Editor: Fixed folder of creating new file.
|
2021-07-28 11:49:38 +03:00 |
|
|
ccb268caf9
|
Web: Editor: Added error checks.
|
2021-07-28 11:19:15 +03:00 |
|
|
2a8052bc51
|
Web: Editor: Fixed display by users access rights.
|
2021-07-28 11:02:44 +03:00 |
|
|
455c1cb2a3
|
Web: Editor: Added constants for type of document.
|
2021-07-27 19:05:18 +03:00 |
|
|
bef7cdd0b8
|
Web: Editor: Added possibility to add files to favorites and to delete from favorites.
|
2021-07-27 18:55:59 +03:00 |
|
|
180c0a7407
|
Web: Client: fixed
|
2021-07-27 16:09:56 +03:00 |
|
|
8ac333f380
|
WEb: Editor: Deleted share folder from recent list.
|
2021-07-27 16:00:30 +03:00 |
|
|
eddb323ff6
|
Web: Editor/Files: Added create new file option.
|
2021-07-27 15:47:08 +03:00 |
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
|
d24f5185f9
|
Web: Editor: Added rename option.
|
2021-07-27 10:36:21 +03:00 |
|
|
c6ccfbe44f
|
Web: Editor: Added recent files.
|
2021-07-27 09:51:56 +03:00 |
|
|
e2d3f3195d
|
Merge branch 'develop' into release/1.0.0
|
2021-07-26 15:40:05 +03:00 |
|
|
538d65c724
|
Web: Remove query hash from remoteEntry.js
|
2021-07-26 14:02:10 +03:00 |
|
|
30b41aac42
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-26 12:37:01 +03:00 |
|
|
0f27a6c673
|
Merge branch 'develop' into release/1.0.0
|
2021-07-23 17:34:43 +03:00 |
|
|
675fb8de21
|
Web: Fix caching remoteEntry.js
|
2021-07-23 17:20:42 +03:00 |
|
|
fa500d094f
|
Merge branch 'develop' into release/1.0.0
|
2021-07-22 11:12:37 +03:00 |
|
|
e703927239
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-21 18:30:33 +03:00 |
|
|
13f8f5ef7d
|
Fix sw.js creation
|
2021-07-21 18:28:56 +03:00 |
|
|
e44040cf8a
|
Web: Client: fix
|
2021-07-21 12:57:20 +03:00 |
|
|
a8d4a2678a
|
Web: Client: added snackbar button action
|
2021-07-21 12:52:57 +03:00 |
|
|
5371b7682e
|
Web: Client: fixed show snackbar
|
2021-07-21 12:45:18 +03:00 |
|
|
653066af0c
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# config/nginx/onlyoffice.conf
|
2021-07-20 18:21:00 +03:00 |
|
|
eab97bbfed
|
Web: init new single sw.js creation
|
2021-07-20 12:32:27 +03:00 |
|
|
2d75554b0d
|
DbContext: optimization
|
2021-07-15 13:07:47 +03:00 |
|
|
e81c3df0be
|
Added displaying version from appsettings.json (api/2.0/settings.json)
|
2021-07-14 17:31:06 +03:00 |
|
|
1ebc588a93
|
Web: Bumped version to 1.0.0
|
2021-07-14 13:26:36 +03:00 |
|
|
ad57feecd8
|
Log: fix configuring
|
2021-07-13 21:17:18 +03:00 |
|
|
cb8d225707
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/src/store/index.js
|
2021-07-12 13:08:40 +03:00 |
|
|
d125220aa0
|
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 18:28:24 +03:00 |
|
|
b4c4625f3f
|
Moved getting firebase config to API method /api/2.0/settings.json
|
2021-07-09 18:28:08 +03:00 |
|
|
1c24e809fc
|
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 17:41:07 +03:00 |
|
|
537fe50394
|
Web: Client: About: fixed logo
|
2021-07-09 17:40:53 +03:00 |
|
|
1c0e201c2c
|
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 17:25:42 +03:00 |
|
|
0297620036
|
Fix SnackBar usage
|
2021-07-09 17:25:20 +03:00 |
|
|
d90413a436
|
Web: Client: Firebase: removed unused code
|
2021-07-09 16:32:37 +03:00 |
|
|
d26169adca
|
Web: Client: fixed header-module-title styles
|
2021-07-09 16:23:47 +03:00 |
|
|
2f12a90838
|
Web: Editor: refactoring
|
2021-07-09 10:51:26 +03:00 |
|
|
9a4067fa9a
|
Web: Editor: added SelectFolderDialog
|
2021-07-09 10:49:57 +03:00 |
|
|
ab48513c3d
|
Web: Editor: fixed
|
2021-07-08 15:12:13 +03:00 |
|
|
5b76c9bfc6
|
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
|
2021-07-08 14:38:45 +03:00 |
|
|
3556497de6
|
Merge branch 'develop' into feature/personal
|
2021-07-08 14:38:26 +03:00 |
|
|
14b27ab7e6
|
WebL EditorL fixed dialog type
|
2021-07-08 14:13:00 +03:00 |
|
|
2da9e556bd
|
Web: Editor: added select image dialog
|
2021-07-08 13:57:53 +03:00 |
|
|
67902f2072
|
Merge branch 'develop' into feature/backup
|
2021-07-07 15:15:59 +03:00 |
|
|
1ebe1f1ded
|
Web: Client: fixed
|
2021-07-07 11:18:40 +03:00 |
|
|
db7ea5c88f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/index.js
|
2021-07-06 11:38:02 +03:00 |
|
|
f0f0c49bb8
|
Web: Client: fixed campaigns logic
|
2021-07-05 17:59:58 +03:00 |
|
|
181240854f
|
Web: Client: get campaigns from firebase
|
2021-07-05 15:51:09 +03:00 |
|
|
a31dc583c1
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
|
2021-07-02 16:26:45 +03:00 |
|
|
658b7052c3
|
Web: Client: About: Removed useless component
|
2021-07-02 15:42:04 +03:00 |
|
|
c940aae128
|
Web: refactoring translation loaders
|
2021-07-02 12:25:36 +03:00 |
|
|
513ec04e33
|
Merge branch 'develop' into feature/translations-loaders
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/Home/Section/Header/index.js
|
2021-07-01 16:47:34 +03:00 |
|
|
3d662a53ee
|
Web: Added transition to the preparation page.
|
2021-07-01 12:12:09 +03:00 |
|
|
40e0d52a90
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2021-07-01 09:43:44 +03:00 |
|
|
bcf7ceb568
|
Merge branch 'develop' into feature/translations-loaders
# Conflicts:
# packages/asc-web-common/components/Loaders/index.js
|
2021-07-01 09:13:17 +03:00 |
|
|
b419c640bc
|
Web: Settings: Added preparation portal page.
|
2021-06-30 20:09:00 +03:00 |
|
|
c5da5a1950
|
Web: Client: added tReady for confirm pages
|
2021-06-30 18:24:29 +03:00 |
|
|
58cdc94843
|
add Tenant status in settings and refactoring tenantStatusFilter
|
2021-06-30 17:26:46 +03:00 |
|
|
69889cab4c
|
Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/constants.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-30 16:28:37 +03:00 |
|
|
1083fd8416
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-30 16:09:53 +03:00 |
|
|
db7954ee31
|
Merge branch 'develop' into feature/backup
|
2021-06-30 15:54:45 +03:00 |
|
|
2d718c33f8
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
|
2021-06-30 13:39:02 +03:00 |
|
|
976b8443ad
|
Web: Settings: Added notify to modal dialog.
|
2021-06-30 12:07:22 +03:00 |
|
|
114e5611db
|
WEb: Settings: Manual Backup: Added removing info from session storage.
|
2021-06-30 11:21:38 +03:00 |
|
|
8ee188346b
|
Api: setphone can be authorized by confirm link
|
2021-06-30 11:20:55 +03:00 |
|
|
f7893c5192
|
WEb: Settings: RestoreBackup: Added restore portal from backup list.
|
2021-06-30 11:11:01 +03:00 |
|
NikolayRechkin
|
5060e81b5f
|
Calendar: core: api
|
2021-06-30 09:37:17 +03:00 |
|
|
095eba6c3d
|
Web: Settings: RestoreBackup: Added styles.
|
2021-06-29 18:48:31 +03:00 |
|
|
78f6dc595a
|
Web: Settings: RestoreBackup: Move the function getOption of third party storage module to a separate file
|
2021-06-29 18:47:57 +03:00 |
|
|
31e8a7fdce
|
Web: Settings: RestoreBackup:Added local file module, added start restore function.
|
2021-06-29 11:48:35 +03:00 |
|
|
7b38a52d0c
|
Web: Settings/Files: Added delete selected backup file, refactoring.
|
2021-06-28 14:03:12 +03:00 |
|
|
2fb339df88
|
Web: Settings/ Files: Refactoring, added function for restore and delete.
|
2021-06-28 11:15:08 +03:00 |
|
|
cc1fc30b0f
|
Web: Client: fixed logo header position
|
2021-06-28 10:40:42 +03:00 |
|
|
99f9d27fd0
|
Web: Files: added checkProtocol helper, fixed toast
|
2021-06-27 09:31:07 +03:00 |
|
|
e415a6b993
|
Web: Settings: RestoreBackup: Deleted useloess code.
|
2021-06-25 19:19:02 +03:00 |
|
|
fce75fdfa5
|
Web: Settings/Files: Added methods for get backup list, added fixed size list, update SelectFileDialog, refactoring, moved files list with styles to the component.
|
2021-06-25 19:15:55 +03:00 |
|
|
715907f114
|
Merge branch 'develop' into feature/privacy-rooms-page
|
2021-06-25 15:01:19 +03:00 |
|
|
70ed96b8cb
|
Web: Settings: RestoreBackup: Changed styles, added styles for heading.
|
2021-06-25 11:32:19 +03:00 |
|
|
00b9ce0e28
|
Web: Settings/Files: Changed height of row for aside display type and changed color of trash icon.
|
2021-06-25 11:24:47 +03:00 |
|
|
fbcdba3b17
|
Merge branch 'develop' into feature/personal
|
2021-06-25 11:10:49 +03:00 |
|
|
851205106f
|
Web: Settings: RestoreBackup: Fixed resizing.
|
2021-06-25 10:51:45 +03:00 |
|
|
a673fe96af
|
WEb: Settings: Restore Backup: Added files list to the backup list.
|
2021-06-25 10:45:17 +03:00 |
|
|
4465261d64
|
Web: Settings/Files: Added files list to the backup list component, update files list component.
|
2021-06-25 10:38:54 +03:00 |
|
|
bf67b5c296
|
Web: Files: added PrivateRoomsPage
|
2021-06-24 16:23:14 +03:00 |
|
|
d59f9a2aa2
|
fixed urls
|
2021-06-23 20:12:50 +03:00 |
|
|
20d1f9a738
|
merge from develop
|
2021-06-23 16:10:46 +03:00 |
|
|
526a6b7839
|
Web: Settings: Auto Backup: Fixed problem with showing weekday from storage.
|
2021-06-22 22:11:15 +03:00 |
|
|
3788bab48e
|
HealthCheck: fix Studio
|
2021-06-22 19:55:47 +03:00 |
|
|
282738cb13
|
Merge branch 'develop' into feature/personal
|
2021-06-22 18:44:12 +03:00 |
|
|
1f22a0a4f8
|
Web: Settings: Auto Backup: Fixed options translation when language is changed and Added changed button when selected every day period.
|
2021-06-22 14:46:59 +03:00 |
|
|
8963df11c3
|
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
|
2021-06-22 13:41:22 +03:00 |
|
|
b1662e7ac6
|
Web: Init maintenance displaying
|
2021-06-22 13:41:11 +03:00 |
|
|
2028d51416
|
Web: Settings: Backup: Added styles for schedule information.
|
2021-06-22 13:28:08 +03:00 |
|
|
8779e1eb5f
|
Web: Settings: Auto Backup: Fixed start of week: the weekdays will be returned in locale specific order.
|
2021-06-22 13:25:36 +03:00 |
|
|
89852b6dc0
|
Web: Settings: Auto Backup: Fixed.
|
2021-06-22 13:23:28 +03:00 |
|
|
1a9ca45d47
|
Web: Settings: Backup: Added backup schedule information.
|
2021-06-22 12:36:30 +03:00 |
|
|
22e393cdd2
|
Web:Settings: Backup: Added translation.
|
2021-06-21 21:12:26 +03:00 |
|
|
193337a563
|
Web: Settings: Manual Backup: Added handler for response link for temporary module.
|
2021-06-21 20:50:49 +03:00 |
|
|
e8c70ae5a6
|
Web: Settings: Manual/Auto Backup: Added error handler for manual copying.
|
2021-06-21 19:48:32 +03:00 |
|
|
b01028c5fe
|
Web: Settings: Manual Backup: Added translation for errors.
|
2021-06-21 19:30:31 +03:00 |
|
|
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 |
|
|
741de9f2f7
|
Web: Files: added react-selecto library
|
2021-06-17 14:36:45 +03:00 |
|
|
6118e95028
|
Merge branch 'develop' into feature/personal
|
2021-06-17 14:25:09 +03:00 |
|
|
a8527e1a57
|
WebApi: sendsms, setphone
|
2021-06-16 20:46:24 +03:00 |
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +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 |
|
|
5fcbdbd7dd
|
added health checks
|
2021-06-16 16:54:36 +03:00 |
|
|
1a0bc83c27
|
Web: Files: Added modal view and aside view for SelectFileDialog component.
|
2021-06-16 14:06:49 +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 |
|
|
429f5a1ea2
|
Smtp: fix warning
|
2021-06-15 21:40:36 +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 |
|
|
65378cc089
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
|
2021-06-15 11:49:39 +03:00 |
|
|
4c8b086fcd
|
Web: Rename.
|
2021-06-11 17:49:04 +03:00 |
|
|
f7e4fd46f7
|
Web: Files/Settings: Added SelectedFolderDialog, refactoring SelectedFoldetInput.
|
2021-06-11 16:54:25 +03:00 |
|
Artem Tarasov
|
f181a491fb
|
Merge branch 'develop' into bugfix/fixed-styles
|
2021-06-11 14:56:52 +03:00 |
|
|
637be57e84
|
People: resize fix
|
2021-06-11 14:48:49 +03:00 |
|
|
bac090e180
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
|
2021-06-11 13:11:08 +03:00 |
|
|
131add47ac
|
Web: Settings: Restore Backup: Disabled third party resources if it not connect to Common Folder.
|
2021-06-11 10:09:42 +03:00 |
|
|
eb8f20e81a
|
Web: Settings: Restore Backup: Added sources and translations for them.
|
2021-06-10 17:31:41 +03:00 |
|
|
6160f973e8
|
Web: Settings: Backup: Added learn more link.
|
2021-06-10 17:05:36 +03:00 |
|
|
0663ed7f16
|
Merge branch 'develop' into feature/backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2021-06-10 11:56:32 +03:00 |
|
|
7c7d548825
|
Merge branch 'develop' into feature/access-rights-admins
|
2021-06-10 11:50:49 +03:00 |
|
|
e257012a9a
|
Notify: fix
|
2021-06-10 11:47:58 +03:00 |
|
|
1d9e49b88f
|
Web: Client: Settings: Fixed translation keys
|
2021-06-10 11:31:47 +03:00 |
|
|
9756aac3cd
|
Web: Settings: Manual/Auto Backup: Fixed common translation.
|
2021-06-10 10:48:16 +03:00 |
|
|
f62e7011ce
|
Web: Settings: Restore Backup: Added BackupListModalDialog component fro showing backup list.
|
2021-06-10 10:36:18 +03:00 |
|
|
fbb480671b
|
Web: Client: fixed translates
|
2021-06-09 17:30:10 +03:00 |
|
|
d6cfa8aa0f
|
Web: Settings: Restore Backup: Added checkbox to notify users, added translation for it.
|
2021-06-09 17:26:36 +03:00 |
|