|
5237c5ae98
|
ASC.UrlShortener: Upgrade yarn to v3.2.2
|
2022-07-29 22:26:54 +03:00 |
|
|
50ed43af17
|
ASC.SsoAuth: Upgrade yarn to v3.2.2
|
2022-07-29 22:25:53 +03:00 |
|
|
b2454b35ce
|
ASC.Socket.IO: Upgrade yarn to v3.2.2
|
2022-07-29 22:24:09 +03:00 |
|
|
995d07deae
|
Web: Upgrade yarn to v3.2.2
|
2022-07-29 18:20:57 +03:00 |
|
|
f068d41b4f
|
Configured frontend.code-workspace
|
2022-07-29 12:21:10 +03:00 |
|
|
4c097607f9
|
Web: Fix position of MainButton with logo and display logo
|
2022-07-29 10:17:41 +03:00 |
|
|
211ac2666f
|
Web: Fix error on user equals null
|
2022-07-28 19:11:48 +03:00 |
|
|
027b23ba92
|
Web: Added toast
|
2022-07-28 19:10:58 +03:00 |
|
|
98645969b6
|
Web: Moved some files from past locations
|
2022-07-28 19:10:36 +03:00 |
|
|
c1ab8edaaf
|
Merge branch 'develop' into refactoring/client
|
2022-07-28 18:32:32 +03:00 |
|
|
4c26d1301a
|
Merge pull request #743 from ONLYOFFICE/bugfix/doceditor-build-fix
Bugfix/doceditor build fix
|
2022-07-28 18:30:05 +03:00 |
|
Artem Tarasov
|
3ff0ae9d44
|
Merge branch 'develop' into bugfix/doceditor-build-fix
|
2022-07-28 17:40:54 +03:00 |
|
Artem Tarasov
|
5496cdbe05
|
Web: Doceditor/build: changed deploy path for editor
|
2022-07-28 17:39:25 +03:00 |
|
|
a87497a385
|
Web: Moved src/components/pages/* to src/pages + Added new aliases SRD_DIR, PACKAGE and fix paths + Renamed /settings to /portal-settings
|
2022-07-28 17:34:27 +03:00 |
|
Artem Tarasov
|
df74259b50
|
Web: Doceditor: added config to define port
|
2022-07-28 17:11:38 +03:00 |
|
|
256c2de843
|
Web: Removed modules dependencies and People and Files mobx providers
|
2022-07-28 16:11:55 +03:00 |
|
Artem Tarasov
|
9921925bdb
|
Web: Doceditor: express is included in server build, added required dependencies
|
2022-07-28 15:40:46 +03:00 |
|
Sergey Kirichenko
|
a7ebccb5cb
|
Add doceditor docker service (#742)
* Add docker doceditor service
* fix
* Cosmetic modify
* Cosmetic modify
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
|
2022-07-28 15:33:03 +03:00 |
|
|
53737a06e8
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/editor/src/client/components/DynamicComponent.js
# packages/editor/src/client/components/Editor.js
# packages/editor/src/client/components/SelectFileDialog.js
# packages/editor/src/client/components/SelectFolderDialog.js
# packages/editor/src/client/components/SharingDialog.js
# packages/editor/src/client/helpers/utils.js
# packages/editor/src/client/helpers/withDialogs.js
# packages/editor/src/server/lib/helpers/index.js
|
2022-07-28 10:38:29 +03:00 |
|
|
d21ad45c25
|
Merge pull request #741 from ONLYOFFICE/bugfix/rooms-webdav
bugfix/rooms-webdav
|
2022-07-27 17:48:39 +03:00 |
|
|
12e167ca84
|
Files: fix archive folder for WebDav
|
2022-07-27 17:34:10 +03:00 |
|
Sergey Kirichenko
|
2a1883977c
|
Add feature for migration db in docker (#740)
* Add migration runner build image
* Add path for migration.runner build
* Modifiex build path migration.runner
* Fix migration-runner.yml
* Modify reference format for dockerhub
* Fix
* Check build reference format
* Fix build
* Modify migration runner build path
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
|
2022-07-27 16:48:00 +03:00 |
|
|
6091fe7d2a
|
Sso: fix
|
2022-07-26 18:14:53 +03:00 |
|
|
391822a8d3
|
Merge pull request #738 from ONLYOFFICE/bugfix/doceditor-fix
Bugfix/doceditor fix
|
2022-07-26 17:13:03 +03:00 |
|
|
6b50703881
|
Merge branch 'develop' into bugfix/doceditor-fix
|
2022-07-26 17:12:50 +03:00 |
|
|
33769036d5
|
fix
|
2022-07-26 14:53:36 +03:00 |
|
|
3d22992b7d
|
Migrations: rename
|
2022-07-26 14:52:53 +03:00 |
|
|
e4df3b2371
|
fix
|
2022-07-26 13:39:16 +03:00 |
|
|
6e0aa3a6f9
|
fix
|
2022-07-26 13:21:21 +03:00 |
|
|
c5baa8834d
|
Web: Fix 'Accounts' imports, routes and includes
|
2022-07-26 12:51:52 +03:00 |
|
Artem Tarasov
|
2988838060
|
Merge branch 'develop' into bugfix/doceditor-fix
|
2022-07-26 12:32:41 +03:00 |
|
Artem Tarasov
|
2529a7a123
|
Web: Doceditor: fixed convert file
|
2022-07-26 12:32:04 +03:00 |
|
Sergey Kirichenko
|
5dfc123374
|
Add docker services build (#739)
* Add docker services
* fix build, fix notify
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
|
2022-07-26 12:26:42 +03:00 |
|
|
0fe40c3669
|
Merge pull request #714 from ONLYOFFICE/feature/migrations-fix
Feature/migrations fix
|
2022-07-26 12:02:32 +03:00 |
|
|
dc4f066b05
|
Merge branch 'develop' into feature/migrations-fix
|
2022-07-26 11:37:48 +03:00 |
|
Artem Tarasov
|
294cdf4881
|
Web: Files/Doceditor: fixed method call SharingPanel.convertSharingUsers (ssr)
|
2022-07-26 11:19:01 +03:00 |
|
Artem Tarasov
|
045c00b4ff
|
Web: Common/Doceditor: fixed name of init state of editor
|
2022-07-26 10:56:25 +03:00 |
|
|
0ebd28f299
|
Web: Merged 'People' module with 'Client' and fixed paths
|
2022-07-25 22:19:47 +03:00 |
|
|
280f702cf9
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/NavMenu/index.js
# packages/client/src/store/ProfileActionsStore.js
# yarn.lock
|
2022-07-25 21:29:04 +03:00 |
|
|
824232c01a
|
fix
|
2022-07-25 19:31:37 +03:00 |
|
|
ab015538d9
|
fix
|
2022-07-25 19:20:16 +03:00 |
|
|
e8bcfce41a
|
removed sql files
added runMigrations.bat
|
2022-07-25 19:03:37 +03:00 |
|
Artem Tarasov
|
42c42f19eb
|
Merge branch 'develop' into bugfix/doceditor-fix
|
2022-07-25 18:05:08 +03:00 |
|
Artem Tarasov
|
d50a932443
|
Web: Doceditor: removed PreparePortalDialog and added a call to docEditor.showMessage when the portal is being restored
|
2022-07-25 17:57:44 +03:00 |
|
Artem Tarasov
|
eb352fd860
|
Web: Client/public: Moved PreparePortalTitle key from PreporationPortal.json to Common.json.
|
2022-07-25 17:54:51 +03:00 |
|
|
17a15852a8
|
fix
|
2022-07-25 17:36:52 +03:00 |
|
|
b1ae889f75
|
fix
|
2022-07-25 17:29:46 +03:00 |
|
Artem Tarasov
|
64305a3c2c
|
Web: Common/Doceditor: fixed request of build version and custom scheme
|
2022-07-25 17:10:38 +03:00 |
|
|
cb066ea5eb
|
Merge pull request #737 from ONLYOFFICE/bugfix/article
Bugfix/article
|
2022-07-25 17:00:56 +03:00 |
|
|
1d12faaa60
|
AutoMigrationCreator separated in two projects
|
2022-07-25 16:57:16 +03:00 |
|