|
|
b9fa0f4673
|
Web: Added new options for Amazon storage.
|
2022-07-29 18:04:23 +03:00 |
|
Artem Tarasov
|
a649228525
|
Web: Doceditor: added React.Suspense
|
2022-07-29 16:16:17 +03:00 |
|
|
|
9d69882cf3
|
removed BaseDbContext
|
2022-07-29 15:53:29 +03:00 |
|
|
|
6fd385e026
|
Merge branch 'develop' into feature/docspace-backup
|
2022-07-29 11:13:42 +03:00 |
|
|
|
dba122eb96
|
Common, files: added dbcontext pool
|
2022-07-28 21:00:49 +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 |
|
Artem Tarasov
|
5496cdbe05
|
Web: Doceditor/build: changed deploy path for editor
|
2022-07-28 17:39:25 +03:00 |
|
Artem Tarasov
|
df74259b50
|
Web: Doceditor: added config to define port
|
2022-07-28 17:11:38 +03:00 |
|
|
|
90cd7c1dbf
|
Web: Added missed prop.
|
2022-07-28 15:54:08 +03:00 |
|
|
|
5651d3645e
|
Web: Refactoring.
|
2022-07-28 15:50:09 +03:00 |
|
Artem Tarasov
|
9921925bdb
|
Web: Doceditor: express is included in server build, added required dependencies
|
2022-07-28 15:40:46 +03:00 |
|
|
|
8d89d8e8f2
|
Common: added dbcontext pool
|
2022-07-28 15:29:03 +03:00 |
|
|
|
e61d77b624
|
Web: Optimization of component.
|
2022-07-28 12:42:34 +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 |
|
|
|
ddcde5f7ed
|
Web: Backup: Added error handlers, filtered the list of accounts in the correct order, removed base folder selection .
|
2022-07-27 18:29:27 +03:00 |
|
|
|
6091fe7d2a
|
Sso: fix
|
2022-07-26 18:14:53 +03:00 |
|
|
|
6f8b849a09
|
Web:Studio: Styled Appearance.
|
2022-07-26 18:08:58 +03:00 |
|
|
|
721e442374
|
Web:Studio:Add BreakpointWarning component.
|
2022-07-26 18:08:00 +03:00 |
|
|
|
8be8b072d1
|
Web: Restore: Returned restore.
|
2022-07-26 16:50:22 +03:00 |
|
|
|
a7a70246fc
|
Web: Backup: Added missed props.
|
2022-07-26 15:53:35 +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 |
|
|
|
81e7526c10
|
Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup
|
2022-07-26 12:04:25 +03:00 |
|
|
|
5dccd8f52c
|
Web: Backup: Added direct third-party connection component.
|
2022-07-26 12:03:35 +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 |
|
|
|
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 |
|
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 |
|
Artem Tarasov
|
64305a3c2c
|
Web: Common/Doceditor: fixed request of build version and custom scheme
|
2022-07-25 17:10:38 +03:00 |
|
|
|
46a0d3f446
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/article
|
2022-07-25 16:47:15 +03:00 |
|
Artem Tarasov
|
e701def2d7
|
Web: Common/Doceditor: fixed portal settings request
|
2022-07-25 16:24:10 +03:00 |
|
Artem Tarasov
|
ba40abd43e
|
Web: Common/Doceditor: fixed user request when initializing auth state
|
2022-07-25 16:14:24 +03:00 |
|
|
|
09f3b29fe9
|
backup s3
|
2022-07-25 16:13:36 +03:00 |
|
Artem Tarasov
|
9dcff71504
|
Web: Doceditor/Client: fixed share settings request (ssr)
|
2022-07-25 14:52:18 +03:00 |
|
|
|
8acb550b08
|
files helpers moved to ASC.Files.Core
|
2022-07-25 14:03:31 +03:00 |
|
Artem Tarasov
|
57fb7ca7e1
|
Web: Doceditor: fixed api requests
|
2022-07-25 13:24:43 +03:00 |
|
|
|
57f797ab24
|
Merge branch 'develop' into feature/migrations-fix
|
2022-07-25 12:59:19 +03:00 |
|
|
|
c01edd78be
|
Api: Capabilities fix
|
2022-07-25 12:57:03 +03:00 |
|
Artem Tarasov
|
06450fe804
|
Merge branch 'develop' into bugfix/doceditor-fix
|
2022-07-25 10:39:06 +03:00 |
|
Artem Tarasov
|
5656eb6072
|
Web: Doceditor: optimized dialog rendering
|
2022-07-25 10:37:57 +03:00 |
|
|
|
61ec4a18da
|
migrations moved to external projects
|
2022-07-24 16:02:00 +03:00 |
|
|
|
ea74b77dcd
|
Web: Client: move toast to shell
|
2022-07-24 00:50:19 +03:00 |
|
|
|
86337271e4
|
Web: Client: IndicatorLoader: fix position
|
2022-07-23 22:07:50 +03:00 |
|
|
|
8152557397
|
Web: Client: Settings: fix article loader
|
2022-07-23 22:07:25 +03:00 |
|
|
|
bcf6faf40d
|
Web: Client: add dialogs wrapper, fix rerender
|
2022-07-23 02:15:16 +03:00 |
|
|
|
7cf51de990
|
Web: Client: ProfileActionsStore: fix open about
|
2022-07-23 02:07:37 +03:00 |
|
Vashchuk Nikita
|
b336eafa37
|
Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-22 22:40:58 +03:00 |
|
Vashchuk Nikita
|
8a1a8b809f
|
fix contexts
|
2022-07-22 22:31:42 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
|
|
e07e2be900
|
Api: theme method is now anonymous
|
2022-07-22 19:32:51 +03:00 |
|
|
|
12e7d4edbf
|
Merge branch 'develop' into feature/settings-common
|
2022-07-22 13:22:59 +03:00 |
|
|
|
c7ed3ed7bf
|
Web:Studio:Added a toastr.
|
2022-07-22 13:19:30 +03:00 |
|
|
|
82759ba40d
|
Web:Studio:Saving the selected theme.
|
2022-07-22 11:13:06 +03:00 |
|
|
|
61a1862f50
|
Web: Client: ProfileActionsStore: add icon
|
2022-07-22 10:31:32 +03:00 |
|
|
|
180aa03d95
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-22 10:22:52 +03:00 |
|
|
|
b0682e5da3
|
Api: fixed colortheme
|
2022-07-21 20:51:01 +03:00 |
|
|
|
9792fcb72f
|
api: fix
|
2022-07-21 18:06:34 +03:00 |
|
Artem Tarasov
|
284f0ef58d
|
Web: Common/Client: deleted unnecessary comment, fix import tryRedirectTo
|
2022-07-21 18:05:23 +03:00 |
|
|
|
4e83c68e4c
|
Api: added themelimit
|
2022-07-21 18:02:32 +03:00 |
|
|
|
fbc4bc000b
|
Web: Login: add docspace logo
|
2022-07-21 17:08:58 +03:00 |
|
|
|
88c23a0453
|
Web: Client: hide header on login page
|
2022-07-21 16:41:29 +03:00 |
|
Artem Tarasov
|
f191e3f3ca
|
Web: Doceditor: fixed logpath
|
2022-07-21 16:01:01 +03:00 |
|
|
|
3bc5f3a6eb
|
Api: added theme methods
|
2022-07-21 14:49:30 +03:00 |
|
|
|
fa5bec9adc
|
Web: Client: NavMenu: fix logo position
|
2022-07-21 14:49:00 +03:00 |
|
Artem Tarasov
|
67e6e54f45
|
Web: Doceditor: fixed timeout clearing before broadcast signal after client build
|
2022-07-21 14:48:50 +03:00 |
|
|
|
80de7c43d4
|
Web: Client: move indicator loader from navmenu
|
2022-07-21 14:37:44 +03:00 |
|
|
|
831bdc578f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-21 14:22:28 +03:00 |
|
Artem Tarasov
|
243ccf34a5
|
Web: Doceditor: fixed adding script with src="undefined", client bundle optimization
|
2022-07-21 13:56:59 +03:00 |
|
|
|
77d311b636
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 11:41:42 +03:00 |
|
Artem Tarasov
|
166eaadde0
|
Web: Doceditor: changed server hierarchy, optimization of dev and prod server builds, client refactoring
|
2022-07-21 02:50:50 +03:00 |
|
|
|
1495190df7
|
Web:Studio:Modal save button work.
|
2022-07-20 23:47:14 +03:00 |
|
Artem Tarasov
|
36f10d4959
|
Web: Doceditor: refactoring
|
2022-07-20 23:23:53 +03:00 |
|
Artem Tarasov
|
b7ceb047df
|
Web: Doceditor: added winston to initMiddleware
|
2022-07-20 23:14:20 +03:00 |
|
|
|
a5f4435b17
|
fix notify
|
2022-07-20 22:06:33 +03:00 |
|
Artem Tarasov
|
3f4e4f599c
|
Web: Doceditor: fixed webpack production build
|
2022-07-20 14:44:44 +03:00 |
|
Artem Tarasov
|
abdfe934d6
|
Web: Doceditor: fixed process.cwd -> path.join
|
2022-07-20 14:43:27 +03:00 |
|
Artem Tarasov
|
77b7fc884e
|
Web: Doceditor: fixed build and deploy scripts
|
2022-07-20 14:42:35 +03:00 |
|
|
|
68bfe739ca
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-20 14:15:42 +03:00 |
|
|
|
5b762545a4
|
Merge branch 'develop' into feature/settings-common
|
2022-07-20 14:00:11 +03:00 |
|
Artem Tarasov
|
20d31cb0c2
|
Web: Doceditor: refactoring, restoring error message display
|
2022-07-20 13:25:09 +03:00 |
|
|
|
cccd0cfc31
|
Web:Studio:Added modal button functionality.
|
2022-07-20 13:00:13 +03:00 |
|
|
|
2c9a4f8181
|
Web: Client: fix t ns and keys
|
2022-07-20 12:27:30 +03:00 |
|
|
|
cf1b168dd6
|
Web: move locales to Common
|
2022-07-20 12:22:38 +03:00 |
|
|
|
75042eedf0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
|
2022-07-20 10:00:32 +03:00 |
|
|
|
df26c82593
|
Tfa: fix reset cookie
|
2022-07-20 09:56:24 +03:00 |
|
Artem Tarasov
|
37dbf5e38f
|
Web: Doceditor: fixed render SelectFolderDialog
|
2022-07-20 02:19:40 +03:00 |
|
Artem Tarasov
|
aafb79500f
|
Web: Doceditor: moved client i18n initialization from developer, fixed render SelectFileDialog
|
2022-07-20 00:52:49 +03:00 |
|
Artem Tarasov
|
3f8a1d9f99
|
Web: Doceditor: fixed render dialogs, added MobxProvider
|
2022-07-20 00:17:37 +03:00 |
|
Artem Tarasov
|
040880d3c7
|
Web: Doceditor: fixed font loading
|
2022-07-19 23:12:38 +03:00 |
|
Artem Tarasov
|
4ddffad7b2
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-19 18:22:16 +03:00 |
|
|
|
66b0e8c303
|
Merge branch 'develop' into bugfix/tfa
|
2022-07-19 18:17:22 +03:00 |
|
|
|
067e105814
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-19 16:58:02 +03:00 |
|
|
|
b98524532f
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-19 16:04:29 +03:00 |
|
|
|
c17817eed8
|
Web: Client: NavMenu: delete email
|
2022-07-19 14:35:48 +03:00 |
|
|
|
0c2d54638f
|
Web: Client: NavMenu: fix button size
|
2022-07-19 14:10:36 +03:00 |
|
|
|
7f241f4c90
|
Web: Client: add profile actions
|
2022-07-19 14:08:06 +03:00 |
|
