Commit Graph

6647 Commits

Author SHA1 Message Date
877095f525 analizators/s3923 2021-12-29 17:40:19 +03:00
f244266378 analizators/s3966 2021-12-28 18:50:54 +03:00
5e91416c53 analizators/s4035 2021-12-28 18:44:54 +03:00
895e888ad3 analizators/s4144 2021-12-28 17:04:52 +03:00
6cd3a7bfe1 analizators/s4201 2021-12-28 17:03:05 +03:00
ee79cecf36 analizators/s4457 2021-12-28 16:19:53 +03:00
af1c812cac analizators/s4586 2021-12-28 15:03:12 +03:00
0a786bbfa3 analizators/s4830 2021-12-28 15:00:48 +03:00
352a8b61ff analizators/s5034 2021-12-28 14:54:10 +03:00
fb3bfba1bd Files: optimization 2021-12-16 15:49:35 +03:00
a62a555217 Files: tagDao. Precompiled queries 2021-12-10 17:04:33 +03:00
30c138ef8b Files: optimization configuration 2021-12-10 17:02:44 +03:00
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03: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
80d6b801eb Web: Files: fix upload panel loading button 2021-11-11 14:24:22 +03:00
0006d428e3 Web: Files: fixed update tree nodes 2021-11-11 12:21:43 +03:00
b34d8091f3 Web: Files: fixed error notifications for upload panel 2021-11-11 12:10:39 +03:00
84add544f9 Web: Crm: Changed i18n config 2021-11-10 21:27:02 +03:00
6b299a48e3 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-10 21:25:08 +03:00
0f2b65c215
Merge pull request #438 from ONLYOFFICE/bugfix/sharing-panel
Bugfix/sharing panel
2021-11-10 21:24:19 +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
cab7603f5b Fixed Bug 53415: Fixed save avatar click 2021-11-10 18:33:21 +03:00
09520f60fb Web: People: fixed styles 2021-11-10 13:59:34 +03:00
0b13f992bd Web: Files: fixed upload 2021-11-09 18:24:16 +03:00
6de5f819ae Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-09 17:55:35 +03:00
51fec4ff31 Web: Files: Fixed error for getting subfolders of root 2021-11-09 17:54:26 +03:00
75828a376d Files: added GetThumbnailAsync 2021-11-09 17:31:19 +03:00
Artem Tarasov
8ddf907338
Merge pull request #452 from ONLYOFFICE/bugfix/fix-tile-view-styles
Web: Files: fixed TileContainer styles
2021-11-09 16:48:04 +03:00
4e78e46125 Web: Files: fixed TileContainer padding 2021-11-09 16:20:32 +03:00
33944ccb3e Web: Files: Fixed delete operation without modal dialog. 2021-11-09 15:52:17 +03:00
86269ab984 Web: files: Added new selection for delete operation. 2021-11-09 15:23:42 +03:00
e7845b2152 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
2021-11-09 15:16:08 +03:00
1d8fa34930 Web: Deleted useless code. 2021-11-09 15:13:37 +03:00
de49f86398 Web: Files: fixed TileContainer styles 2021-11-09 15:12:24 +03:00
4d5aef2163 Web: Files: Deleted useless code. 2021-11-09 13:49:30 +03:00
44a101beae Web: Refactoring, added bufferSelection. 2021-11-09 13:47:55 +03:00
3af660cc09 Web: Files: Fixed moving through the context menu. 2021-11-09 12:58:35 +03:00
b7053a84eb Web: Files: Deleted useless code. 2021-11-09 10:43:46 +03:00
bde5936da8 Merge branch 'hotfix/v1.0.1' into bugfix/last-page-operations 2021-11-09 10:40:14 +03:00
1a8e0156fe WebL Files: Deleted useless code. 2021-11-09 10:32:32 +03:00
aa3aff1516 Web: files: Removed a blank page when restoring files from the recycle bin. 2021-11-09 10:29:34 +03:00
57f65b437a Web: files: Function transfer. 2021-11-09 10:27:09 +03:00
df09343eb4 Web: Files: fixed Tile styles 2021-11-08 16:35:17 +03:00
8e001cdb9f Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-08 15:52:54 +03:00
56d16ac2f4
Merge pull request #437 from ONLYOFFICE/feature/files-upload
Web: Files: fixed files upload
2021-11-08 15:38:45 +03:00
2a1adf83e7 Web: About: Fix UselessTranslationKeysTest translation issue 2021-11-08 15:37:34 +03:00
5c5db26dc4 Web: Files: removed unused code 2021-11-08 14:04:52 +03:00
ffddbbe1ba Web: Files: added tree menu update 2021-11-08 13:52:18 +03:00
c30597f0e2 Web: Files: Removed empty page when deleted all files at last page. 2021-11-08 13:39:19 +03:00
eeb9e3ebff Service: fix memory after crop 2021-11-06 23:11:18 +03:00
47d8fbc1d9
Merge pull request #448 from ONLYOFFICE/feature/desktop-login
Feature/desktop login
2021-11-03 18:43:23 +03:00
2fd09a649c Web: Removed state change. 2021-11-03 17:11:48 +03:00