Commit Graph

7693 Commits

Author SHA1 Message Date
aa6c02b190 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Controllers/BackupController.cs
#	packages/asc-web-common/api/settings/index.js
#	packages/asc-web-common/components/PrivateRoute/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/ru/SelectFile.json
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/Shell.jsx
2021-09-20 16:26:34 +03:00
b75940fe49 fix 2021-09-17 18:18:34 +03:00
737efc3be7 Api: settings. Added recapthca public key 2021-09-17 17:57:22 +03:00
6233ab55a3 Personal: added register method 2021-09-17 17:32:37 +03:00
b1a82ab253 Fix Bug 52610: Client.Clouds.Favorite.Editor.The file is not added to Favorites from the editor in folders of third-party storages. 2021-09-16 18:37:26 +03:00
b88a6f5ddf Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0 2021-09-15 15:56:28 +03:00
1f5554c748 Web: Shell: Fix bad merge 2021-09-15 15:56:15 +03:00
3c77982f4a Fix Bug 51819 Web: Editor. Fixed openEdit 2021-09-15 14:52:36 +03:00
1ca554f82d Merge branch 'develop' into release/1.0.0
# Conflicts:
#	packages/asc-web-components/campaigns-banner/index.js
#	web/ASC.Web.Client/src/Shell.jsx
2021-09-15 14:45:33 +03:00
8857702fcb Web: Client: fix open profile 2021-09-15 13:59:48 +03:00
b92deb5391 Web: Shell: Added key to login route 2021-09-15 11:49:20 +03:00
03d8d560ba Web: Hide internal login from personal mode 2021-09-14 16:44:39 +03:00
8835570193 Settings: added param withpassword 2021-09-13 15:42:09 +03:00
fe6014a440 Web: Update webpack to v5.52.1 2021-09-13 15:08:48 +03:00
6cea372119 Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries. 2021-09-13 13:48:30 +03:00
f06e3c076b Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries 2021-09-13 12:54:59 +03:00
c7ad040293 Web: Sorted all "package.json" files by vscode-sort-package-json 2021-09-13 12:36:07 +03:00
38242e83c1 Web: Moved other common dependencies to sharedDependencies.js 2021-09-13 12:29:44 +03:00
a47c73b5ce Web: Moved "mobx", "moment", prop-types" to sharedDependencies.js 2021-09-10 16:50:23 +03:00
956c9b3467 Web: Moved "react", "react-dom", "react-router", "react-router-dom", "styled-components" to sharedDependencies.js 2021-09-10 15:57:14 +03:00
d2f3c93c14 Web: Moved "@babel/runtime", "i18next", "i18next-http-backend", "react-i18next" to sharedDependencies.js 2021-09-10 15:15:51 +03:00
46161eef95 Web: Moved axios to sharedDependencies.js 2021-09-10 14:49:20 +03:00
f0c7a09a6c Web: Moved common shared dependencies to sharedDependencies.js + moved workbox-window 2021-09-10 14:20:19 +03:00
4661dd4344 Web: Editor: Fix WARNING in shared module react-toastify 2021-09-10 11:37:45 +03:00
f7c46a70fa Web: Updates next dev packages:
- @babel/preset-env
- css-loader
- sass
- sass-loader
- serve
- source-map-loader
- style-loader
- terser-webpack-plugin
- webpack-dev-server
+ Fixed css-loader url resolution issues
2021-09-10 11:30:27 +03:00
a5b320764f Web: Removed useless package compression-webpack-plugin 2021-09-09 13:19:58 +03:00
15dab2adaa Web: Updated copy-webpack-plugin package 2021-09-09 13:17:27 +03:00
b4661539ec Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-09 13:06:12 +03:00
5b880d5b6a Web: Updated clean-webpack-plugin package 2021-09-09 12:58:49 +03:00
f73ffec535 Web: Layout: Fixed selection of scroll body for ipad. 2021-09-09 11:55:16 +03:00
d4bd4dcb50 Web: Updated webpack and it's dependencies (new v5.52.0) + moved to new webpack-dev-server v4.1.1 2021-09-09 11:28:52 +03:00
18718aab93 Web: Updated babel packages 2021-09-08 17:40:31 +03:00
bfb85fd05f Web: Removed duplicated dependency declaration (attr-accept) 2021-09-08 17:17:57 +03:00
8c731a1630 Web: Turned off wdyr 2021-09-08 16:57:40 +03:00
618cf7a1ce Api: fix SendJoinInviteMail 2021-09-08 16:28:10 +03:00
fabaaef0f9 Web: Updated react-toastify and extended ModuleFederationPlugin shared section 2021-09-08 16:28:10 +03:00
da606cb574 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-08 16:24:28 +03:00
899507000f Web: fixed login route 2021-09-08 16:24:20 +03:00
11aa89a628 Web: Updated @babel/runtime and extended ModuleFederationPlugin shared section 2021-09-08 16:04:05 +03:00
124df88c58 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-08 15:47:02 +03:00
1501c1d91e FIx Bug 52243 Client.Editor. There is no prompt message indicating that the file was saved successfully when using Save Copy As. 2021-09-08 15:46:52 +03:00
c41eb97a0f Web: Extended ModuleFederationPlugin shared section 2021-09-08 15:41:11 +03:00
67eeb56f16 Web: Removed duplicated dependency declaration (email-addresses) 2021-09-08 13:54:49 +03:00
c3578df58b Web: Editor: fixed document opening for desktop editors 2021-09-08 13:48:28 +03:00
0167083a03 Fixed Bug 51819 - Client.Editor. Fixed file conversion 2021-09-08 12:32:03 +03:00
d66e8a4046 Web: Files: fixed drag files 2021-09-08 11:36:43 +03:00
c0cd0ea269 fix Bug 51444 2021-09-07 22:42:31 +03:00
7684723dd1 Web: Fixed scroll for mobile layout. 2021-09-07 14:22:00 +03:00
a30f75b0b4 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-07 11:38:30 +03:00
009a801be7 Web: Personal: fixed redirect to login 2021-09-07 11:38:24 +03:00