|
|
4273c519e0
|
Files: dispose custom ResponseStream
|
2021-11-25 10:02:52 +03:00 |
|
|
|
c1f9bcc445
|
Web: Files: Store: Disabled form filling for external access sharing
|
2021-11-25 00:11:29 +03:00 |
|
|
|
13e13f2303
|
Net: fix requests
|
2021-11-24 22:34:39 +03:00 |
|
|
|
d572debd4e
|
Web: Files: Store: Fixed ‘Fill in the form’ context menu item for the .oform format in the Trash folder.
|
2021-11-24 13:02:19 +03:00 |
|
|
|
b74e4ccfd1
|
Removed unused dependencies. Fixed tests
|
2021-11-24 12:39:39 +03:00 |
|
|
|
59c88e2006
|
up to 6.0.0
|
2021-11-23 17:56:27 +03:00 |
|
|
|
8ca88e4620
|
Merge branch 'develop' into feature/net6
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/ASC.Common.csproj
# products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
|
2021-11-23 16:40:50 +03:00 |
|
|
|
6ccda4d68d
|
UserManager: revert cache
|
2021-11-23 15:25:34 +03:00 |
|
|
|
197ce829b4
|
Merge branch 'develop' into feature/reworked-user-service
|
2021-11-23 15:01:23 +03:00 |
|
|
|
89e7b494c4
|
Web: People: Fixed translation ChangeUserStatusDialog, fixed translation ChangeUsersActiveStatus, ChangeUsersDisableStatus for en language
|
2021-11-23 12:24:24 +03:00 |
|
|
|
2f21f2246a
|
Merge branch 'develop' into feature/mobile-main-button
|
2021-11-22 16:39:22 +03:00 |
|
|
|
54a58916ed
|
Web: Common: Filter: fixed multiple api request
|
2021-11-22 16:29:32 +03:00 |
|
|
|
16b564a86c
|
Web: Components: fixed empty-screen styles
|
2021-11-22 15:37:30 +03:00 |
|
|
|
52626a548e
|
Web: fixed Snackbar styles
|
2021-11-22 15:01:33 +03:00 |
|
|
|
51d6f72862
|
Web: Files: Fix translation
|
2021-11-22 14:58:06 +03:00 |
|
|
|
ff6986ddb1
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-22 14:50:11 +03:00 |
|
|
|
3bee202d41
|
Web: Files: Replaced translation on common.
|
2021-11-22 14:23:45 +03:00 |
|
|
|
38feb79725
|
Web: Fixed aside loader.
|
2021-11-22 14:18:46 +03:00 |
|
|
|
2b84cd3f63
|
Web: Files: Fix translation
|
2021-11-22 13:03:16 +03:00 |
|
|
|
e883e86e64
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-22 11:47:45 +03:00 |
|
|
|
228394727e
|
Web: Styles: Fixed styles.
|
2021-11-22 11:43:37 +03:00 |
|
|
|
3bd204cbdb
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-22 11:29:07 +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 |
|
|
|
05c96e140a
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-22 11:22:25 +03:00 |
|
|
|
470fd7ffcb
|
Web: People: MainButton: Added missing actions
|
2021-11-22 11:21:58 +03:00 |
|
|
|
5e9ad53f6f
|
Web: Tests: Fix key 'ns' issues
|
2021-11-22 11:19:52 +03:00 |
|
|
|
ca60cc8e0a
|
Web: Files: Replaced translation to Common
|
2021-11-22 11:18:36 +03:00 |
|
|
|
b6f98f9531
|
Web: Files: Added missing mobile translations
|
2021-11-22 11:17:33 +03:00 |
|
|
|
2e58ea6061
|
Web: Files: removed useless code.
|
2021-11-22 10:19:49 +03:00 |
|
|
|
b632f3a623
|
Web: Fixed styles according layouts, renaming.
|
2021-11-22 10:15:24 +03:00 |
|
|
|
d94ea502df
|
Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop
|
2021-11-21 16:47:25 +03:00 |
|
|
|
643c1ce6f1
|
fixed build.bat
|
2021-11-21 16:46:09 +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 |
|
|
|
d31ea87211
|
Merge branch 'master' into develop
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2021-11-21 13:57:55 +03:00 |
|
|
|
366db9d885
|
Merge pull request #464 from ONLYOFFICE/hotfix/v1.0.1
Hotfix/v1.0.1
|
2021-11-21 12:36:32 +03:00 |
|
|
|
96759f10f1
|
Web: Components: Fixed tests warnings
|
2021-11-20 00:40:25 +03:00 |
|
|
|
c10944f8fa
|
Web: Components: ContextMenu: Refactoring
|
2021-11-20 00:17:25 +03:00 |
|
|
|
9571f6575d
|
Merge branch 'develop' into feature/reworked-user-service
|
2021-11-19 19:18:41 +03:00 |
|
|
|
fb197315f9
|
fix buildAndDeploy.bat
|
2021-11-19 18:21:21 +03:00 |
|
|
|
56ecbc95ea
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-19 18:18:13 +03:00 |
|
|
|
e7f92b096c
|
Web: Added new translation and files for another languages.
|
2021-11-19 18:17:46 +03:00 |
|
|
|
180ca914ad
|
Web: Files: HOC: Fixed form icon inside context menu
|
2021-11-19 18:08:11 +03:00 |
|
|
|
677263354f
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-19 18:01:56 +03:00 |
|
|
|
4b095ecdd6
|
Web: People: MainButton: Reworked data model for button items
|
2021-11-19 18:01:47 +03:00 |
|
|
|
922622676c
|
Web: Files: MainButton: Reworked data model for button items
|
2021-11-19 18:01:34 +03:00 |
|
|
|
8e88d27340
|
Web: Files: Article: Added translations for sub-level menu
|
2021-11-19 18:00:40 +03:00 |
|
|
|
50db047ca8
|
Web: Components: MainButton: Reworked MainButton component
|
2021-11-19 17:59:58 +03:00 |
|
|
|
8ecdc5bdf5
|
Web: Components: ContextMenu: Added property`s for creating menu by component
|
2021-11-19 17:59:10 +03:00 |
|
|
|
4cd9d042de
|
Web: Files: fixed styles after Cherry picking.
|
2021-11-19 16:58:31 +03:00 |
|
|
|
4ccc19981b
|
Web: Files: Force loading dialog translations.
|
2021-11-19 16:10:24 +03:00 |
|
