|
|
46f58ef998
|
Merge branch 'develop' into feature/dark-theme
|
2021-12-10 19:04:32 +08:00 |
|
|
|
653642e1b1
|
Merge branch 'develop' into feature/add-table-version
|
2021-11-26 18:23:49 +03:00 |
|
|
|
fb637b43f1
|
Web: added version for table
|
2021-11-25 17:38:09 +03:00 |
|
|
|
384e012c5f
|
net 6: remove TryUseWindowsService
|
2021-11-25 16:48:08 +03:00 |
|
|
|
fde636c586
|
net 6: update packages
|
2021-11-25 16:41:24 +03:00 |
|
|
|
1d7d29039f
|
Store updated
|
2021-11-25 10:29:27 +03:00 |
|
|
|
4273c519e0
|
Files: dispose custom ResponseStream
|
2021-11-25 10:02:52 +03:00 |
|
|
|
13e13f2303
|
Net: fix requests
|
2021-11-24 22:34:39 +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 |
|
|
|
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 |
|
|
|
9ad5e54c1d
|
Files: optimization
|
2021-11-18 18:32:12 +03:00 |
|
Artem Tarasov
|
f33d99c9c0
|
Web: People/Common: added sorting of groups in the tree
|
2021-11-16 19:27:27 +03:00 |
|
|
|
d403fa1dcd
|
Web: People: removed log
|
2021-11-15 18:37:29 +03:00 |
|
|
|
7ca1a18a37
|
Web: People: added translations for column position
|
2021-11-15 18:35:08 +03:00 |
|
|
|
adbb316dd2
|
Web: moved "Owner" translation to Common
|
2021-11-15 18:33:32 +03:00 |
|
|
|
13fdab9e1f
|
Web: Files: fixed markAsRead action
|
2021-11-15 17:55:02 +03:00 |
|
|
|
b72760c789
|
Web: People: fixed Paging tReady
|
2021-11-15 17:44:21 +03:00 |
|
|
|
5ed03e0351
|
Web: People: Fix displaying error on Avatar save
|
2021-11-13 20:31:43 +03:00 |
|
|
|
d6836cc3d3
|
Merge pull request #457 from ONLYOFFICE/feature/translate-1.0.1
Feature/translate 1.0.1
|
2021-11-13 20:04:11 +03:00 |
|
|
|
cd21a4013d
|
Web: Restored missing translations
|
2021-11-13 19:15:50 +03:00 |
|
|
|
2c6e0d45bc
|
Web: Fix wrong braces of variables inside translation files
|
2021-11-13 19:07:48 +03:00 |
|
|
|
c7c7267a9a
|
Test: Added new WrongTranslationVariablesTest and fix it's issues
|
2021-11-13 19:03:10 +03:00 |
|
|
|
478ca3215b
|
Web: Restored missing translations
|
2021-11-12 21:53:28 +03:00 |
|
|
|
9eb6c04a5a
|
Web: Removed useless translation keys
|
2021-11-12 21:52:47 +03:00 |
|
|
|
623313e4be
|
Web: Restored missing 'ru' translations
|
2021-11-12 21:14:44 +03:00 |
|
|
|
5ff07a8293
|
Web: Fix UselessTranslationKeysTest translation issues
|
2021-11-12 20:46:04 +03:00 |
|
|
|
d45f863f64
|
Web: Files: Fix showing success operation toast on empty trash
|
2021-11-12 20:45:31 +03:00 |
|
|
|
1c8f091dce
|
Web: Fix DublicatesByContentTest translation issues
|
2021-11-12 20:12:33 +03:00 |
|
|
|
d8cf12f9d7
|
translations
|
2021-11-12 19:00:01 +03:00 |
|
|
|
400612f9ff
|
Web: Files: fixed checkUpdateNode
|
2021-11-12 17:22:17 +03:00 |
|
|
|
63aee3fd73
|
Merge pull request #456 from ONLYOFFICE/bugfix/fixed-tree-menu-class-list
Web: Files: moved the tree id from classname to dataset
|
2021-11-12 16:44:50 +03:00 |
|
|
|
b5b61c4385
|
Web: Files: fixed tree folders drag
|
2021-11-12 16:16:17 +03:00 |
|
|
|
3c0b1a410e
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-12 17:50:05 +05:00 |
|
|
|
77de50578d
|
Fixed bug 53531 - Web: Files: added toastr when we delete a file or folder
|
2021-11-12 17:49:50 +05:00 |
|
|
|
0bd634dd16
|
Web: Files: added className for tree root folders
|
2021-11-12 15:36:56 +03:00 |
|
|
|
eb5f69213e
|
Web: Files: Settings: added className to TreeSettings
|
2021-11-12 14:33:32 +03:00 |
|
|
|
3363cb4111
|
Web: added className to MainButton
|
2021-11-12 14:17:20 +03:00 |
|
|
|
9b6d9dac6f
|
Web: People: added classNames for MainButton items
|
2021-11-12 14:13:47 +03:00 |
|
|
|
8910f4446a
|
Web: Files: added className for MainButton items
|
2021-11-12 14:13:29 +03:00 |
|
|
|
549a0abe99
|
Web: Files: moved the tree id from classname to dataset
|
2021-11-12 12:25:28 +03:00 |
|
|
|
ea1a64cbab
|
Web: Files: fixed addNewFile
|
2021-11-11 18:41:09 +03:00 |
|
|
|
967d6123a1
|
Merge pull request #455 from ONLYOFFICE/bugfix/fix-diplay-converted-files
Fixed Bug 53633 - Client: Files. Fixed display of files after conversion
|
2021-11-11 18:29:39 +03:00 |
|
|
|
40fb928ee7
|
Fixed Bug 53633 - Client: Files. Fixed display of files after conversion
|
2021-11-11 17:40:50 +03:00 |
|
|
|
ae0a437474
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-11 19:25:50 +05:00 |
|
|
|
4c55228f73
|
Fixed bug 53162 - Web: Files: fixed context-menu-wrapper padding since row was shifted
|
2021-11-11 19:25:39 +05:00 |
|
|
|
2b5e4bad38
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-11 15:37:31 +03:00 |
|
|
|
2ea63910a2
|
Web: Added encoding/decoding operations for string file ids. Fixed errors with opening folders and files with string ids
|
2021-11-11 15:37:23 +03:00 |
|
|
|
0fdb4a3218
|
Web: Files: fix memory leak
|
2021-11-11 14:32:13 +03:00 |
|
