Artem Tarasov
|
3fe03c4a29
|
Web: Doceditor: renamed webpack.config.js to webpack.config-csr.js
|
2022-02-02 19:11:59 +03:00 |
|
Artem Tarasov
|
a04235b260
|
Web: Common/Studio: moved tryRedirectTo() to separate file (ssr crash)
|
2022-02-02 18:28:29 +03:00 |
|
Artem Tarasov
|
1d0bd0bf8b
|
Web: Doceditor: change remoteApiUrl
|
2022-01-28 13:52:20 +03:00 |
|
Artem Tarasov
|
1e6d2f1e1c
|
Web: Editor: added global styles
|
2022-01-28 13:51:23 +03:00 |
|
Artem Tarasov
|
7f3878afc5
|
Web: Doceditor: created route product/files/doceditor. removed [...slug].js page
|
2022-01-28 13:50:09 +03:00 |
|
Artem Tarasov
|
9e32295fae
|
Web: Editor: added [...slug].js (index.page)
|
2022-01-27 16:54:40 +03:00 |
|
Artem Tarasov
|
96f15bc2a3
|
Web: Editor: added _app.js and _document.js (styled-components for ssr)
|
2022-01-27 16:53:41 +03:00 |
|
Artem Tarasov
|
8674d500ae
|
Web: Editor: added nextjs config
|
2022-01-27 16:46:41 +03:00 |
|
Artem Tarasov
|
1ec56b19de
|
Web: Editor: added nextjs
|
2022-01-27 16:45:36 +03:00 |
|
Artem Tarasov
|
f2459ffc78
|
Web: Doceditor: deleted dir 'webpack' with config
|
2022-01-17 18:36:55 +03:00 |
|
Artem Tarasov
|
6cc69ac47b
|
Web: Doceditor: added nextjs
|
2022-01-17 18:35:43 +03:00 |
|
Artem Tarasov
|
c10c60a148
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-01-14 13:03:40 +03:00 |
|
|
60c45e8c5e
|
Web: Client: Wizard: Fixed issue with default portal language inside selector
|
2022-01-12 11:08:51 +03:00 |
|
Artem Tarasov
|
ceb11e78ee
|
Web: DocEditor: fix after merge
|
2022-01-11 14:13:26 +03:00 |
|
Artem Tarasov
|
6b954d45f5
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# web/ASC.Web.Editor/webpack.config.js
|
2022-01-11 14:11:47 +03:00 |
|
Artem Tarasov
|
7fc992c9f4
|
Web: DocEditor: applied RectDOM.hydration() instead of ReactDOM.render()
|
2022-01-11 12:59:03 +03:00 |
|
Artem Tarasov
|
c7121997f3
|
Web: DocEditor: webpack.config.js is split into separate files
|
2022-01-11 12:57:07 +03:00 |
|
|
9d43cb07ba
|
Files: fix after merge
|
2021-12-28 18:40:42 +03:00 |
|
|
bedfad1ec5
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2021-12-28 18:21:44 +03:00 |
|
|
440811e931
|
Web: Added convertLanguage for compatibility
|
2021-12-23 14:01:08 +03:00 |
|
|
3bf412166d
|
Web: Settings: Commented old redux actions
|
2021-12-23 13:09:38 +03:00 |
|
|
919092e6c6
|
Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0
|
2021-12-23 11:28:50 +03:00 |
|
|
9e24c182c9
|
edit ko
|
2021-12-23 11:22:48 +03:00 |
|
|
86e965d779
|
Web: Fix translations
|
2021-12-22 18:12:04 +03:00 |
|
|
1d49c9dc51
|
Web: Client: Fixed spelling errors
|
2021-12-21 20:25:59 +03:00 |
|
|
ff7b6fc432
|
Web: init e2e tests
|
2021-12-21 15:59:11 +08:00 |
|
|
156fbada6d
|
edit translations bg
|
2021-12-16 17:13:44 +03:00 |
|
|
93cbab055c
|
edit lo
|
2021-12-16 15:59:02 +03:00 |
|
|
6d84bd5f04
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-15 17:22:17 +03:00 |
|
|
e09f079052
|
Web: Editor: Fixed checking key`s existing inside config
|
2021-12-15 15:40:37 +03:00 |
|
|
0244c3b924
|
Web: Editor: Restored config as param
|
2021-12-15 15:07:25 +03:00 |
|
|
b5eeac9a47
|
edit translations
|
2021-12-14 12:43:10 +03:00 |
|
|
031af716e6
|
Tfa: fix
|
2021-12-10 21:25:03 +03:00 |
|
|
055c200b60
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-12-10 16:31:29 +03:00 |
|
|
1d2750f23b
|
Web: Files: Remove privacy folders from select files/folders dialog.
|
2021-12-10 16:30:20 +03:00 |
|
|
00ab71280c
|
Merge branch 'release/v1.1.0' into feature/editor-history
|
2021-12-10 09:36:12 +03:00 |
|
|
878df989d9
|
Web: Renamed folder zh_CN to zh-CN
|
2021-12-09 21:51:05 +03:00 |
|
|
0771a54c47
|
Optimization
|
2021-12-09 20:23:06 +03:00 |
|
|
e8af856c26
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-09 13:55:55 +03:00 |
|
|
41681d0c94
|
Server: Files: Configuration: Fixed logo type for filling form mode
|
2021-12-09 12:45:52 +03:00 |
|
|
3921fa74f3
|
Web: Editor: Deleted useless imports.
|
2021-12-08 17:00:24 +03:00 |
|
|
c41937002f
|
Web: Editor: Added a condition for showing the history restore function.
|
2021-12-08 16:52:50 +03:00 |
|
|
e771000f8a
|
Web: Editor: Deleted useless code.
|
2021-12-08 16:46:09 +03:00 |
|
|
3b17a90b1b
|
Web: Editor: Fixed after cherry picking.
|
2021-12-08 16:45:12 +03:00 |
|
|
51b7921ed4
|
Web: Edit: Added doc property to api methods for history versions.
# Conflicts:
# packages/asc-web-common/api/files/index.js
|
2021-12-08 16:30:26 +03:00 |
|
|
d5a77379b3
|
Web: Editor: Added api method for restore document version.
|
2021-12-08 16:28:30 +03:00 |
|
|
aeb5121331
|
Web: Editor: Fixed displaying info.
|
2021-12-08 16:28:30 +03:00 |
|
|
3937082fc9
|
Web: Editor: Fixed object parameters of history data.
|
2021-12-08 16:28:30 +03:00 |
|
|
17129ad9d1
|
Erb: Editor: Renaming.
|
2021-12-08 16:28:30 +03:00 |
|
|
a3c4577482
|
Web: Editor: Refactoring.
|
2021-12-08 16:28:29 +03:00 |
|