Commit Graph

7690 Commits

Author SHA1 Message Date
Nikita
52e2925c8f fix in @my 2022-05-26 13:24:12 +03:00
968e4440ea Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-26 13:18:06 +03:00
52a779326e edit translations 2022-05-26 13:16:53 +03:00
03eaaf4b19 Files: added thirdparty rooms connection 2022-05-26 13:13:25 +03:00
597e121a95 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 15:08:52 +05:00
ba1b93d777 Web: People, Files: fixed banner display delay 2022-05-26 15:08:10 +05:00
Timofey Boyko
4f9cc695e3 Fix Bug 57339 - Client.Files.Upload.Dragndrop. The file does not load when dragging it to the left menu folder 2022-05-26 13:03:01 +03:00
29b3c61355 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-26 12:55:16 +03:00
2e021b107c Web: Files: fixed selected hover styles 2022-05-26 12:55:09 +03:00
5414a9b3df Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 12:10:16 +03:00
cfeca5f1d0 Web: Files: Badges: fix title 2022-05-26 12:09:49 +03:00
2b72a57115 Web: Files: added hover selection for tile folders 2022-05-26 12:05:29 +03:00
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
ceeb190c0a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 11:31:03 +03:00
7c7c12fe72 Web: Files: fixed horizontal scroll when file selected for mobile devices 2022-05-26 11:25:58 +03:00
cdf2acf313 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-26 10:27:31 +03:00
Timofey Boyko
8baead7b2c Fix Bug 57348 - Client.Files. fix layout for overwrite confirmation dialog 2022-05-26 10:09:47 +03:00
7d42847f60 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-25 20:05:01 +03:00
0bce8b6d17 edit translations 2022-05-25 18:41:16 +03:00
b13fd240ad Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-25 18:11:50 +03:00
903767b3e8 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/ro/Error403.json
#	web/ASC.Web.Client/public/locales/ro/ErrorInvalid.json
#	web/ASC.Web.Client/public/locales/ro/Offline.json
2022-05-25 18:07:28 +03:00
83c5b3bd9e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 18:02:18 +03:00
8612f14060 Web: Client: Fixed displaying page icon for creating page shortcut, fixed page display mode at manifest 2022-05-25 18:01:38 +03:00
Timofey Boyko
41e0f6fb5a Web:Files:Section: fix simple files row code format 2022-05-25 17:55:53 +03:00
e514f67cea edit translations 2022-05-25 17:51:59 +03:00
Timofey Boyko
e56f1c55e4 Web:Files:Section: fix horizontal scroll when drag and drop active 2022-05-25 17:30:49 +03:00
Timofey Boyko
ba28b13321 Web:Files/Common: fix section width on desktop 2022-05-25 17:24:55 +03:00
e01858d2e8 merge from develop 2022-05-25 16:58:31 +03:00
e6d7979e92 dbcontext: EnableRetryOnFailure for MySQL provider 2022-05-25 16:55:38 +03:00
2eee88dc99 Web: Files: fixed dragging styles 2022-05-25 16:28:57 +03:00
f6dd1a386b Fixed Bug 57346: Client: Files: Fixed opening version history window on mobile devices via context menu 2022-05-25 16:28:24 +03:00
Timofey Boyko
9f77e862d8 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 15:57:08 +03:00
7bfcddc043 Merge branch 'release/v1.2' into feature/smart-banner 2022-05-25 15:56:27 +03:00
6e3db60440 Web: Translations: Moved MoveToFolderMessage from OperationsPanel.json to Home.json (SingleKeyFilesTest issue fix) 2022-05-25 15:55:45 +03:00
8aa2052b31 Web: Files: add meta and icon for smart banner 2022-05-25 15:53:57 +03:00
Timofey Boyko
2a84281eb7 Web:Files:TableView: fix background for table row when drag and drop is active 2022-05-25 15:52:49 +03:00
a151611b42 Web: Files: fixed hover selection for mobile devices 2022-05-25 15:42:54 +03:00
664e718fa0 Files: added custom tags audit 2022-05-25 15:34:38 +03:00
94836dd2b5 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 14:17:42 +03:00
a5ed08b838 Fixed Bug 57338 - Client.HoveredRow. Added selection row on hover 2022-05-25 14:17:35 +03:00
be3bbf9188 Web: Client: Files: Fixed error on canceling cloud file/folder moving dialog 2022-05-25 12:33:08 +03:00
87b131c807 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 11:00:20 +03:00
032feddda8 Fix Bug 57218: oform edit icon 2022-05-25 10:59:55 +03:00
70a6a44196 Web: Client: Disable PWA feature for mobile devices 2022-05-25 10:53:39 +03:00
a66c03aa86 Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Storage/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
#	common/services/ASC.Notify/GlobalUsings.cs
#	common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
#	common/services/ASC.Notify/Services/NotifySenderService.cs
#	common/services/ASC.TelegramService/GlobalUsings.cs
#	common/services/ASC.TelegramService/TelegramHandler.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
2022-05-24 23:13:57 +03:00
948ddcf6a0 Web: Files: Tile: fix padding 2022-05-24 19:27:56 +03:00
b525696b03 fix usings 2022-05-24 18:41:28 +03:00
2a10ac929f edit translations 2022-05-24 18:41:22 +03:00
9581477d4e edit translations 2022-05-24 18:29:05 +03:00
02570e12cf Merge branch 'develop' into feature/cluster-services 2022-05-24 17:24:25 +03:00
8d9ee14ea6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-24 16:49:36 +03:00
912f694b0d edit translations 2022-05-24 16:46:57 +03:00
f137a8904e Web: Files: InfoPanel: add missed prop 2022-05-24 16:42:05 +03:00
89ac1296e3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 16:37:01 +03:00
7fb8c12d32 Web: Files: Removed removal of paths from the store for the backup module, otherwise the scroll to the selected folder does not work on the second opening. 2022-05-24 16:34:56 +03:00
b3fc8a3401 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 15:49:24 +03:00
37f10e7013 Web: Client: Files: Clouds Fixed default names for connected clouds 2022-05-24 15:49:15 +03:00
3ce78ed5a8 fix 57223 2022-05-24 15:22:25 +03:00
907d92fcb6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-24 15:00:26 +03:00
bed0e0d324 edit translations 2022-05-24 14:57:37 +03:00
2be66344bd fix bug 57261 2022-05-24 14:47:44 +03:00
10b8f3ad13
Merge pull request #677 from ONLYOFFICE/feature/multiply-thumb
Feature/multiply thumb
2022-05-24 14:11:22 +03:00
mushka
fbbc98caca Revert "Bug 57230: InfoPanel now doesnt display root folder Properties"
This reverts commit 71d5d98ec1.
2022-05-24 13:40:28 +03:00
f9f36e96a3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 13:28:17 +03:00
59d860b9b2 Web: Files: fixed hotkeys 2022-05-24 13:28:10 +03:00
ea4b14ac47 Merge branch 'release/v1.2' into feature/multiply-thumb 2022-05-24 12:29:49 +03:00
961a6ec536 Merge branch 'feature/multiply-thumb' of https://github.com/ONLYOFFICE/AppServer into feature/multiply-thumb 2022-05-24 12:29:35 +03:00
ea4bfc988b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 11:48:21 +03:00
f51e96af1f Web: Files: Fixed not opening subfolders in the tree, added expanding the tree to the selected folder. Refactoring. (For the folder selection dialog in the backup module) 2022-05-24 11:46:37 +03:00
0466af6bbb Files: resize by width 2022-05-24 11:45:28 +03:00
Timofey Boyko
38e3aaa5c4 Web:Files:InfoPanel: fix import getCorrectDate util 2022-05-24 13:06:56 +08:00
Timofey Boyko
585a9e25a5 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-24 13:03:43 +08:00
Timofey Boyko
4fa93d8b1e Fix Bug 57273 - incorrect display of time in the info panel 2022-05-24 13:03:36 +08:00
Timofey Boyko
751c702509 Web:Files:HOCs: changed portal culture in getStatusByDate method for personal depend on the user locale and update this method with getCorrectDate util 2022-05-24 12:36:00 +08:00
d0f88846eb Web: Translations: Moved 'Version' key from VersionBadge.json to Home.json (new 'VersionBadge' key) and removed VersionBadge.json 2022-05-23 21:30:10 +03:00
8d3921eae9 Web: Translations: Removed keys: TitleDocuments, TitleSubfolders, More (UselessTranslationKeysTest issues fix) 2022-05-23 20:25:42 +03:00
13ad4381f7 Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
2022-05-23 18:48:23 +03:00
d1494ca672 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-23 18:10:09 +03:00
df09f5e6b1 edit translations (SpellCheck) 2022-05-23 18:08:24 +03:00
a916b3ef69 update uk 2022-05-23 18:08:01 +03:00
Timofey Boyko
c8376ff508 Web:Files:TileView: hide desktop sorting in body for mobile size devices 2022-05-23 21:51:46 +08:00
3aa46cffa8 Web: Files: EditingWrapper: hide input 2022-05-23 16:32:49 +03:00
5d76f11b07 Web: Files: EditingWrapper: delete console log 2022-05-23 16:13:50 +03:00
b95ba16e2d Web: Files: fix tile border radius 2022-05-23 16:11:09 +03:00
864b8268a5 Web: Files: EditingWrapper: fix tile height 2022-05-23 15:39:13 +03:00
36a41e96aa Web: Files: Moved common code into function. 2022-05-23 15:31:17 +03:00
2b9131330c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-23 15:19:07 +03:00
de0e722776 Fixed Bug 55045: Added scroll to current folder where file located in select folder dialog. 2022-05-23 15:15:39 +03:00
4e6cd1ad12 Web: Files: Banner: fix warning 2022-05-23 14:26:23 +03:00
Nikita
4a0e61de7c fixed a problem with DbContext in ASC.Files 2022-05-23 13:28:31 +03:00
dcc23ebbe5 Files: fix 2022-05-23 13:13:24 +03:00
mushka
e4eff11d28 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-23 12:34:52 +03:00
mushka
71d5d98ec1 Bug 57230: InfoPanel now doesnt display root folder Properties 2022-05-23 12:34:41 +03:00
5fa9c839e6 Files: fix 2022-05-23 12:29:14 +03:00
c9357da3b0 Files: added deleting tags, fix 2022-05-23 12:25:33 +03:00
196bbcc11b edit es 2022-05-23 11:57:52 +03:00
2ee9072ff5 update cs (Home) 2022-05-23 11:27:00 +03:00
44a600bee9 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-23 10:55:22 +03:00
9903f4c439 update cs, edit translations (spellCheck) 2022-05-23 10:55:02 +03:00
Timofey Boyko
9880b1659d Fix Bug 57228 - Client.Files.Share.Change the order of permission options in the list 2022-05-23 10:10:26 +03:00
8c68b9fb40 edit translations (SpellCheck) 2022-05-22 13:36:45 +03:00
6bc4035313 update translations 2022-05-21 15:25:14 +03:00
2e75100c52 update translations (Files) 2022-05-21 14:40:26 +03:00
ccf9b6285d Update translations (files) - pl 2022-05-20 20:54:21 +03:00
7b6abe81a2 Files: added custom tags 2022-05-20 19:26:13 +03:00
7493fe68e6 Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes 2022-05-20 19:17:43 +03:00
182b482477
Merge pull request #671 from ONLYOFFICE/feature/update-translation-tests
Feature/update translation tests
2022-05-20 19:16:09 +03:00
b0dd87abde Update translations (files) - lv 2022-05-20 19:06:14 +03:00
4935dbc8cd Merge branch 'release/v1.2' into feature/update-translation-tests 2022-05-20 18:37:42 +03:00
27d2a98bd1 Merge branch 'feature/multiply-thumb' of https://github.com/ONLYOFFICE/AppServer into feature/multiply-thumb 2022-05-20 18:33:28 +03:00
91c4e454c5 add loggers 2022-05-20 18:24:41 +03:00
4c80a408df Files: fixed xlsx thumbnails 2022-05-20 18:24:32 +03:00
73083064ab Update translations (files) 2022-05-20 18:13:08 +03:00
4d21a1949a Web: Files: Fix annoying set thumbSize with same size (re-render issue fix) 2022-05-20 17:21:42 +03:00
04dcfb3d9a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 17:11:37 +03:00
0b1b0280b0 Web:Files:Added isLoadingFilesFind, pageItemsLength, isHidePagination, setPageItemsLength to FilesStore. Added hiding pagination when deleting files.
Added a loader when searching for files when switching between pages.
2022-05-20 17:11:10 +03:00
75da995099 Merge branch 'develop' into feature/logger-refactoring 2022-05-20 17:01:51 +03:00
75b4f06c82 Fix Bug 57269: incorrect information in Size column 2022-05-20 16:40:49 +03:00
81dc197bcf Web: Files: Fix elementResizeDetector work for not first folder 2022-05-20 16:26:51 +03:00
fc4d8ceb3d Web: Files: Restored thumbnails cover in From Gallery 2022-05-20 16:25:40 +03:00
21d8d96e3c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 16:23:57 +03:00
97fec09b0f Web: Files: fixed upload history when conversion single file 2022-05-20 16:23:51 +03:00
19d219ba84
Merge pull request #650 from ONLYOFFICE/feature/logger-Files.Core
Feature/logger files.core
2022-05-20 16:22:16 +03:00
be9c7ffd12 fix 2022-05-20 16:15:13 +03:00
99d82ee8d3 Fix Bug 57227: open media from upload folder 2022-05-20 15:27:45 +03:00
7943d92993 Fixed Bug 57266 - Client.Files. Fixed upload history for conversion files(empty upload/conversion panel). 2022-05-20 15:08:00 +03:00
a2b12c291e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 14:56:29 +03:00
ab28837fb2 Fixed Bug 57248 - Client.Files. Fixed click on file lock icon 2022-05-20 14:56:22 +03:00
3e279ab031 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-20 14:08:08 +03:00
0058c3b22c Fix Bug 57260: textarea autofocus 2022-05-20 14:07:46 +03:00
d36b5e40c0 Update translations (files) 2022-05-20 14:07:40 +03:00
df8e07e99f Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-20 13:49:07 +03:00
cb0879da10 update, edit translations 2022-05-20 13:48:47 +03:00
f3d90fbf80 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 13:07:25 +03:00
355ec5f0e7 Fixed Bug 51909 - Client.Files. Disabled buttons in the header for a file opened for editing 2022-05-20 13:07:17 +03:00
baf219f0f5 Merge branch 'release/v1.2' into feature/multiply-thumb 2022-05-20 10:32:45 +03:00
fa0997db75 Thumbnail: fix 2022-05-19 22:28:08 +03:00
51f7839cce update translations (UploadPanel) 2022-05-19 20:25:43 +03:00
fcd78fbb88 update fi (Article) 2022-05-19 20:06:45 +03:00
bd11fcbbac Web: Files: change icons 2022-05-19 19:39:05 +03:00
b0f073d588 Web: Files: increase click area 2022-05-19 19:12:19 +03:00
c0a0e3b700 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-19 18:57:25 +03:00
f5c09d94b7 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	i18next/files.babel
2022-05-19 18:56:47 +03:00
d90fba7786 Web: Files: HotkeysPanel: increase backdrop z-index 2022-05-19 18:37:52 +03:00
424c4bb082 Update translations (common, files) 2022-05-19 18:36:49 +03:00
13aeb9c82c Fix Bug 57250: quick button double click 2022-05-19 18:00:14 +03:00
mushka
0c69bfdabf Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes 2022-05-19 17:56:19 +03:00
mushka
f9698e767e trash folder api tryouts 2022-05-19 17:53:26 +03:00
b1f7d538a3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-19 17:47:41 +03:00
Timofey Boyko
31dec5f6e9 Web:Files:Tests: add new translation tests: sort button on tile view, add button, filter block and context menu 2022-05-19 17:27:14 +03:00
Timofey Boyko
cb23ce1718 Web:Files/People:Tests: update changeCulture helper for personal 2022-05-19 17:25:20 +03:00
Timofey Boyko
373e6dca0f Web:Files:Tests: hide browser when tests are running 2022-05-19 17:24:26 +03:00
addb0d66ab Web: Files: FolderTreeBody: Removed warnings. 2022-05-19 16:14:52 +03:00
f812c8e052
Merge pull request #652 from ONLYOFFICE/feature/logger-Files
Feature/logger files
2022-05-19 16:14:47 +03:00
Timofey Boyko
6c73ad9bbe Web: add scripts for build and start translation tests on personal 2022-05-19 15:26:09 +03:00
Timofey Boyko
58a41243e1 Web:Files/People:Tests: add mock-data for personal build 2022-05-19 15:25:10 +03:00
013532bbb7 Fixed Bug 57232 - Client.Files.Share.Editor. Fixed access rights in editor 2022-05-19 15:22:52 +03:00
f2ede4c62c Web: Files: Applied changes of new thumbnail sizes 2022-05-19 15:19:51 +03:00
Timofey Boyko
d7898d3bf1 Web:Files/People:Tests: update translation tests for personal 2022-05-19 15:09:26 +03:00
Timofey Boyko
00fcb61aa7 Web:Files/People:Tests: delete screenshotOutput when model translation tests begin 2022-05-19 15:07:38 +03:00
a3a227a314 edit it (Article) 2022-05-19 14:50:27 +03:00
79159d5647 update it 2022-05-19 14:43:40 +03:00
68c96add8b Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-19 14:35:15 +03:00
15f4fb324e update it, edit fr 2022-05-19 14:34:56 +03:00
dd68c9d89d Fix Bug 57234: delete owner and author of correction url 2022-05-19 13:37:52 +03:00
f8a4a7cf7c Merge branch 'release/v1.2' into feature/multiply-thumb 2022-05-19 12:27:18 +03:00
7792f001ad Fixed Bug 57225 - Client.Files.VersionHistory. Fixed comment editing in version history. 2022-05-19 11:29:13 +03:00
32e83e05a4 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-19 09:59:19 +03:00
022063124c Web: Files: Removed the loader when changing the dialog type. 2022-05-19 09:55:39 +03:00
79f79a252a Web: Files: Scroll down is removed if you selected a folder. Renaming a variable. 2022-05-19 09:32:37 +03:00
982c3d9488 Fix Bug 57220: Something went wrong when navigate in Trash 2022-05-18 22:40:15 +03:00
128021653d Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	products/ASC.Files/Client/public/locales/bg/ConnectDialog.json
#	products/ASC.Files/Client/public/locales/ro/Article.json
#	products/ASC.Files/Client/public/locales/ro/FormGallery.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/InfoPanel.json
#	products/ASC.Files/Client/public/locales/ro/SelectFolder.json
#	products/ASC.Files/Client/public/locales/ro/Settings.json
#	products/ASC.Files/Client/public/locales/ro/Translations.json
2022-05-18 20:18:32 +03:00
b2f6ce39f7 Update translations (common, files) 2022-05-18 19:54:25 +03:00
a8b5aad30d edit fr 2022-05-18 19:20:19 +03:00
1639a82f2c edit en 2022-05-18 19:18:30 +03:00
Timofey Boyko
830491e7ca Merge branch 'release/v1.2' into feature/update-translation-tests 2022-05-18 19:17:12 +03:00
74c9b75b0c Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 19:12:07 +03:00
41ab332458 update translations 2022-05-18 19:11:50 +03:00
ae795f8b95 Merge branch 'feature/multiply-thumb' of github.com:ONLYOFFICE/AppServer into feature/multiply-thumb 2022-05-18 19:10:56 +03:00
8e913c8348 Files: thumbnails extensions moved to configuration 2022-05-18 19:10:42 +03:00
018e1504b7 Merge branch 'release/v1.2' into feature/multiply-thumb 2022-05-18 18:38:18 +03:00
321085c205
Merge pull request #669 from ONLYOFFICE/feature/change-size-table-view
Feature/Change table resize with info panel
2022-05-18 18:33:31 +03:00
a9511d7a54
Merge pull request #670 from ONLYOFFICE/feature/upload-history
Web: Files: added history of uploads
2022-05-18 18:32:54 +03:00
9fb495817d update translations 2022-05-18 18:25:31 +03:00
e8752ce4b6 Merge branch 'release/v1.2' into feature/upload-history 2022-05-18 17:36:36 +03:00
c5fb8d0d6f Files: thumbs. default size 2022-05-18 17:31:33 +03:00
9886081a2e Thumbnailы: added sizes config 2022-05-18 17:23:17 +03:00
fd47a15a31 Merge branch 'release/v1.2' into feature/info-panel-redesign 2022-05-18 17:07:35 +03:00
Timofey Boyko
295ad63ebf Web:Files: start cloneModelScreenshot helper after creating model translation screenshots for en culture 2022-05-18 16:08:17 +03:00
Timofey Boyko
eaee2d2375 Web:Files:Tests: update pathToModels for cloneModelScreenshot helper 2022-05-18 16:07:11 +03:00
Timofey Boyko
13a96c920f Web:Files:Tests: add cloneModelScreenshot helper 2022-05-18 15:31:30 +03:00
Timofey Boyko
c2d9b8d893 Web:Files:Tests: update translation tests and delete useless code 2022-05-18 15:29:19 +03:00
Timofey Boyko
86697f3665 Web:Files:Tests: change screenshotOutput and baseFolder for translation tests 2022-05-18 15:26:37 +03:00
Timofey Boyko
20f97759a8 Web:Files:Tests: remove translation model from git 2022-05-18 15:25:26 +03:00
Timofey Boyko
618ead2c4e Web:Files:Tests: add new folder mock for mockData function 2022-05-18 15:17:49 +03:00
b643699e72 Web: Files: added history of uploads 2022-05-18 15:09:25 +03:00
0fb61a7889 Edit translations - fi, sl 2022-05-18 13:18:19 +03:00
5f4d8b3b4c Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 12:58:24 +03:00
9180fbe42e update ko 2022-05-18 12:58:02 +03:00
mushka
ca1d34c07a Removed a modified file from pull request 2022-05-18 12:44:34 +03:00
Timofey Boyko
f1572fcd6e Web:Files:TableView: delete useless code 2022-05-18 11:29:26 +03:00
Timofey Boyko
538f16ec0f Web:Files/People/Components:TableView: remove inline styles and move it to styled components 2022-05-18 11:27:17 +03:00
Timofey Boyko
b42657adea Web:Files:Filter: update changeViewAs function with info panel logic 2022-05-18 11:07:08 +03:00
Timofey Boyko
90be01e47d Web:Files:TableView: update changing view method 2022-05-18 10:45:05 +03:00
Timofey Boyko
ae18b68008 Merge branch 'release/v1.2' into feature/change-size-table-view 2022-05-18 10:41:26 +03:00
Timofey Boyko
a96f766f4a Web:Files:Section: update logic changing from table view row and back 2022-05-18 10:40:37 +03:00
90d4a68946 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/sl/Settings.json
2022-05-18 10:09:44 +03:00
9c824a0bfa Update translation - sl 2022-05-18 09:59:02 +03:00
e339b62145 edit ro (Home) 2022-05-17 20:14:22 +03:00
f6098aea20 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/ro/Settings.json
2022-05-17 19:57:22 +03:00
f1130c51d9 update ro 2022-05-17 19:54:47 +03:00
b8306cb8cb Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-17 19:25:49 +03:00
24b531bd41 Web:Files:Fixed display of file name in toast when copying. 2022-05-17 19:25:31 +03:00
dc916be376 Web:Files:Removed redundant argument. 2022-05-17 19:24:34 +03:00
f466fd2fe4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 18:17:17 +03:00
dad9016695 Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix) 2022-05-17 18:17:11 +03:00
Timofey Boyko
263af1cc85 Merge branch 'release/v1.2' into feature/change-size-table-view 2022-05-17 17:58:49 +03:00
mushka
e31a4bf2e4 fixed dislocated header option btn 2022-05-17 17:54:32 +03:00
2b804d5ef8 edit es, fr, zh-CN, ja, de, ru 2022-05-17 17:20:59 +03:00
mushka
f1ccf5f34f some tests on asc.files 2022-05-17 17:20:57 +03:00
232ca0355e edit es, fr 2022-05-17 16:48:47 +03:00
2ed7b96dd9 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 16:43:15 +03:00
cc9d934b13 update de, edit en (Confirm) 2022-05-17 16:42:54 +03:00
Timofey Boyko
dd8fba5eca Web:Files/Components: add comments for change sectio view method 2022-05-17 16:39:37 +03:00
Timofey Boyko
2aeed8e287 Web:Files/Components: fix changing view with opened info panel 2022-05-17 16:30:31 +03:00
461d206708 Web: Files: EditingWrapper: fix title 2022-05-17 16:10:17 +03:00
f26dc878ef Merge branch 'release/v1.2' into feature/info-panel-redesign 2022-05-17 15:50:06 +03:00
2c723c704a Web: Files: SharingPanel: fix crash 2022-05-17 15:49:41 +03:00
ddb1cb4dd9
Merge pull request #635 from ONLYOFFICE/feature/scroll-to-current-folder
Web: Files: Added scroll to current folder in selectors components.
2022-05-17 15:47:43 +03:00
fb5d1494d0 Merge branch 'release/v1.2' into feature/scroll-to-current-folder
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
2022-05-17 15:40:44 +03:00
43da9f3949 Update translation - fi 2022-05-17 15:35:03 +03:00
4c53f0d4db
Merge pull request #661 from ONLYOFFICE/feature/upload-logic-change
Web: Files: added alert badge to main-button, upload logic changed
2022-05-17 14:38:38 +03:00
ddfe290f11 Web: Client: Files: Added clearing activeFiles and activeFolders after empty trash operation 2022-05-17 14:35:28 +03:00
11211406f7 Web: Files: Fixed first scroll to deep folder. 2022-05-17 14:29:06 +03:00
3db47823bd Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 12:57:17 +03:00
be3362dbc3 update ja, edit fr, es, zh-CN (Settings) 2022-05-17 12:56:56 +03:00
5535bc870a Web: Client: Files: Fixed empty trash button click on already starting emptying trash operation 2022-05-17 12:49:28 +03:00
Timofey Boyko
6fccae257f Web:Files:Home: change method for changing view from row to table and back 2022-05-17 12:47:12 +03:00
36855d656f remove application/x-www-form-urlencoded 2022-05-17 12:29:24 +03:00
2e33540486 Merge branch 'feature/docspace' into feature/docspace-links 2022-05-17 11:53:37 +03:00
6c45bb0632 Merge branch 'develop' into feature/docspace 2022-05-17 11:50:56 +03:00
c769a5a423 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-17 11:47:23 +03:00
3fd6c7bd89 Web: Client: Files: Row: Fixed displaying context menu button inside editing container 2022-05-17 11:47:16 +03:00
ab3920e8a7 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-17 11:11:00 +03:00
9a2243d915 Web:Files:Added setSelectedItems method to write selected items. 2022-05-17 11:10:48 +03:00
9229f97ed5 Web:Files:Display itemsSelectionLength and itemsSelectionTitle in a toast. 2022-05-17 11:10:04 +03:00
cd69afbcd8 Web:Files:Added setSelectedItems method to write selected items. 2022-05-17 11:08:49 +03:00
de653844c2 Web:Files:Added storage of the names of the selected items for output to the toast in the SecondaryProgressDataStore. 2022-05-17 11:07:36 +03:00
Timofey Boyko
2970f6815d Merge branch 'release/v1.2' into feature/change-size-table-view 2022-05-17 10:54:21 +03:00
a46c69cdb2 Web: Files: fixed FloatingButton styles 2022-05-17 10:54:11 +03:00
Timofey Boyko
631d63c6e2 Web:Files:TableView: add new local storage name for info panel columns size 2022-05-17 10:43:26 +03:00
1b55e44df8 edit es, zh-CN (Home) 2022-05-17 10:24:43 +03:00
84af3bedaa update zh (Home) 2022-05-16 21:15:59 +03:00
606f0bca2a update es (Home), add zh 2022-05-16 21:05:58 +03:00
41a0f07bfa Web: Files: added alert badge to main-button, upload logic changed 2022-05-16 18:03:21 +03:00
3818790d1c update ru, fr 2022-05-16 18:01:38 +03:00
778f26c1fc Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-16 17:04:28 +03:00
4264a0da16 update fr 2022-05-16 17:04:04 +03:00
4a2369f545 Merge branch 'release/v1.2' into feature/scroll-to-current-folder 2022-05-16 15:57:47 +03:00
f8ce260d91 Web: Files: MediaViewer: fix memory leak 2022-05-16 14:31:29 +03:00
18556d96af Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-16 14:11:42 +03:00
1ab817fad8 Web: Files: fixed scroll to created folder 2022-05-16 14:11:34 +03:00
9ed3b1cb2f fix tests 2022-05-16 13:58:45 +03:00
a02acf96b1 Web: Files: EmptyContainer: fix memory leak 2022-05-16 13:41:06 +03:00
7913166c14 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-16 13:01:38 +03:00
9b2a0c2895 Web: Files: Fixed input with in file selector dialog. 2022-05-16 12:59:06 +03:00
39302e3f59 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-16 12:51:35 +03:00
5915c6e23e update es 2022-05-16 12:51:04 +03:00
mushka
b8129fd684 removed toggle from header on tablet & mobile and added View Details option to folder context menu 2022-05-16 12:04:59 +03:00
4f44f7d611 Web: Files: Removed border extension between lines. 2022-05-16 11:27:36 +03:00
Timofey Boyko
6de995ff81 Web:Files:TableView: change min width for name table column 2022-05-16 11:21:35 +03:00
Timofey Boyko
d05d9fcecf Web:Files:TableView: change width for author cell column 2022-05-16 11:21:01 +03:00
Timofey Boyko
7f4c0db692 Web:Files:TableView: remove useless padding-right for quick buttons and table cell element wrapper 2022-05-16 11:20:35 +03:00
d85b208dc9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-13 23:21:42 +03:00
d0525e298c thumbnails, notify, telegram: migrate from ICacheNotify to EventBus 2022-05-13 22:14:00 +03:00
Timofey Boyko
6767c9da00 Web:Files:TableView: increase min width for name column 2022-05-13 19:50:21 +03:00
d12c6f89e4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-13 19:33:23 +03:00
93a53092d6 Web: Translations: Fix UselessTranslationKeysTest issues 2022-05-13 19:33:16 +03:00
025d13557d added a secure link to invite to the portal 2022-05-13 19:25:28 +03:00
Artem Tarasov
f645274150 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-13 19:17:53 +03:00
Artem Tarasov
a5b31142a1 Web: Files: Home/FilesStore: added scroll to created folder 2022-05-13 19:17:24 +03:00
Timofey Boyko
5037859e72 Web:Files:TableView: change quick button default size 2022-05-13 19:12:41 +03:00
Timofey Boyko
116d44db3d Web:Files:TableView: disable switch view to row when info panel is opening in table view 2022-05-13 19:01:45 +03:00
Timofey Boyko
7618a5b38b Web:Files:TableView: add info panel visible props to table header 2022-05-13 18:48:09 +03:00
3bf09b4353 add new es-files 2022-05-13 18:22:32 +03:00
161add9853 Web: Files: Bar: fix memory leak 2022-05-13 18:15:52 +03:00
f4727b411e Test: fix 2022-05-13 18:08:30 +03:00
294a449d78 add new ru-keys, edit en 2022-05-13 17:30:51 +03:00
20341f1cce Merge branch 'release/v1.2' into feature/scroll-to-current-folder 2022-05-13 16:09:52 +03:00
c4c0b2a012 Web: Files: Fixed styles. 2022-05-13 15:58:55 +03:00
0a2aaf84c1 Web: Components/Files: Updated version of "rc-tree" and fixed problems after that. 2022-05-13 15:58:22 +03:00
db3dea16fd Web: Files: UploadPanel: fix prop type warning 2022-05-13 15:41:10 +03:00
245dfb9fc6 Web: Files: show error for empty file upload 2022-05-13 15:36:24 +03:00
14f25c2da7 Test: fix 2022-05-13 14:48:51 +03:00
c21898f2e0 add logger 2022-05-13 12:33:44 +03:00
969c037d3c Merge branch 'develop' into feature/fix-tests 2022-05-13 12:27:30 +03:00
a956c25d16
Merge pull request #639 from ONLYOFFICE/feature/resx-add
Feature/resx add
2022-05-13 11:50:54 +03:00
ada737287b Web: Files: Replaced "HotkeysUploadFolder" to "Article:UploadFolder" (EnDublicatesByContentTest issue fix) 2022-05-13 10:42:46 +03:00
cb024b0bbb revert 85dffc552f 0c9147b815 2022-05-13 09:56:16 +03:00
Timofey Boyko
2d5718419e Web:Files:ConnectedClouds: add separator to third party context menu 2022-05-13 07:33:17 +03:00
Timofey Boyko
0c9147b815 Web:Components:Themes: fix error for connected clouds page 2022-05-12 19:07:50 +03:00
7262c4cbb8 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-12 19:00:51 +03:00
122affb8a2 add loggers 2022-05-12 18:35:48 +03:00
Timofey Boyko
da7429c34c Web:Files:Filter: change translations 'contextMenuHeader' and 'headerLabel' for filter input 2022-05-12 18:35:15 +03:00
e9be6684ae Resources: fixed projects 2022-05-12 18:32:39 +03:00
Timofey Boyko
8c7ba2d3ac Web:Files:Locales: add new key 'AddAuthor' for EU and RU locales 2022-05-12 18:29:54 +03:00
mushka
98321a7cf4 fixed InfoPanel property text truncation (276) 2022-05-12 18:27:01 +03:00
Artem Tarasov
bbcbb79a74 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-12 17:43:09 +03:00
Artem Tarasov
c4a522d9c8 Web: Files: added selection of new created folder 2022-05-12 17:42:44 +03:00
mushka
cc41fc36e2 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into bugfix/ReleaseBugfixes 2022-05-12 17:22:39 +03:00
mushka
9fdafab467 changed InfoPanel toggle location 2022-05-12 17:16:57 +03:00
Timofey Boyko
85dffc552f Web:Components:Themes: add color to connected clouds for base theme 2022-05-12 16:16:50 +03:00
Timofey Boyko
8e5e699fed Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-12 15:25:52 +03:00
Timofey Boyko
fe371732fd Web:Client:ConnectedClouds: add dark-theme support 2022-05-12 15:21:28 +03:00
3b7309eb6b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-12 15:12:16 +03:00
8e9d1ad4d5 Web:Files:Added setIsBurgerLoading to HOC withLoader. 2022-05-12 15:01:26 +03:00
fc846860f9 Web: Translations: Moved "AddUsers" key from "Files,People" to "Common" (test issue fix) 2022-05-12 14:18:16 +03:00
2070a1f06d Files: Pattern. Resources. 2022-05-12 14:08:35 +03:00
e09d409763 Files: common. Resources. 2022-05-12 14:03:42 +03:00
cd0323954c Files: JS. Resources 2022-05-12 13:48:50 +03:00
29133aaf13 Files: common. Resources 2022-05-12 13:45:52 +03:00
d6a039b8cd Files: updated docxf, oform, az. added gl-ES, tr 2022-05-12 13:38:23 +03:00
a0f67cfe27 add loggers 2022-05-12 11:14:00 +03:00
80d8ffd67a Web: Files: fix openLocation 2022-05-12 11:00:29 +03:00
26f381fdc5 Web: Files: EditingWrapper: fix create/cancel file 2022-05-12 10:29:43 +03:00
b2474c409d Web: Translations: Moved "Common" key from "Studio" to "Common" and removed useless "Documents" key (test issue fix) 2022-05-11 19:03:33 +03:00
ca0eb26067 Web: Removed already existing translation key from common (test issue fix) 2022-05-11 17:58:44 +03:00
58b7c5f678 Web: Translations: Moved "Location" key from "People" to "Common": (test issue fix) 2022-05-11 17:40:23 +03:00
b0450cf55b Web: Translations: Moved "Comments" key from "People" to "Common": (test issue fix) 2022-05-11 17:25:10 +03:00
781b0eb3e4 Web: Translations: Moved "Info" key from "studio" to "Common": (test issue fix) 2022-05-11 17:11:52 +03:00
4ae8a10f7f Web: Translations: Moved "AccessRights" key from "studio" to "Common": (test issue fix) 2022-05-11 16:51:37 +03:00
dfc5f5a4b4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-11 16:25:54 +03:00
3f49acf679 Web: Files: Add ?. operator 2022-05-11 16:25:45 +03:00
Timofey Boyko
266d1a07f1 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-11 15:41:48 +03:00
Timofey Boyko
567e28318b Web:Files:EmptyContainer: add loader for root folder container 2022-05-11 15:41:41 +03:00
79efcc6a41 Merge branch 'release/v1.2' into feature/scroll-to-current-folder 2022-05-11 15:15:09 +03:00
1dd162c5df Web: Files: Dialog body offset on scroll fixed. 2022-05-11 15:14:50 +03:00
52d3d4c93a Files: moved from 50bf39a9df0c3a8017842ec15f09586d95f4bb1f 2022-05-11 14:37:05 +03:00
mushka
d8ec6a3230 fixed SharingPanel header text truncation 2022-05-11 12:07:55 +03:00
1d65ca7645 Files: thumbnails extension changed to jpg 2022-05-09 21:15:27 +03:00
e91bce51da Files: thumbnails. BitDepth changed to Bit8 2022-05-09 18:57:07 +03:00
c6143bf5bb Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-06 19:42:56 +05:00
e9e2e4e27f Web: added new empty screen icons 2022-05-06 19:42:49 +05:00
2d6960a5a2 Web: Files: added empty container en translation 2022-05-06 19:42:20 +05:00
939b256897 Web: Files: fixed and redesign empty container 2022-05-06 19:41:38 +05:00
c100e3ac03 Web: Files: fixed ConnectedClouds styles 2022-05-06 14:26:35 +03:00
d083cc0c3e Web: Files: Update Info Panel on thumbnail is ready 2022-05-05 22:14:04 +03:00
bd7d9ba8cf Web: Files: Added socket event ("s:modify-folder->update") on thumbnail creation on Server 2022-05-05 21:20:44 +03:00
5445e0b4a7 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-05 18:49:58 +03:00
b888d69f0a Web:Components:TreeFolders:Added width 100% for StyledTreeMenu. 2022-05-05 18:49:48 +03:00
45c58a029e Files: ThumbnailExtension set to jpg. SixLabors up to 1.0.0-beta0008 2022-05-05 18:43:40 +03:00
8245e909df Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-05 20:26:56 +05:00
d843c3ee68 Web: Added new icons for filter empty screen 2022-05-05 20:26:47 +05:00
7b391e1cef Web: added filter translation 2022-05-05 20:26:09 +05:00
ae86f63af4 Web: Files: redesign empty filter container 2022-05-05 20:24:59 +05:00
5e3158b906 Web: files: Fixed scroll. 2022-05-05 17:35:37 +03:00
ca3a49c25b fix 56849 2022-05-05 17:07:24 +03:00
c19d95b275 Web: Files: Added scroll to current folder in selectors components. 2022-05-05 16:54:50 +03:00
68f949f2e7 Files: added link generation 2022-05-05 15:31:04 +03:00
382c3be2c8 Web: Files: fix reset selection 2022-05-05 14:35:42 +03:00
Timofey Boyko
9161165373 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-05 13:25:31 +03:00
Timofey Boyko
81883b78fc Web:Files:Panels: add onClise and visible props for aside component of sharing panel 2022-05-05 13:25:04 +03:00
Timofey Boyko
d50b9a1344 Web:Files:Panels: add onClise and visible props for aside components of embedding panel 2022-05-05 13:24:50 +03:00
Timofey Boyko
29bdfbc7e6 Web:Files:Panels: add onClise and visible props for aside components of change owner panel 2022-05-05 13:24:36 +03:00
Timofey Boyko
aaf359fa1d Web:Files:Panels: add onClise and visible props for aside components of add users panel 2022-05-05 13:24:22 +03:00
Timofey Boyko
c105687fdc Web:Files:Panels: add onClise and visible props for aside components of add groups panel 2022-05-05 13:24:10 +03:00
Timofey Boyko
26b3df92a8 Web:Files:Panels: remove useless code from styled panels 2022-05-05 13:23:33 +03:00
b2a03478b1 Web: Files: add icons for folder context button 2022-05-05 13:08:31 +03:00
4c2229dbaa Web: Files: add icons for plus button 2022-05-05 12:58:55 +03:00
80aa8c0d2f Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-05 12:32:58 +03:00
119fae7570 Web: Files: VersionHistory: truncate title 2022-05-05 12:32:49 +03:00
Timofey Boyko
7809835047 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-05 12:17:35 +03:00
Timofey Boyko
39e859e5f5 Resolve conflicts after merge 2022-05-05 12:16:56 +03:00
045826e073 Web: Files: fix show prev file in the version history 2022-05-05 12:13:32 +03:00
Timofey Boyko
0728e58104 Web:Files:Panels: remove border for body of version history panel and remove useless code 2022-05-05 11:46:02 +03:00
Timofey Boyko
e6c7d336dc Web:Files:Panels: add close function to aside component of version history panel 2022-05-05 11:45:07 +03:00
a239344743 Web: Files: fixed hotkeys panel styles 2022-05-05 11:43:58 +03:00
Timofey Boyko
86b12f4381 Web:Files:Panels: remove margin-right for upload panel header 2022-05-05 11:25:57 +03:00
Timofey Boyko
e8da40d3e4 Web:Files:Panels: add close function to aside component of upload panel 2022-05-05 11:25:18 +03:00
Timofey Boyko
3711723739 Web:Files:Panels: increase border for header of hotkey panel and delete width 2022-05-05 11:05:41 +03:00
Timofey Boyko
7b40efbe8a Web:Files:Panels: add border for header content 2022-05-05 10:47:51 +03:00
Timofey Boyko
ed9cea898b Web:Files:Panels: add onClose prop for aside component of new files panel 2022-05-05 10:32:58 +03:00
a9b94bc296 Web: Files: add lock/unlock toast 2022-05-04 19:32:51 +03:00
419a6709f9 Web: Files: add translation 2022-05-04 19:32:32 +03:00
6e3a47ecba Web: Files: fixed table border styles 2022-05-04 18:06:36 +03:00
10303378af Web: Files: Added VersionBadge translation for rows view. 2022-05-04 17:46:35 +03:00
c93834a779 Web: Files: VersionHistory: fix context menu 2022-05-04 16:31:52 +03:00
1685d3fa97 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-04 16:25:07 +03:00
762fcf28c7 Web: Files: VersionHistory: fix edit comment 2022-05-04 16:24:57 +03:00
48e5e71d0c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-04 15:30:26 +03:00
3afe304561 Web: Files: Settings: fixed header font-size 2022-05-04 15:30:20 +03:00
7078bc3d3a Web: Files: Settings: delete tab, fix title for personal 2022-05-04 14:52:52 +03:00
9a744adb82 Web: Files: VersionHistory: fix margin 2022-05-04 14:03:36 +03:00
afe9d12dbc Web: Files: added id to MainButton 2022-05-04 13:26:12 +03:00
09f840d375 Web: Files: disable version history url 2022-05-04 13:23:55 +03:00
035d4605ea Web: Files: fix version history panel style 2022-05-04 13:21:47 +03:00
57367a2774 Web: Files: VersionHistory: delete external icon 2022-05-04 12:38:29 +03:00
Timofey Boyko
7cf88402d0 Web:Files:RowView: fix position quick buttons 2022-04-29 18:37:35 +03:00
Timofey Boyko
1444bd7bcb Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-29 18:11:14 +03:00
Timofey Boyko
af7f0cff67 Web:Files:QuickButtons: fix displaying quick buttons for tablet devices and delete useless code 2022-04-29 18:03:03 +03:00
84121f4451 fix 2022-04-29 17:26:21 +03:00
c9d37884f3 OForm: fix 2022-04-29 17:16:02 +03:00
deb4d6feb1 Files: fixed gdrive files 2022-04-29 17:15:45 +03:00
07909736c3 Merge branch 'develop' into feature/docspace 2022-04-29 16:49:18 +03:00
1f4399f7e6 Web: Common: Navigation: Fixed displaying for desktop 2022-04-29 16:48:30 +03:00
cf0e9c322d ElasticSearch: fix 2022-04-29 16:17:52 +03:00
188822fe05 Web: Files: TilesView: fix display sorting combobox 2022-04-29 15:58:32 +03:00
17daa3d46c Web: Files: fixed info-panel styles 2022-04-29 15:26:40 +03:00
2e33c99230 Web: Client: Files: Badges: Added medium (16px) icon for form badge. Fixed displaying for form badge 2022-04-29 14:52:56 +03:00
373e66d35d Files: added DocSpaceHelper 2022-04-29 14:15:42 +03:00
3d2c055551 Files: added audit for room 2022-04-29 14:15:22 +03:00
31c289a26b fix-tests: change dir for log and products 2022-04-29 13:48:29 +03:00
Timofey Boyko
5b00e0cf50 Web:Files:Article: reduce z-index for mobile view of main button 2022-04-29 13:04:21 +03:00
Timofey Boyko
17f4882a61 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-29 12:40:26 +03:00
Timofey Boyko
706752ba28 Web:Files:Badges: fix version badge styles 2022-04-29 12:40:18 +03:00
7460d3a0bc Web: Files: EmptyTrashDoalog: fix style, delete on enter 2022-04-29 12:19:12 +03:00
Timofey Boyko
4d86e7fef5 Web:Files:Components: disable hover effect for version badge 2022-04-29 10:13:34 +03:00
Timofey Boyko
543bf0d35d Web:Files:Components: fix disable buttons for sharing panel 2022-04-29 10:01:54 +03:00
19e235d265 Web: Files: Added creation of thumbnail on open Info Panel + hide loading Info Panel api share on Personal 2022-04-28 22:05:43 +03:00
868c2e18b2 Files: added Editing share 2022-04-28 19:38:26 +03:00
4a773679e1 fix-tests: rework files tests
-rework tests (use httpClient)
-fix migration
-add description
-union similar tests
-add random port for asc.Files
-add time to db name
-change TestCaseSource to TestCase
2022-04-28 18:55:41 +03:00
f1574c1c99 Web: Files: fixed hotkeys filter 2022-04-28 16:35:03 +03:00
32399198e4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-04-28 16:01:34 +03:00
d554f0480f Web: Increased stype for Scrollbar (default is mediumBlack) 2022-04-28 16:01:28 +03:00
2efbdddf15 Files: fix 2022-04-28 16:00:05 +03:00
503672e6b2 Merge branch 'develop' into feature/docspace 2022-04-28 15:45:09 +03:00
Timofey Boyko
02ac85e720 Web:Files: delete useless code 2022-04-28 14:39:26 +03:00
Artem Tarasov
38e06018e5 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	packages/asc-web-common/api/client.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Editor/src/StyledEditor.js
#	yarn.lock
2022-04-28 14:12:06 +03:00
mushka
53a53da543 finished tests on login, in progress on people and files 2022-04-28 13:38:16 +03:00
Timofey Boyko
4751a4860e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-28 13:24:21 +03:00
Timofey Boyko
0fda77daab Web:Files:Components: fix press enter for sharing modal dialog 2022-04-28 13:24:11 +03:00
Timofey Boyko
deb6c4c0ab Web:Files:Components: fix toggle external link of sharing panel 2022-04-28 13:15:53 +03:00
1f562d450d Web: Files: fixed routing from settings 2022-04-28 13:09:29 +03:00
04f99b4f4b Web: Files: InfoPanel: disabled sharing folders for personal 2022-04-28 12:45:20 +03:00
b6fe254379 Files: docspace default enabled 2022-04-28 12:40:17 +03:00
89059cf32e Structured Logging 2022-04-28 12:15:33 +03:00
05cc5d336b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-28 12:04:20 +03:00
5ec84219c5 Web: File: fixed OFORMs tiles image 2022-04-28 12:04:07 +03:00
Timofey Boyko
3617bb0826 Web:Files:Components: fix external link of sharing panel open for modal dialog 2022-04-28 11:37:13 +03:00
Timofey Boyko
7c2c70d7b4 Web:Files:Components: fix sharing panel header width for modal dialog 2022-04-28 11:17:08 +03:00
282ebd69a8 Web: Fix build without --env personal 2022-04-28 10:41:27 +03:00
d2733a2608 Web: Added IS_PERSONAL build parameter (yarn start:personal and yarn build:personal) for hiding useless login and confirm functional
+ removed module federated Login from personal
+ fix potential /login redirect from Editor.jsx
2022-04-27 19:53:25 +03:00
e11fc2ff79 backend: updated packages version 2022-04-27 18:48:28 +03:00
fc80993048 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-27 18:33:11 +03:00
19ae516f5c Web: Files: Settings: disable info panel 2022-04-27 18:32:56 +03:00
36d914724d backend: updated packages version 2022-04-27 17:54:31 +03:00
Timofey Boyko
a7d0d78b83 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-27 15:57:58 +03:00
Timofey Boyko
2c8852ba3c Web:Files:Badges: increase badge padding left and right, fix badge vertical position 2022-04-27 15:57:52 +03:00
f0edac9033 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-27 15:36:32 +03:00
ab804ca712 Web: Files: Row: fixed hotkey border 2022-04-27 15:36:24 +03:00
c3978436e3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-27 15:22:46 +03:00
cd8c5b0874 Web: Files: DownloadDialog: fix layout 2022-04-27 15:22:38 +03:00
822170c7e6 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-27 14:59:18 +03:00
f3723cb170 Web: Files: Hotkeys: fixed horizontal scroll 2022-04-27 14:59:11 +03:00
93f637467b backend: updated packages version 2022-04-27 14:26:38 +03:00
Timofey Boyko
b83d85b787 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-27 14:20:13 +03:00
Timofey Boyko
5674e1b07f Web:Files:HOCs: set parentId for selectedFolder if user click on empty folder 2022-04-27 14:20:08 +03:00
1e6d27dc34 Web: Files: fixed hotkey border, fixed table border 2022-04-27 14:19:12 +03:00
Timofey Boyko
7806d24a88 Web:Files:Store: add new method 'setParentId' for selected folder store 2022-04-27 14:11:03 +03:00
19cf415898 backend: updated packages version 2022-04-27 13:02:17 +03:00
Timofey Boyko
fef6a77727 Web:Files:Home: delete useless code 2022-04-27 11:07:39 +03:00
13bbce8ea4 Custom logger replaced with Microsoft.Extensions.Logging 2022-04-26 20:53:48 +03:00
Timofey Boyko
14d61b2765 Web:Files:InfoPanel: open file from buffer selection if it is not equal null and selection length === 0 2022-04-26 18:10:48 +03:00
Timofey Boyko
13217f4334 Web:Files:Store: add iconUrl for delete button for favorites folder options 2022-04-26 17:52:07 +03:00
69da159039 Files: removed unnecessary 2022-04-26 17:07:32 +03:00
0ab3c53823 Files: changed sort 2022-04-26 15:53:06 +03:00
Timofey Boyko
34dac79173 Web:Files:Article: hide article when user click on third party list elements for mobile devices 2022-04-26 13:42:56 +03:00
b2ae2f2116 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-26 12:00:22 +03:00
Timofey Boyko
ffb58b1324 Web:Files:Article: disable user select for download apps text 2022-04-26 11:54:06 +03:00
8ee4f27420 Web: Files: VersionHistory: fixed translation restore 2022-04-26 11:46:23 +03:00
Timofey Boyko
0a810cee8f Web:Files:Components: fix position for sharing panel for mobile view 2022-04-26 11:42:34 +03:00
Timofey Boyko
a6df207fe3 Web:Files:Components: fix dropdown direction for access combo box of sharing panel 2022-04-26 11:35:45 +03:00
Timofey Boyko
3826ddb5c4 Web:Files:Components: remove movile view for sharing panel for mobile devices with width more than 500px 2022-04-26 11:29:58 +03:00
Timofey Boyko
b35d715eb3 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-26 11:23:54 +03:00
Timofey Boyko
45f80de609 Web:Files:Components: fix console error when change owner with sharing panel 2022-04-26 11:23:47 +03:00
ea54e37d1d Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-26 11:18:05 +03:00
536ec4f082 Web: Files: Settings: fixed selectedTab 2022-04-26 11:17:58 +03:00
Timofey Boyko
ab21b599f9 Web:Files:Panels: fix crash for sharing panel when icon doesn exist 2022-04-26 11:01:59 +03:00
Timofey Boyko
591cecb9ac Web:Files:Components: add theme support for background color sharing panel 2022-04-26 10:54:35 +03:00
Timofey Boyko
2f6dd4bb74 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-26 10:21:28 +03:00
2863e167c6 Files: fix 2022-04-26 02:15:32 +03:00
3d9e9eb94f Files: refactor 2022-04-26 02:14:32 +03:00
35eb164fbe Files: added usings 2022-04-26 02:14:17 +03:00
05ce39f359 Files: added area filter value, removed unnecessary 2022-04-26 02:14:06 +03:00
ff87612892 Files: added generic methods for virtual rooms 2022-04-26 02:13:30 +03:00
33d2f638ad Files: added area filter 2022-04-26 02:13:05 +03:00
46b02d6b27 Files: added new variable 2022-04-26 02:12:44 +03:00
d38257f704 Files: redesigned virtual rooms getting method, removed unnecessary 2022-04-26 02:12:27 +03:00
47e4be2d28 Files: added filtres for rooms 2022-04-26 02:11:02 +03:00
eca0790b91 Web: Files: Article: fix t key 2022-04-25 21:40:43 +03:00
cff29f67ed Web: Files: Bar: fix warning 2022-04-25 21:07:24 +03:00
97b45d3bd5 ILog: refactoring 2022-04-25 21:02:18 +03:00
b1acd65c2b Web: Files: Article: fix translations 2022-04-25 18:56:46 +03:00
Timofey Boyko
eb30fca47c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-25 18:21:18 +03:00
330c14c67e Web: Files: Tiles: fix context menu backdrop 2022-04-25 18:03:51 +03:00
Timofey Boyko
a23b4249f1 Web:Files:Panels: increase height of embedding access combobox button for add users panel and add groups panel 2022-04-25 17:23:50 +03:00
Timofey Boyko
6a566cc824 Web:Files:Components: fix footer height for sharing panel 2022-04-25 16:41:10 +03:00
mushka
cbd91d1500 Merge branch 'release/v1.2' into feature/modal-redesign 2022-04-25 16:40:40 +03:00
Timofey Boyko
56dc2298ee Web:Files:Components: fix access combo box width for sharing panel 2022-04-25 16:36:08 +03:00
Timofey Boyko
477a8cfdc8 Web:Files:Components: disable page scrolling on mobile device when sharing panel is open 2022-04-25 16:27:06 +03:00
9e0a145d58 Web: Files: Mobile: fixed routing to version history 2022-04-25 16:11:25 +03:00
Timofey Boyko
ca353ee974 Web:Files:Components: fix width and height for mobile devices for sharing panel, add users panel, add groups panel, embedding panel 2022-04-25 15:35:10 +03:00
Timofey Boyko
b0f9e4de95 Web:Files:Components: fixed direction-y for access combo box of add users and groups panels 2022-04-25 15:17:42 +03:00
19bad9b1f1 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-25 15:09:33 +03:00
f12cb6c184 Web: Files: fixed FormsGallery styles 2022-04-25 15:09:25 +03:00
0c7f1f54ca Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-25 14:01:50 +03:00
9c64e29fed Web: Files: fix row border color 2022-04-25 13:43:36 +03:00
505a96181f Web: Files: fixed click on badge new 2022-04-25 13:43:05 +03:00
6f381b4b73 Web: Files: fixed change ViewAs 2022-04-25 11:45:42 +03:00
2a5aa715e4 fix tests 2022-04-25 11:09:51 +03:00
e38fcc1acb Files: refactor api, added query parameters 2022-04-25 00:08:01 +03:00
6be2edb5b8 Web: Files: fixed hotkeys when media viewer is visible 2022-04-22 16:51:15 +03:00
361fe48257 Web: Files: removed fake OFORMs response 2022-04-22 16:47:39 +03:00
mushka
6d7d0425b5 Merge branch 'release/v1.2' into feature/modal-redesign 2022-04-22 16:37:23 +03:00
88b59b1c30 refactoring 2022-04-22 16:24:54 +03:00
10cfd03ccd Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-22 14:40:45 +03:00
2cd3939ed5 Web: Files: fixed border 2022-04-22 14:40:38 +03:00
563fd3c778 Web: Files: fix context menu icons 2022-04-22 13:45:57 +03:00
70006499f1 Files: removed unnecessary multipart api methods 2022-04-22 11:33:08 +03:00
639c6fc7cc Files: removed unnecessary 2022-04-22 11:28:57 +03:00
Timofey Boyko
fb42a083d7 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-22 11:20:00 +03:00
Timofey Boyko
3ad8b6c4c8 Web:Files:Settings: disable common and admin settings for pesonal 2022-04-22 11:19:52 +03:00
04dd99ecf0 Files: fix cache key 2022-04-22 11:14:36 +03:00
3b375435bd Web: Files: fixed EditingWrapperComponent icon style 2022-04-22 11:05:29 +03:00
Timofey Boyko
af23406c4a Web:Files:Article: fix redirect to file settings when join third party account 2022-04-22 10:52:12 +03:00
Timofey Boyko
743386400a Web:Files:Settings: fix page crash when select connected cloud tab 2022-04-22 10:36:01 +03:00
9eba173a44 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Model/CreateFileModel.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-04-21 22:36:29 +03:00
f9fb0777d1 Bump version to v1.2.0 2022-04-21 19:15:08 +03:00
073ee2dc36
Merge branch 'develop' into feature/virtual-rooms-1.2 2022-04-21 12:07:18 -04:00
05609787f2 Files: fix async 2022-04-21 18:55:49 +03:00
Timofey Boyko
e2f8f40086 Web:Files:SharingPanel: add truncate for sharing panel header 2022-04-21 18:15:34 +03:00
Timofey Boyko
796e3448bc Web:Files:SharingPanel: add access rights translate 2022-04-21 18:10:19 +03:00
Timofey Boyko
bf8ac30f6f Web:Files:add new key 'AccessRights' for EN and RU locales 2022-04-21 18:07:58 +03:00
1dff9e18c4 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.IPSecurity/IPRestrictionsRepository.cs
#	common/ASC.IPSecurity/IPRestrictionsService.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
d6feda992b Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-21 17:33:16 +03:00
f8088cfbd2 Web: Files: fixed gallery translations, refactoring 2022-04-21 17:18:01 +03:00
a9a528ab84 Web: Files: createFormFromTemplate replaced with createFile 2022-04-21 16:57:44 +03:00
8b2114aea3 Web: Files: fixed FORM_GALLERY_URL 2022-04-21 16:42:27 +03:00
17cdd4b655 Web: Files: changed oforms loader 2022-04-21 16:37:32 +03:00
00b2c032e4 Web: Files: fixed MainButton options 2022-04-21 16:15:20 +03:00
03c8921293 Web: Files: fixed FromGallery loader 2022-04-21 16:01:49 +03:00
9a204b536a Web: Files: fixed MainButton formActions 2022-04-21 15:41:17 +03:00
ebbd473ecf Web: fixed getOforms language 2022-04-21 15:33:48 +03:00
fe0db050ff Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-21 14:49:18 +03:00
e7b4280df2 Web: Files: fixed getOforms 2022-04-21 14:38:14 +03:00
fff945cd18 Web: Files: fixed forms creation 2022-04-21 14:33:48 +03:00
50d627e58c Web: Files: fixed getOforms 2022-04-21 13:57:04 +03:00
5a1062b61b Web: Files: fix translations 2022-04-21 13:42:38 +03:00
Timofey Boyko
7dbb4f225d Web:Files:Home: close sort button dropdown when item clicked for tile view and second click on item changed sort desc 2022-04-21 12:40:15 +03:00
e83f02c143 Web: Files: fixed gallery styles 2022-04-21 12:06:05 +03:00
eb96f5586e Web: Files: fixed gallery translations for info panel 2022-04-21 11:57:48 +03:00
524a8e4cac Merge branch 'feature/oforms-gallery' of github.com:ONLYOFFICE/AppServer into feature/oforms-gallery 2022-04-21 11:06:27 +03:00
b04f132cea Web: Files: fixed gallery styles 2022-04-21 11:06:04 +03:00
2bf6dec41d Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
#	packages/asc-web-common/store/SettingsStore.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2022-04-21 10:53:58 +03:00
20ac091869 Merge branch 'feature/oforms-gallery' of github.com:ONLYOFFICE/AppServer into feature/oforms-gallery 2022-04-21 10:50:35 +03:00
48416ec5f8 Web: Files: Fix borders on thumbnails, refactoring 2022-04-21 10:50:21 +03:00
8ca6d0d0d5 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 17:27:53 +03:00
d7db5c3c7f Web: Files: fixed onHideContextMenu 2022-04-20 16:43:15 +03:00
2cc9a2f2b5 Web: Files: added disabling hotkeys when opening the context menu 2022-04-20 16:05:24 +03:00
9541a9b8f5 refactoring 2022-04-20 15:21:42 +03:00
04fc13073f Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
2022-04-20 15:11:00 +03:00
ee931b3098 Web: Files: fix share icon 2022-04-20 14:55:23 +03:00
c6abeab006 Web: Files: fixed info-panel opening 2022-04-20 14:54:09 +03:00
eed752d1eb Web: Files: fixed creating forms from the gallery 2022-04-20 14:47:21 +03:00
9b3cb874af Web: Files: MediaViewer: fix t key 2022-04-20 14:43:14 +03:00
a4dcddc78d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 14:33:39 +03:00
25449b4af5 Web: Files: fixed creating forms from the gallery 2022-04-20 14:25:06 +03:00
c9abcba6e5 Web: Files: added creating forms from the gallery 2022-04-20 14:07:29 +03:00
11163c3129 Web: Files: added creating forms from the gallery 2022-04-20 14:02:22 +03:00
Timofey Boyko
ea885b61da Web:Files:Panels: fix empty selection crash for sharing panel 2022-04-20 13:06:24 +03:00
b54a5716ad Web: Files: fix load t 2022-04-20 12:41:35 +03:00
bc64ff4cf7 Files: docspace check 2022-04-20 11:26:31 +03:00
mushka
7ba70ce193 fixed moveTo and Copy modals 2022-04-20 11:12:35 +03:00
mushka
10090256a2 Merge branch 'feature/virtual-rooms-1.2' into feature/modal-redesign 2022-04-20 11:11:42 +03:00
mushka
4cb20f9599 merge fix 2022-04-20 10:58:50 +03:00
Timofey Boyko
fd0e6db6e1 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 10:47:34 +03:00
3380e87811 Files: oforms gallery manager 2022-04-20 10:34:33 +03:00
65eba2c01b Files: added cache 2022-04-20 01:00:26 +03:00
919d08f997 Files: fix security 2022-04-20 00:22:13 +03:00
a557627165 Web: Files: fixed hotkeys border 2022-04-19 19:15:43 +03:00
1afa42d6a1 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-19 17:46:39 +03:00
e82a44d493
Merge pull request #617 from ONLYOFFICE/feature/redesign-sharing-panel
Feature/redesign sharing panel
2022-04-19 10:36:41 -04:00
27545c3d83 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-19 17:35:12 +03:00
9841383d2c Web: Files: added file selection when opening the context menu 2022-04-19 17:35:05 +03:00
Timofey Boyko
22e0a78dcc Web:Components:ModalDialog: add close modal dialog onpopstate event 2022-04-19 17:34:35 +03:00
Timofey Boyko
a16a7b1348 Web:Files:Components: fix page crash on pop button for sharing dialog 2022-04-19 17:25:27 +03:00
Timofey Boyko
8e011e7192 Web:Files:Components: add support mobile devices for modal sharing panel loader 2022-04-19 17:04:02 +03:00
Timofey Boyko
25b77505f6 Web:Files:Components: add support mobile devices for modal sharing panel 2022-04-19 17:02:14 +03:00
d1c35e95a1 Web: Files: Tile: fix border 2022-04-19 16:37:27 +03:00
Timofey Boyko
047428cc04 Web:Files:Components: fix first render sharing panel modal view 2022-04-19 16:36:31 +03:00
Timofey Boyko
b657b8783e Web:Files:Components: fix loader size for sharing panel modal view 2022-04-19 16:22:34 +03:00
Timofey Boyko
814da60efe Web:Files:Components: add delay for hide loader for sharing panel 2022-04-19 16:11:21 +03:00
460abe43d1 Web: Files: Hotkeys: fixed caretIndex 2022-04-19 15:57:58 +03:00
b51619bc2b Web: Files: added puplicate-id-test 2022-04-19 15:39:27 +03:00
Timofey Boyko
99847dee57 Web:Files:Components: change sharing panel header height for personal 2022-04-19 15:22:55 +03:00
Timofey Boyko
39f08707e9 Web: delete useless code 2022-04-19 15:19:50 +03:00
Timofey Boyko
58d61b4366 Web:Files:Components: add isShared prop for modal loader 2022-04-19 14:58:57 +03:00
mushka
0cafa97440 Merge branch 'feature/virtual-rooms-1.2' into feature/modal-redesign 2022-04-19 14:18:53 +03:00
34ea668860 Web: Files: Gallery: fixed info-panel icon button 2022-04-19 14:13:19 +03:00
e8c46ba42c Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2022-04-19 14:04:10 +03:00
Timofey Boyko
8e26519f67 Web:Files:Components: fix padding-button for embedding body for modal view 2022-04-19 13:00:07 +03:00
Timofey Boyko
b71f2941dc Merge branch 'feature/redesign-sharing-panel' of github.com:ONLYOFFICE/AppServer into feature/redesign-sharing-panel 2022-04-19 12:52:42 +03:00
Timofey Boyko
ff4c193d3f Web:Components: ModalDialog: add header border for all width 2022-04-19 12:52:30 +03:00
f94a06cf43 Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-19 12:46:30 +03:00
Timofey Boyko
624f79fb7a Web:Files:Components: fix external link padding for modal view 2022-04-19 12:45:40 +03:00
Timofey Boyko
c557470c77 Web:Files:Components: fix embedding body content padding for modal view 2022-04-19 12:35:27 +03:00
Timofey Boyko
9eb173c86d Web:Files: wrap article components into HOC withLoader 2022-04-19 12:18:53 +03:00
Timofey Boyko
1d417b6865 Web:Files:Components: change padding and button height for styled modal footer of sharing panel 2022-04-19 11:49:08 +03:00
Timofey Boyko
51d7c441e6 Web:Files:Components: change font weight for header of sharing panel 2022-04-19 11:46:17 +03:00
Timofey Boyko
eee794d235 Web:Files:Components: change modal dialog width to 400px 2022-04-19 11:41:04 +03:00
Timofey Boyko
0d2c37a758 Web:Files:Components: disable input for external link of sharing panel 2022-04-19 11:40:32 +03:00
79cc368510 Web: Files: fixed icons color 2022-04-19 10:54:17 +03:00
27439cbddc Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-19 10:49:51 +03:00
6168589bb0 Web: Files: fixed edit icon color 2022-04-19 10:49:42 +03:00
Timofey Boyko
79a9b4175b Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-19 09:56:59 +03:00
Timofey Boyko
887b1370e4 Web:Files:Components: fix scroll dropdown under parent element 2022-04-19 09:42:09 +03:00
Timofey Boyko
f46a0bc9c7 Web:Files:Components: delete useless code 2022-04-19 09:33:08 +03:00
Timofey Boyko
5e499f8fc6 Web:Files:Components: fix embedding header styles for aside view 2022-04-19 08:30:32 +03:00
Timofey Boyko
81b258ce0e Web:Files:Components: add embedding link as props to embedding body 2022-04-19 08:21:27 +03:00
Timofey Boyko
bcd3035a2d Web:Files:Components: fix share link for embedding panel 2022-04-19 08:13:28 +03:00
Timofey Boyko
0b6ee5ddc2 Web:Common:Components: add loader for sharing panel modal view 2022-04-19 07:55:37 +03:00
Timofey Boyko
dd827824e3 Web:Files:Components: fix embedding panel body styles when open it at share panel of modal view 2022-04-19 07:41:45 +03:00
Timofey Boyko
e0b9e60f70 Web:Files:Components: add embedding body to modal view sharing panel 2022-04-19 07:35:04 +03:00
Timofey Boyko
b5d94989bf Web:Files:Components: add modal view for sharing panel for personal only 2022-04-19 07:21:00 +03:00
a1df51bb5c Files: added security api methods for rooms 2022-04-19 00:05:52 +03:00
fc4f232c3e Files: fix security 2022-04-19 00:05:26 +03:00
7ed52d337c Files: refactor 2022-04-19 00:05:16 +03:00
Timofey Boyko
88489367df Web:Files:Components: add internal and external item into scroll for mobile only devices 2022-04-18 20:09:40 +03:00
mushka
8ef29694e6 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-18 18:54:27 +03:00
mushka
096e960708 fixed rename design table view 2022-04-18 18:54:06 +03:00
9ed02c211c
Merge pull request #622 from ONLYOFFICE/feature/connected-clouds-redesign
Feature/connected clouds redesign
2022-04-18 11:40:13 -04:00
Timofey Boyko
9d1296118c Web:Files:Panels: close share dropdown of external link for sharing panel when item was click 2022-04-18 18:37:11 +03:00
mushka
657a2b9195 fixed rename design 2022-04-18 18:31:53 +03:00
f3211e064d Web: Files: Settings: fixed section body styles 2022-04-18 18:31:49 +03:00
Timofey Boyko
930a64d792 Web:Files:Panels: fix remove item for sharing panel 2022-04-18 18:30:29 +03:00
Timofey Boyko
2a969897f8 Web:Files:Panels: fix layout sharing panel footer 2022-04-18 18:22:35 +03:00
1bfd6a959c Web: Files: fixed ConnectedClouds settings 2022-04-18 17:05:36 +03:00
mushka
67cb03cc46 redesign of all dialogs 2022-04-18 16:41:17 +03:00
b0efd5bb9b Web: Files: Settings: added loader for connected-clouds 2022-04-18 15:31:21 +03:00
Timofey Boyko
1abd712f67 Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-18 15:21:48 +03:00
47ffc849a5 Merge branch 'feature/virtual-rooms-1.2' into feature/connected-clouds-redesign 2022-04-18 15:05:23 +03:00
57ae539f8b Files: added api methods for form 2022-04-18 14:33:11 +03:00
678e1c2ada Files: refactor 2022-04-18 14:12:29 +03:00
5c7b7c4351 Files: added blocking merging conflict rooms 2022-04-18 14:12:16 +03:00
aa940e2437 Files: renamed 2022-04-18 14:11:10 +03:00
6dbf77317d Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-18 10:32:31 +03:00
b8b0d7f85b Merge branch 'develop' into feature/virtual-rooms-1.2 2022-04-15 19:04:31 +03:00
586bf23976 Files: fixed thirdparty 2022-04-15 19:01:06 +03:00
1d7087a798 Files: fix share 2022-04-15 18:53:41 +03:00
7dbc67f0e1 Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign 2022-04-15 18:13:54 +03:00
Timofey Boyko
cf6d28e4c7 Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-15 18:07:10 +03:00
5c85464744 Web: Files: SelectFileDialogWrapper: Restore I18nextProvider. 2022-04-15 18:04:19 +03:00
ebdd047fb0 Web: Files: Refactoring. 2022-04-15 18:01:53 +03:00
d8cefc614f Web: Editor: Added icons url. 2022-04-15 17:59:39 +03:00
6a8b33f780 Files: fix error messages 2022-04-15 17:37:53 +03:00
858d93366d Files: added archive folder 2022-04-15 17:23:41 +03:00
597baeb510 Files: added archive folder 2022-04-15 17:23:31 +03:00
7f094cbf94 Files: added archive folder 2022-04-15 17:22:44 +03:00
419039d39c Web: Files: fixed Row styles 2022-04-15 16:52:47 +03:00
b70843363e Web: Files: ThirdPartyDialog refactoring 2022-04-15 16:47:27 +03:00
62d9ef8152 Web: Files: connected cloud page redesign 2022-04-15 16:41:07 +03:00
b9a6c618bc Web: Moved Connect translation, added new translations 2022-04-15 16:39:57 +03:00
cae74ef6e3 Web: Files: Deleted <strong> from translation. 2022-04-15 15:46:52 +03:00
4e0f74f839 Web: Editor: Disabled button when file name is empty. 2022-04-15 14:58:27 +03:00
fa543e55bb WEb: Files: Fixed after merge. 2022-04-15 14:46:01 +03:00
a1e54b4801 Web: files: fixed empty container. 2022-04-15 14:32:11 +03:00
8021b837eb Web: Files: Added ability to cancel requests. 2022-04-15 14:03:20 +03:00
Timofey Boyko
bde27048dc Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-15 13:42:50 +03:00
e603b26caa refactoring 2022-04-15 13:27:48 +03:00
Timofey Boyko
3bdfe1c050 Web:Files:Components: add variable size list for sharing panel body 2022-04-15 13:14:42 +03:00
2511dc2c8f Web: files: Fixed styles. 2022-04-15 12:22:38 +03:00
cb2580dd50 refactoring 2022-04-15 12:08:06 +03:00
28102a66fc Web: Files: SelectionPanel: Added show loader for files after a while. 2022-04-15 12:07:33 +03:00
ce73b308e3 Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign 2022-04-15 11:46:28 +03:00
Timofey Boyko
cd359752e1 Web:Files:Components: move external link opening logic to sharing panel body component 2022-04-15 11:43:57 +03:00
df92f9907b Web: Files: Deleted useless code. 2022-04-15 11:25:29 +03:00
dc39d3a83f Web: Files: Added onCloseAside. 2022-04-15 11:10:56 +03:00
cad93e9653 Web: Files: OperationsPanel: Refactoring. 2022-04-15 10:39:17 +03:00
6f0a0b398a Web: Files: OperationsPanel: Refactoring, added new translation. 2022-04-15 10:31:10 +03:00
b01ba7928a Web: Refactoring. 2022-04-15 10:27:35 +03:00
989037866e Web: Files: Optimization, refactoring. 2022-04-15 10:13:23 +03:00
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
f138ff7c79 fixed warnings 2022-04-14 22:23:57 +03:00
Timofey Boyko
5747a70bb3 Web:Files:Components: create body component and refactoring for sharing panel 2022-04-14 17:38:31 +03:00
Timofey Boyko
8277f896da Web:Files:Components: change media max-width for panels 2022-04-14 17:37:15 +03:00
Timofey Boyko
9167874754 Web:Files:Components: refactoring and delete useless code for item of sharing panel 2022-04-14 17:36:50 +03:00
Timofey Boyko
555d686ffb Web:Files:Components: remove selectedOption for access combobox in default view 2022-04-14 17:36:18 +03:00
140ec80841 Web: Files: Deleted opening of subfolder in tree. 2022-04-14 16:14:22 +03:00
27f1ed0cf3 Web: Files: fixed files operations loaders 2022-04-14 16:02:56 +03:00
9edc20993a Web: Files: SelectionPanel: Fixed buttons styles for aside view. 2022-04-14 15:47:58 +03:00
6f3c6dbbc1 Web: Files: Table: fixed duplicate key 2022-04-14 15:41:33 +03:00
33e8725ae0 Web: Files: OperationsPanel: Reset loading state. 2022-04-14 15:40:44 +03:00
26947072c6 Merge branch 'feature/backend-refactor' into feature/warnings
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskProgress.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
#	common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FileDto.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Core/CollaboratorSettings.cs
#	web/ASC.Web.Core/CustomNavigationSettings.cs
#	web/ASC.Web.Core/EmailActivationSettings.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/SpamEmailSettings.cs
#	web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
#	web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
#	web/ASC.Web.Core/PersonalSettings.cs
#	web/ASC.Web.Core/PrivacyRoomSettings.cs
#	web/ASC.Web.Core/PromotionsSettings.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Sms/SmsSender.cs
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
#	web/ASC.Web.Core/StudioAdminMessageSettings.cs
#	web/ASC.Web.Core/StudioDefaultPageSettings.cs
#	web/ASC.Web.Core/StudioTrustedDomainSettings.cs
#	web/ASC.Web.Core/TariffSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
#	web/ASC.Web.Core/TipsSettings.cs
#	web/ASC.Web.Core/Users/CustomNamingPeople.cs
#	web/ASC.Web.Core/Users/UserHelpTourSettings.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
#	web/ASC.Web.Core/Utility/ColorThemesSettings.cs
#	web/ASC.Web.Core/Utility/PasswordSettings.cs
#	web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-04-14 15:21:06 +03:00
5e65c857c7 Web: Files: fixed selection file with same id, fixed tile view 2022-04-14 15:10:58 +03:00
3996816ed2 Web: Files: OperationPanel: Changed logic of saving information. (Fixed problem when can't restore into first folder) 2022-04-14 15:07:52 +03:00
0a06c2b77c WEb: Files: OperationsPanel: Moved clear timer. 2022-04-14 14:04:38 +03:00
016841afd7 Web: Files: OperationPanel: Deleted useless code. 2022-04-14 13:18:50 +03:00
8243bd1b77 Web: Files: Added error handler, added clear an active operation, added showing loader after some time. 2022-04-14 13:09:53 +03:00
fbe6b167ef Web: Files: Added showing loader after some time, fixed styles. 2022-04-14 12:53:17 +03:00
Timofey Boyko
fc32501182 Web:Files:Components: delete useless code of external link of sharing panel 2022-04-14 12:42:10 +03:00
Timofey Boyko
f45164bc61 Web:Files:Components: refactoring and redesign internal link of sharing panel 2022-04-14 12:41:23 +03:00
Timofey Boyko
8cd3abdccd Web:Files:Components: refactoring and redesign external link of sharing panel 2022-04-14 12:13:15 +03:00
Timofey Boyko
0da91aa337 Web:Files:Components: refactoring and update access combobox of sharing panel for external link 2022-04-14 12:12:38 +03:00
13b9a8da70 Web: Files: Added icon size so that the inscription does not move when loading. 2022-04-14 11:37:29 +03:00
7c93072aae Web: Files: SelectFolderDialog/SelectFileDialog: Fixed aside styles. 2022-04-14 11:18:04 +03:00
6d7bb2747b Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
#	packages/asc-web-common/store/SettingsStore.js
2022-04-14 11:14:24 +03:00
6ddeff2d51 Web: Files: SelectFolderDialog/SelectFileDialog: Fixed styles according layouts. 2022-04-14 11:03:31 +03:00
6ebfe68583 Web: Files: Fixed styles. 2022-04-14 10:08:47 +03:00
cb6e45d9fe Web: Files: Added translation for title of folder selection dialog. 2022-04-13 18:19:48 +03:00
8d4c248f2e Files: added rename room api method 2022-04-13 17:25:12 +03:00
448e0aa72e Files: CanEdtit replace to CanRename 2022-04-13 17:24:51 +03:00
020bd486e3 Files: added check for rename rooms 2022-04-13 17:24:11 +03:00
34a33e039d Files: added rename access 2022-04-13 17:23:46 +03:00
d3934f83c6 Files: added rename room dto 2022-04-13 17:23:22 +03:00
60f6c47956 WEb: SelectFolderDialog: Deleted files from sub folders. 2022-04-13 17:19:49 +03:00
089fceadeb Web: Files: Fixed translations for de, el, en languages. 2022-04-13 16:50:12 +03:00
125afe2816 Web: Files: Fixed translations. 2022-04-13 16:43:27 +03:00
d2098a3020 Web: Files: Tile: fixed Drag’nDrop 2022-04-13 16:22:17 +03:00
dbe01ad85a Web: Files: Fixed translation and styles for buttons. 2022-04-13 16:14:03 +03:00
49145aa463 Web: Files: Changed titles of dialogs, added isLoading prop for tree component. 2022-04-13 16:09:37 +03:00
165a5979a3 Web: Files: Added new translations. 2022-04-13 16:02:27 +03:00
5badce9117 Files: added delete rooms api method 2022-04-13 16:01:50 +03:00
ba17f644f1 Files: added api model 2022-04-13 16:01:26 +03:00
270b569943 Web: Files: Changed dialog styles according new layouts. 2022-04-13 15:15:39 +03:00
35950126cb Web: Files: Added new translations. 2022-04-13 15:14:37 +03:00
2b49cbfd72 Web: Files: Added <strong> to translations. 2022-04-13 15:14:08 +03:00
392a1db1c0 Files: added deleting rooms 2022-04-13 15:11:32 +03:00
4ab752836b Files: added set share access for room manager 2022-04-13 14:15:07 +03:00
14bea4e71a Files: added room manager share 2022-04-13 14:13:50 +03:00
f34d4dd341 Files: block creating files in virtual rooms folder 2022-04-13 14:13:33 +03:00
67431b1cfb Files: added room manager share, added room edit security 2022-04-13 14:13:00 +03:00
Timofey Boyko
867a9f3ff9 Web:Files:Components: refactoring footer of sharing panel and delete useless code 2022-04-13 12:54:52 +03:00
Timofey Boyko
965e9ea92e Web:Files:Components: refactoring header of sharing panel and remove margin-bottom 2022-04-13 12:41:10 +03:00
7d233d9a2d Files: Fix s:stop-edit-file wrong file data (rootFolderType always SHARE) 2022-04-13 11:53:01 +03:00
Artem Tarasov
0b19cf90f2 Merge branch 'develop' into feature/doceditor-ssr 2022-04-13 11:42:49 +03:00
Timofey Boyko
89e41c9fc5 Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-13 10:22:53 +03:00
Timofey Boyko
792bd7065f Merge branch 'develop' into feature/virtual-rooms-1.2 2022-04-13 10:22:20 +03:00
8b978f5a5e Web: Files: Added common styles. 2022-04-13 10:11:11 +03:00
7086c7ebb5 Web: Files: Changed empty files page. 2022-04-13 10:08:20 +03:00
4828678e03 merge from feature/backend-refactor 2022-04-12 22:04:10 +03:00
1f4ee372e2 FileHandler: fix auth 2022-04-12 21:06:30 +03:00
900d33b2d1 fix copyas 2022-04-12 18:31:50 +03:00
mushka
ddc7b56d00 Merge branch 'feature/virtual-rooms-1.2' into feature/modal-redesign 2022-04-12 18:03:30 +03:00
Timofey Boyko
47de3c4375 Web:Files:Components: add support dark-theme for sharing panel 2022-04-12 17:17:55 +03:00
Timofey Boyko
d3d7f2df04 Web:Files:Components: remove useless code from sharing panel 2022-04-12 17:04:49 +03:00
Timofey Boyko
47c5be6065 Web:Components:Dropdown: fix direction Y if dropdown render into scroll 2022-04-12 17:03:34 +03:00
6afbf64297 Web: Files: SelectFolderDialog: Deletes useless code. 2022-04-12 16:18:59 +03:00
0bfffed690 Web: Files: Refactoring, deleted useless code. 2022-04-12 16:17:44 +03:00
b9de2ad70b Web: Files: fixed styles for aside view. 2022-04-12 16:17:28 +03:00
471ffd28c8 Files: fix news method 2022-04-12 15:07:00 +03:00
Timofey Boyko
fec306fde6 Web:Files:Components: change svg size of header sharing panel 2022-04-12 14:50:47 +03:00
8a9fbe70c6 Web: Files: Added reset of tree. 2022-04-12 13:52:23 +03:00
852791a485 Web: files: deleted useless code. 2022-04-12 13:39:02 +03:00
ede24f4b79 Web: Files: Added a margin style for the button if the footer is passed to the component. 2022-04-12 13:37:44 +03:00
40db845b81 Web: Files: Deleted useless code. 2022-04-12 13:33:28 +03:00
5bd992b712 Web: Files: Fixed styles for buttons. 2022-04-12 13:26:48 +03:00
1ea6058232 fixed owner method 2022-04-12 13:21:39 +03:00
ed83701a35 Web: Files: SelectionPanel: Fixed styles for title. 2022-04-12 13:12:42 +03:00
4e50b0ed5b Web: Files: Fixed styles of aside view. 2022-04-12 12:59:28 +03:00
Timofey Boyko
340d403c79 Web:Files:Components: fix display internal link for third-party folders 2022-04-12 12:57:59 +03:00
054ef60233 Web: Files: OperationPanel: Added SelectFolderDialog. 2022-04-12 12:53:34 +03:00
ce0b453231 Web: Files: Path of folder moved to the local state. 2022-04-12 12:53:08 +03:00
Timofey Boyko
41a486b53e Web:Files:Panels: fix correct display owner of folder 2022-04-12 12:25:21 +03:00
193c1b2c9c Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign 2022-04-12 12:01:25 +03:00
080dfd2bd8 Files: rename 2022-04-12 10:33:59 +03:00
2031f32eca Files: added share template validation 2022-04-12 10:33:39 +03:00
7e9719828f Files: added aces fileter 2022-04-12 10:33:17 +03:00
Timofey Boyko
28582ca0d8 Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-12 10:33:10 +03:00
Timofey Boyko
653ac1bb3c Web:Files:Components: fix open access combo box for first element 2022-04-12 10:30:35 +03:00
1344d775d8 Web: Files: SelectFolder: Added disable color for files. 2022-04-12 10:16:01 +03:00
e9daf3aa55 Web: Files: Deleted useless code, added styles for tree. 2022-04-12 09:34:10 +03:00
0c693feda7 Web: Files: Deleted useless code. 2022-04-11 19:34:30 +03:00
7319a8f3e9 Web: Files: Removed loader. 2022-04-11 19:33:39 +03:00
Timofey Boyko
ef33e3d0cf Web:Files:Components: fix size of sharing panel button and delete max-height css property 2022-04-11 18:53:49 +03:00
2c473dea9b Web: Components/Files: Changed styles for tree. 2022-04-11 18:47:12 +03:00
296fe44c46 Files: added room manager share 2022-04-11 18:27:03 +03:00
ae9ae673cb Web: Files: fixed loader styles for tiles 2022-04-11 17:46:46 +03:00
72ab470f2b Files: added set access for rooms 2022-04-11 16:33:18 +03:00
70ec83fe06 Files: added gettings user rooms 2022-04-11 16:32:32 +03:00
0e7eec8221 Web: Files: fixed "Duplicate" translation 2022-04-11 16:22:23 +03:00
2de60d3e12 Web: Files: SelectFile: Added style for row selection. 2022-04-11 15:54:27 +03:00
eedfa4a154 Web: Files: Optimization aside view, refactoring. 2022-04-11 15:27:11 +03:00
ce5fe18139 Web: Files: fixed onClickMakeForm 2022-04-11 13:50:33 +03:00
efb225a3d8 Files: added creating rooms 2022-04-11 13:12:34 +03:00
38cc84ee5c FilesDao: revert 2022-04-11 13:09:43 +03:00
d727e60c49 Web: Files: SelectFileDialog: Added the possibility to disable button if file is not selected. 2022-04-11 12:45:35 +03:00
Timofey Boyko
bf7be4582d Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-11 12:06:51 +03:00
Timofey Boyko
044755837e Web:Files:Components: fix displaying sharing panel, add users panel, add groups panel, change owner and embedding panel for small size devices and mobile 2022-04-11 12:05:13 +03:00
1922fe67d4 Web: Files: fixed activateHotkeys 2022-04-11 11:53:49 +03:00
8f623ae40a Web: Files: Fixed styles. 2022-04-11 11:20:38 +03:00
d07c5e071e Web: Files: Renamed function, refactoring. 2022-04-11 11:14:05 +03:00
002a432b4d Web: fixed info-panel icon 2022-04-11 11:11:44 +03:00
2b93c52d9d Web: Files: Added wrappers for ModuleFederationPlagin 2022-04-11 11:03:56 +03:00
387119f6f2 remove waste 2022-04-11 10:58:18 +03:00
347658726b Web: Files: refactoring, deleted useless code. 2022-04-11 10:51:42 +03:00
4e66bc9a7d Web: Files: SelectFile: Return onMouseEvent. 2022-04-11 10:45:52 +03:00
38aa42fdf8 Web: Files: Refactoring, deleted useless code. 2022-04-11 10:30:23 +03:00
Timofey Boyko
51c0411262 Web:Files:Components: fix padding-top of body for embedding panel 2022-04-11 10:24:05 +03:00
55cd1d17b9 Web: Files: Refactoring, fixed styles. 2022-04-11 09:58:15 +03:00
70ee53b5cb Web: Files: SelectFolder: Added "canCreate" prop. 2022-04-11 09:42:42 +03:00
751e2b2bd1 Web: Files: SelectFolder: Fixed styles of aside view, refactoring. 2022-04-11 09:01:18 +03:00
6b083cb99c Web:Files: Fixed dialog title. 2022-04-11 09:00:31 +03:00
e6d0d1a244 Web: Files: SelectFile: Fixed aside view. 2022-04-10 17:46:41 +03:00
Artem Tarasov
a45a97af81 Merge branch 'develop' into feature/doceditor-ssr 2022-04-10 17:25:44 +03:00
8292795d8c Files: added root folders filter 2022-04-10 15:30:46 +03:00
e78253a6b9 Files: added root virtual rooms folder 2022-04-10 14:35:43 +03:00
0810423799 Web:Files/Common: Added new loaders. 2022-04-10 14:20:06 +03:00
09e800c63e WEb: Files: Refactoring. 2022-04-10 13:14:56 +03:00
34d4b5dbaa Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign 2022-04-10 12:29:24 +03:00
Timofey Boyko
797324cd1e Web:Files:Components: add styled header from sharing panel to embedding panel 2022-04-08 19:43:30 +03:00
Timofey Boyko
1a6d773496 Web:Files:Component: add active class name for select size buttons of embedding panel 2022-04-08 19:42:48 +03:00
Timofey Boyko
04206a0cd0 Web:Files:Component: change styles of select size buttons of embedding panel 2022-04-08 19:42:23 +03:00
mushka
19a5441201 added isLarge prop, swipe on smallTablets && mobiles and fixed styles 2022-04-08 17:37:22 +03:00
87e1222783 Web: Files: SelectFile: Changed logic. 2022-04-08 17:12:48 +03:00
Timofey Boyko
3424c13f1c Web:Files:Components: fix footer styles for ChangeOwnerPanel 2022-04-08 16:24:30 +03:00
31dadfd140 Web: removed unused code 2022-04-08 15:45:08 +03:00
Timofey Boyko
9bdf036f18 Web:Files: delete useless code 2022-04-08 15:33:45 +03:00
Timofey Boyko
864f20d751 Web:Files:Components: fix width and footer padding for AddUsersPanel and AddGroupsPanel 2022-04-08 15:29:16 +03:00
Timofey Boyko
f19a8bfe41 Web:Files:Components: fix error when open AddUsersPanel and type in search 2022-04-08 15:21:33 +03:00
Timofey Boyko
565ba4cf80 Web:Files:Components: fix sharing panel loader 2022-04-08 15:10:14 +03:00
Timofey Boyko
e0ec32e1ea Web:Files: fix clicking catalog badge and open new files panel 2022-04-08 14:50:10 +03:00
Timofey Boyko
a1c9a3df1b Web:Files:Components: add separator and delete item for access combobox 2022-04-08 14:49:15 +03:00
Timofey Boyko
1687fd613d Web:Files:Components: change getting selected items from shareDataItems for add users panel 2022-04-08 14:48:23 +03:00
Timofey Boyko
bfb1cf35f6 Web:Files:Components: change getting selected items from shareDataItems for add groups panel 2022-04-08 14:48:07 +03:00
9932e76cc4 Web: Refactoring, added styles. 2022-04-08 14:25:26 +03:00
b2fa7884d3 Web: Files: Hotkeys: fixed arrows selection 2022-04-08 13:09:47 +03:00
Timofey Boyko
eaba10ee3c Web:Files:Components: split shareUsers and shareGroups of sharing panel 2022-04-08 10:33:36 +03:00
Timofey Boyko
e2872f0be4 Web:Files:Components: fix displaying selected options for add users panel 2022-04-08 10:30:27 +03:00
ee247f56fd Web: Files: fixed oforms-gallery styles 2022-04-07 17:02:43 +03:00
90bf5a7dc2 Web: Files: added info panel for OFORMsGallery 2022-04-07 16:52:16 +03:00
Timofey Boyko
397ff0d90d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-07 12:10:11 +03:00
Timofey Boyko
471927ff23 Web:Files:Components: add item component for sharing panel 2022-04-07 12:09:16 +03:00
Timofey Boyko
4fb1892463 Web:Files:Components: fix external link drop down for sharing panel 2022-04-07 12:08:49 +03:00
Timofey Boyko
7ffdd090d7 Web:Files:Components: add new locale for sharing panel 2022-04-07 12:08:12 +03:00
342c938415 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-07 11:17:57 +03:00
b135de806f Web: Files: Fix borders on thumbnails 2022-04-06 21:16:44 +03:00
22181e08d7 Web: Files: Restore thumbnail-image cover and increased thumbnaillHeight and thumbnaillWidth for Info Panel 2022-04-06 21:08:08 +03:00
aa91c6389c Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	packages/asc-web-common/components/Section/sub-components/section-container.js
2022-04-06 20:36:36 +03:00
3ef7ae85de Web: SelectFolder: Optimization, refactoring. 2022-04-06 18:04:43 +03:00
Timofey Boyko
1a59645ed0 Web:Files:Components: add new translates for sharing panel 2022-04-06 16:08:05 +03:00
Timofey Boyko
d6990bdf0b Web:Files:Components: add internal link component for sharing panel 2022-04-06 16:05:23 +03:00
Timofey Boyko
a3a318a01d Web:Files:Components: delete useless code of sharing panel 2022-04-06 15:07:51 +03:00
Timofey Boyko
d33e889392 Web:Files:Components: update AccessComboBox of SaringPanel 2022-04-06 15:07:33 +03:00
Timofey Boyko
d652300a5a Web:Files:Components: add ExternalLink component for SharingPanel 2022-04-06 15:06:59 +03:00
Timofey Boyko
6ec821586a Web:Files: add copy.react.svg and code.react.svg 2022-04-06 15:05:50 +03:00
6dfb0d86d5 filter of files
add searchInContent in filesController's methods
2022-04-06 14:32:15 +03:00
Timofey Boyko
8c31b41fd7 Web:Files:Components: update styled components for sharing panel 2022-04-05 18:29:07 +03:00
Timofey Boyko
f4e7c43d8d Web:Files:Components: create Footer funcation component for sharing panel 2022-04-05 18:28:37 +03:00
Timofey Boyko
574056b946 Web:Files:Components: move out StyledComponents 2022-04-05 18:28:11 +03:00
Timofey Boyko
5b975c5f29 Web:Files:Components: create StyledFooter, StyledHeader, StyledExternalLink, StyledContent and StyledBody for Sharing panels 2022-04-05 18:27:34 +03:00