Artem Tarasov
|
37eb0732a9
|
Web: Doceditor: modified sharedDependencies
|
2022-02-24 17:43:46 +03:00 |
|
Artem Tarasov
|
73a0c6b637
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Editor/src/App.js
# yarn.lock
|
2022-02-22 13:00:33 +03:00 |
|
Artem Tarasov
|
64a7b0cb17
|
Web: Doceditor: modified template, package.json
|
2022-02-22 12:48:16 +03:00 |
|
Artem Tarasov
|
5bf3c8bc2c
|
Web: Doceditor: modified config'
|
2022-02-22 11:43:05 +03:00 |
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
Artem Tarasov
|
a72302961d
|
Web: Doceditor: modified server config
|
2022-02-19 01:50:14 +03:00 |
|
Artem Tarasov
|
a00a616d9b
|
Web: Doceditor: added config for styled-components (ssr)
|
2022-02-17 17:18:51 +03:00 |
|
|
ecb5c7fba2
|
Fixed Bug 55614 - Client.ExternalLink. ‘404 Not Found’ when opening an external link.
|
2022-02-17 15:12:54 +03:00 |
|
Artem Tarasov
|
88b6c22ff4
|
Web: Doceditor: added webpack-merge
|
2022-02-16 18:34:01 +03:00 |
|
Artem Tarasov
|
e90fbf2bfc
|
Web: Doceditro: config fix
|
2022-02-16 14:16:27 +03:00 |
|
Artem Tarasov
|
0853e487f8
|
Web: Doceditor: added client render
|
2022-02-16 13:04:04 +03:00 |
|
Artem Tarasov
|
fe8aefd2e4
|
Web: Doceditor: fixed import in render.js
|
2022-02-16 12:52:17 +03:00 |
|
Artem Tarasov
|
f92d2dd2c5
|
Web: Doceditor: added server render
|
2022-02-16 12:50:32 +03:00 |
|
Artem Tarasov
|
14490e8496
|
Web: Doceditor: added initDocEditor func
|
2022-02-16 12:46:47 +03:00 |
|
Artem Tarasov
|
260d00202c
|
Web: Editor: Components: added dynamic component
|
2022-02-16 12:44:25 +03:00 |
|
Artem Tarasov
|
b0e5f7e335
|
Web: Doceditor: added Editor.js
|
2022-02-16 12:41:12 +03:00 |
|
Artem Tarasov
|
da51dfdd2e
|
Web: Doceditor: added node app
|
2022-02-16 12:34:37 +03:00 |
|
Artem Tarasov
|
89a3b3443d
|
Web: Doceditor: package.json: modified scripts
|
2022-02-16 11:37:47 +03:00 |
|
Artem Tarasov
|
8fb05dbc56
|
Web: Doceditor: modified .babelrc
|
2022-02-16 11:23:37 +03:00 |
|
Artem Tarasov
|
ffc5630958
|
Web: Doceditor: added simple webpack config
|
2022-02-16 11:21:42 +03:00 |
|
Artem Tarasov
|
a94022816f
|
Web: Doceditor: added express, modified yarn.lock
|
2022-02-16 11:20:33 +03:00 |
|
Artem Tarasov
|
04667e6821
|
Web: Doceditor: removed next.js
|
2022-02-15 18:44:10 +03:00 |
|
|
7f4d29da03
|
Web: Editor: fixed canConvert
|
2022-02-15 16:57:32 +03:00 |
|
Artem Tarasov
|
56758b5850
|
Web: Doceditor: fixed i18n config
|
2022-02-09 19:39:04 +03:00 |
|
Artem Tarasov
|
acb5701ee4
|
Web: Doceditor: applied i18n
|
2022-02-08 17:44:34 +03:00 |
|
Artem Tarasov
|
f7c4cf334d
|
Web: Doceditor: added config i18n
|
2022-02-08 17:43:59 +03:00 |
|
Artem Tarasov
|
39c2fabb69
|
Web: Doceditor: fixed page title and icon change
|
2022-02-08 02:25:10 +03:00 |
|
Artem Tarasov
|
43f882ee32
|
Web: DocEditor: index.js location changed, added Loader
|
2022-02-08 01:49:48 +03:00 |
|
Artem Tarasov
|
51e8212eb9
|
Web: DocEditor/nginx: added base path for doceditor
|
2022-02-08 01:48:41 +03:00 |
|
Artem Tarasov
|
331a53fbed
|
Web: Dooceditor: added redirect to login page if user is not logged in
|
2022-02-07 23:11:15 +03:00 |
|
Artem Tarasov
|
d142d16c4a
|
Web: Doceditor: applied initSSR for axiosClient
|
2022-02-04 17:00:15 +03:00 |
|
|
0f76ba3613
|
Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites.
|
2022-02-03 17:49:00 +03:00 |
|
|
d0bb0c18a6
|
Web: Files: Fixed editing of converted file.
|
2022-02-02 19:32:38 +03:00 |
|
Artem Tarasov
|
275a490545
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-02-02 19:26:51 +03:00 |
|
Artem Tarasov
|
9d6918170f
|
Web: Doceditor: fix dependencies fix
|
2022-02-02 19:20:34 +03:00 |
|
Artem Tarasov
|
bca026544c
|
Web: Doceditor: moved initialization on the server side
|
2022-02-02 19:15:21 +03:00 |
|
Artem Tarasov
|
f35e24c4e8
|
Web: Doceditor: added _error.js
|
2022-02-02 19:13:39 +03:00 |
|
Artem Tarasov
|
3fe03c4a29
|
Web: Doceditor: renamed webpack.config.js to webpack.config-csr.js
|
2022-02-02 19:11:59 +03:00 |
|
|
6750931fe9
|
Web: Files: Added error handler for request edit rights function.
|
2022-02-02 18:29:00 +03:00 |
|
|
76eead7708
|
Web: Files: Fixed editing of shared form.
|
2022-02-02 18:16:52 +03:00 |
|
Timofey
|
21cd73a698
|
Web: restore code format
|
2022-01-28 21:44:58 +08:00 |
|
Timofey
|
95da73cda6
|
Web:Editor: app theme-support for loader background-color
|
2022-01-28 20:49:37 +08: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 |
|
|
5db134933b
|
Web: Files: Fixed error when clicked on "change access rights" twice.
|
2022-01-28 13:01:08 +03:00 |
|
Timofey
|
18ed20569d
|
Web:Editor: wrap editor in theme provider and delete theme as props in components
|
2022-01-27 21:54:58 +08: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 |
|
Timofey
|
ff370ebe1d
|
Web:Editor: add support dark-theme
|
2022-01-24 22:32:05 +08:00 |
|
|
893c4ddc5a
|
Wen: Editor: Added a new parameter to the conversion api method.
|
2022-01-21 15:07:32 +03:00 |
|
|
32c398c044
|
Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS
|
2022-01-21 12:53:29 +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
|
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 |
|
|
605e7eba35
|
Fix bad merge febf172875
|
2021-12-28 14:56:00 +03:00 |
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +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 |
|
|
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 |
|
|
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 |
|
|
878df989d9
|
Web: Renamed folder zh_CN to zh-CN
|
2021-12-09 21:51:05 +03:00 |
|
|
ca7a0f7cb7
|
WEb: Editor: Fixed file conversion when saving to a folder and opening in an adjacent tab.
|
2021-12-09 16:16:43 +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 |
|
|
1983d60e55
|
Web: Editor: Moved the functionality of converting history and getting the current version into separate functions.
|
2021-12-08 16:28:29 +03:00 |
|
|
944591cd4d
|
Web: Editor: Added error handler for history function.
|
2021-12-08 16:28:29 +03:00 |
|
|
71aa1eb474
|
Web: Editor: Added restore option.
|
2021-12-08 16:28:29 +03:00 |
|
|
30bd96a4c6
|
Web: Editor: Fixed opening of revisions.
|
2021-12-08 16:28:28 +03:00 |
|
|
bc8a7f3dd2
|
Web: Editor: Removed revisions from versions list.
|
2021-12-08 16:28:28 +03:00 |
|
|
70cc67b356
|
Web: Editor: Refactoring.
|
2021-12-08 16:28:28 +03:00 |
|
|
d20f833889
|
Web: Editor: Renaming.
|
2021-12-08 16:28:28 +03:00 |
|
|
d5b2b2a395
|
Web: Editor: Added error handler for history data.
|
2021-12-08 16:28:28 +03:00 |
|
|
a79db0fa25
|
Web: Editor: Added version to the history data.
|
2021-12-08 16:28:27 +03:00 |
|
|
fcb4e43d55
|
Web: Editor: Removed side effect - changes of array length.
|
2021-12-08 16:28:27 +03:00 |
|
|
a6deb7febb
|
Web: Editor: Fixed display of editing date.
|
2021-12-08 16:28:27 +03:00 |
|
|
7fd1452e81
|
Web: Editor: Fixed current version of document.
|
2021-12-08 16:28:27 +03:00 |
|
|
c6265a9cb4
|
Web: Editor: Fixed getting name and id of user for history.
|
2021-12-08 16:28:26 +03:00 |
|
|
5fa436eb21
|
Web: Editor: Fixed getting information of difference of file.
|
2021-12-08 16:28:26 +03:00 |
|
|
e3eb043c2a
|
Web: Editor: Added new api method for RequestHistory method.
|
2021-12-08 16:28:26 +03:00 |
|
|
8441a506af
|
add translations
|
2021-12-08 15:17:26 +03:00 |
|
|
2187cb5331
|
edit lv
|
2021-12-08 12:24:54 +03:00 |
|
|
475dd92c30
|
Web: Editor: Fixed history information.
|
2021-12-08 09:37:40 +03:00 |
|
|
6d96855e79
|
Web: Editor: Added list of history and possibility to close history.
# Conflicts:
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-12-08 09:37:02 +03:00 |
|
|
20a17fca96
|
rename pt
|
2021-12-07 16:50:09 +03:00 |
|
|
3607a54cd2
|
edit vi
|
2021-12-07 10:38:03 +03:00 |
|
|
f8bdd48db8
|
add pt_PT
|
2021-12-06 18:21:13 +03:00 |
|
|
0952d01250
|
add uk
|
2021-12-06 17:29:41 +03:00 |
|
|
40c5a0d6b2
|
add az
|
2021-12-06 17:11:54 +03:00 |
|
|
4fef520aba
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-06 15:09:57 +03:00 |
|
|
af2e95dfd7
|
edit cs
|
2021-12-06 11:28:11 +03:00 |
|
|
086cc8efd2
|
Web: Fixed format of searchParam for files selector
|
2021-12-03 18:41:57 +03:00 |
|
|
bc58174a89
|
update pl
|
2021-12-01 18:13:16 +03:00 |
|
|
e1b0164bd3
|
update cs
|
2021-12-01 18:04:36 +03:00 |
|
|
00f2e1821e
|
edit cs
|
2021-12-01 18:03:54 +03:00 |
|
|
0ba91e0100
|
update cs
|
2021-12-01 17:54:46 +03:00 |
|
|
e4ee37660e
|
update el
|
2021-12-01 17:40:56 +03:00 |
|
|
a17e301cde
|
update bg
|
2021-12-01 14:36:33 +03:00 |
|
|
39b10cf7b1
|
edit ro
|
2021-11-30 17:20:47 +03:00 |
|
|
77f86fccdb
|
update translations
|
2021-11-30 12:31:54 +03:00 |
|
|
b2c123d6f4
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-11-30 11:46:22 +03:00 |
|
|
a032b83a32
|
Web: Editor: Optimization - Removing unnecessary api requests.
|
2021-11-30 10:59:41 +03:00 |
|
|
bbe874054e
|
update translations
|
2021-11-29 12:37:32 +03:00 |
|
|
04a56e57cb
|
Web: Editor: Fixed bug with starting api calls before getting file id
|
2021-11-26 13:48:15 +03:00 |
|
|
bce51d74b6
|
Fix Bug 53438 - Client.Editor. Added redirect to homepage due to error
|
2021-11-25 16:37:36 +03:00 |
|
|
08746974f4
|
Web: SW: Added SW unregister + refactoring
|
2021-11-25 15:08:18 +03:00 |
|
|
ff9bb93efd
|
Web: Scripts: Hide shx mkdir errors
|
2021-11-25 15:06:19 +03:00 |
|
|
fcb6723d1f
|
Fixed Bug 53502 - Client.Editor.Added message about locked file.
|
2021-11-24 14:12:47 +03:00 |
|
|
3417cb28f4
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-22 11:25:49 +03:00 |
|
|
b632f3a623
|
Web: Fixed styles according layouts, renaming.
|
2021-11-22 10:15:24 +03:00 |
|
|
11d527ba03
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:40:24 +03:00 |
|
|
f675415228
|
Merge branch 'master' into release/v1.1.0
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:26:20 +03:00 |
|
|
2eb6843e46
|
Web: Editor: Added conditions for creating a file in my documents folder when filling out a form.
|
2021-11-19 10:28:57 +03:00 |
|
|
17e3e5cb98
|
bump version to 1.1.1
|
2021-11-12 15:21:25 +03:00 |
|
|
3809273075
|
bump version to 1.1.0
|
2021-11-12 15:19:40 +03:00 |
|
|
2ea63910a2
|
Web: Added encoding/decoding operations for string file ids. Fixed errors with opening folders and files with string id s
|
2021-11-11 15:37:23 +03:00 |
|
|
11769e8c9e
|
Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language.
|
2021-11-10 19:59:03 +03:00 |
|
|
4e018d2d71
|
Web: Bump version to 1.0.1
|
2021-11-02 14:02:46 +03:00 |
|
Artem Tarasov
|
8c6a3f9fcd
|
Web: Editor/Login: changed the way to save the link from sessionStorage to localStorage
|
2021-10-28 13:32:23 +03:00 |
|
Artem Tarasov
|
e42b09d025
|
Web: Editor/Login: fixed bug 53050: fixed redirect to editors after login when following a direct link to editors
|
2021-10-27 16:48:09 +03:00 |
|
|
8033b74ecd
|
Web: Editor: Hide loader on onSDKAppReady
|
2021-10-13 16:28:40 +03:00 |
|
|
ab6932113c
|
Web: Editor: Replaced loader
|
2021-10-13 16:14:35 +03:00 |
|
|
1c38f29440
|
Web: Added new logo files and setup is_retina cookie for better icons inside Editor on retina resolution
|
2021-10-13 15:19:31 +03:00 |
|
|
a1a4818136
|
Web: Fix Bug 53050: 404 on primary file link after logout
|
2021-10-12 12:10:09 +03:00 |
|
|
801c5ff561
|
Merge pull request #389 from ONLYOFFICE/feature/editor-edit-button
Web: Editor: Added edit editor button.
|
2021-10-07 19:26:36 +03:00 |
|
|
14fd3c82f5
|
Web: Deleted useless code.
|
2021-10-07 19:18:55 +03:00 |
|
|
1ee16ce600
|
Web: Editor: Added error handler.
|
2021-10-07 19:05:31 +03:00 |
|
|
659a5a409b
|
Web: Editor: Fixed url after converting.
|
2021-10-07 19:04:22 +03:00 |
|
|
b8f77d4a29
|
Web: Editor: Added edit editor button.
|
2021-10-07 18:31:45 +03:00 |
|
|
335c580d78
|
Web: Dev: Downgrade lerna to v3.22.1 and update webpack-dev-server and webpack-cli (yarn start + Ctrl-C stop issue)
|
2021-10-07 17:32:32 +03:00 |
|
|
6e926eceb9
|
Web: Removed browserslist (loading bundle issues)
|
2021-10-05 09:48:08 +03:00 |
|
|
912b9661c1
|
Web: Refactoring.
|
2021-09-30 18:31:18 +03:00 |
|
|
4aa710a833
|
Fix Bug 52850: Added image replacement.
|
2021-09-30 11:51:22 +03:00 |
|
|
74f422ac75
|
Merge branch 'develop' into release/1.0.0
|
2021-09-27 16:09:43 +03:00 |
|
|
6591080403
|
Fix Bug 52797 with unsupported browsers. Added new packages/browserslist-config-asc with browserlist.config.js
|
2021-09-27 16:04:37 +03:00 |
|
|
d2760c26b1
|
Fix Bug 52778 - Client.Editor.‘Image URL is incorrect’ when pasting an image from the repository.
|
2021-09-27 12:51:11 +03:00 |
|
|
4531d38e6f
|
Web: Removed duplicates
|
2021-09-24 21:18:50 +03:00 |
|
|
e87329f2d3
|
Fixed Bug 52646 - iOS.Docs.Mobile. Fixed the type of device for the editor
|
2021-09-21 12:17:26 +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 |
|
|
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 |
|
|
fe6014a440
|
Web: Update webpack to v5.52.1
|
2021-09-13 15:08:48 +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 |
|
|
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 |
|
|
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 |
|
|
15dab2adaa
|
Web: Updated copy-webpack-plugin package
|
2021-09-09 13:17:27 +03:00 |
|
|
5b880d5b6a
|
Web: Updated clean-webpack-plugin package
|
2021-09-09 12:58:49 +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 |
|
|
fabaaef0f9
|
Web: Updated react-toastify and extended ModuleFederationPlugin shared section
|
2021-09-08 16:28:10 +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 |
|
|
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 |
|
|
184adfa53a
|
Fix Bug 52249 - Client.Editor.Favorite. "Add to favorites" button for a third-party user opened by an external link of a registered file.
|
2021-09-07 09:49:00 +03:00 |
|
|
fa204303f5
|
Merge branch 'develop' into release/1.0.0
|
2021-09-01 16:08:41 +03:00 |
|
|
e52cd01fa2
|
Fix Error 52249 - Client.Editor.Favorite. "Add to favorites" button for a third-party user opened by an external link of a registered file.
|
2021-08-30 14:47:56 +03:00 |
|
|
cd66c4ffdb
|
Web: Editor: Refactoring.
|
2021-08-27 14:21:51 +03:00 |
|
|
beb2a6c707
|
Web:Editor: Refactoring.
|
2021-08-27 14:13:50 +03:00 |
|
|
19290bf8cb
|
Web: Editor: Added translation for documents type.
|
2021-08-27 13:46:03 +03:00 |
|
|
7fba408991
|
Web: Editor: Added option "Compare files" for editor.
|
2021-08-27 13:25:23 +03:00 |
|
|
c66268a9c2
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/helpers/utils.js
|
2021-08-26 13:49:25 +03:00 |
|
|
a8f2f7348a
|
Web: Files: Editor: fixed successAuth
|
2021-08-23 18:20:36 +03:00 |
|
|
bbbdc79a21
|
WEb: Files: Added folder tree reset.
|
2021-08-19 19:08:58 +03:00 |
|
|
02d2f04b94
|
Web: Editor: Fixed renaming of documents when save as.
|
2021-08-19 17:23:16 +03:00 |
|
|
fbf82a59ca
|
Web: Files/Editor: Fixed folder tree for select file component.
|
2021-08-19 16:44:41 +03:00 |
|
|
fc32619c9a
|
WEb: Editor: Deleted useless code.
|
2021-08-19 14:55:39 +03:00 |
|
|
779f52b028
|
Web: Editor: rewrite with loadScript
|
2021-08-19 13:31:17 +03:00 |
|
|
1bc7863168
|
Web: Editor: Fixed sharing settings display.
|
2021-08-19 11:45:03 +03:00 |
|
|
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 |
|
|
03a030ebd0
|
Web: Editor: Added missing await syntactic.
|
2021-08-18 09:57:55 +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 |
|