Commit Graph

8734 Commits

Author SHA1 Message Date
Akmal Isomadinov
7340e2c4f6 Web:Components:Viewer:Sub-Components:Viewer-Base Fixed warning 2023-02-07 22:10:31 +05:00
Akmal Isomadinov
474e6251ef Web: Refactoring MediaViewer 2023-02-07 22:09:48 +05:00
Akmal Isomadinov
e15b806c68 Web:Packages:Common:Components:MediaViewerTS Added types 2023-02-07 22:07:38 +05:00
Akmal Isomadinov
f532ed6fd5 Web:Common:Components:MediaViewerTS Added helpers 2023-02-07 22:06:46 +05:00
Timofey Boyko
0baee7fbee Merge branch 'develop' into feature/login-error-page 2023-02-07 18:38:40 +03:00
Timofey Boyko
ede3a5d21d Web:Login: add mechanism for throwing error from server 2023-02-07 18:36:44 +03:00
Timofey Boyko
1dc5d41884 Web:Login: fix error message type 2023-02-07 18:36:16 +03:00
Timofey Boyko
7e23b7118e Web:Login:Server: add protect for undefined values 2023-02-07 18:32:17 +03:00
Timofey Boyko
88624cccf0 Web:Login:Client: add protect for undefined values 2023-02-07 18:32:02 +03:00
Timofey Boyko
fc3030e0af Web:Common:Utils: getBgPattern can accept undefined as colorSchemeId 2023-02-07 18:31:06 +03:00
Timofey Boyko
28c903f382 Web:Common: add protect for undefined values 2023-02-07 18:30:18 +03:00
Timofey Boyko
b6ece7b2ac Web:Login: add correct theme for Error502 and pass it to all components inside 2023-02-07 18:26:51 +03:00
Timofey Boyko
03116b8ffa Web:Login: update interfaces and add new IError for error from server 2023-02-07 18:26:05 +03:00
Timofey Boyko
2397482010 Web:Login: add html template to catch section and send error to client 2023-02-07 18:25:37 +03:00
367d8c9936 Web: Files: fixed folder select 2023-02-07 18:23:44 +03:00
601e61eab6 Web: Files: fixed drag 2023-02-07 17:59:01 +03:00
DmitrySychugov
e0fff6ce0a Web: Components: fixed display of video duration 2023-02-07 19:40:26 +05:00
86d93f1259 Merge branch 'develop' into feature/selection-area
# Conflicts:
#	yarn.lock
2023-02-07 17:04:43 +03:00
08e68ac6a5 Web: SelectionArea: fixed tile view 2023-02-07 16:56:15 +03:00
Viktor Fomin
7ac9a9ed54 Merge branch 'develop' into bugifx/wizard 2023-02-07 14:44:48 +03:00
c89b8ca427 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
#	common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
2023-02-07 14:31:22 +03:00
Timofey Boyko
dda05f7d7d Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-07 13:26:54 +03:00
Timofey Boyko
e0f2a397c4 Web:Client: fix translations for devices 2023-02-07 13:26:46 +03:00
0dd6985bd2 Fixed storybook run 2023-02-07 12:57:48 +03:00
264f415dff Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-02-07 12:21:29 +03:00
81e6c58cc1 Web:Client:Added that when opening the Accent and Buttons modal, the colors are displayed from the previously selected portal theme. 2023-02-07 12:20:31 +03:00
22eacf4fb8 Fixed Bug 61060 - Accounts: Error in console Uncaught TypeError: "newData" is read-only when deselecting account 2023-02-07 11:00:21 +03:00
Viktor Fomin
1328cb2691 Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-07 00:47:41 +03:00
Viktor Fomin
c6537bdddd Client: Wizard: fix error message 2023-02-07 00:46:36 +03:00
45b8e81a63 Web: Optimization of thumbnails creation 2023-02-06 23:05:57 +03:00
8c18fb254d Fix TypeError: Cannot read properties of undefined (reading 'split') 2023-02-06 20:47:54 +03:00
Viktor Fomin
ee82613d81 Client: Wizard: add upload and validate license 2023-02-06 20:09:22 +03:00
Timofey Boyko
3dc7c23196 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-06 19:28:08 +03:00
Elyor Djalilov
3722ae1a77 Fix Bug 61037 - Rooms.Localization. Incorrect message about moving rooms to the archive in Russian localization 2023-02-06 21:23:32 +05:00
Elyor Djalilov
0bfb980f99 Bug 61043 - Files. Unreadable characters instead of name in Author column and Info/History panel 2023-02-06 21:19:25 +05:00
Timofey Boyko
131dd06bdb Web: fix build 2023-02-06 19:15:04 +03:00
Akmal Isomadinov
917fe492eb Merge branch 'release/rc-v1.2.0' into feature/refactoring-mediaviewer 2023-02-06 20:59:27 +05:00
Akmal Isomadinov
d3dcbad09c Merge branch 'release/rc-v1.2.0' into feature/refactoring-mediaviewer 2023-02-06 20:54:43 +05:00
DmitrySychugov
f25abdc1ba Web: Components: added alignment for title media error 2023-02-06 19:51:53 +05:00
DmitrySychugov
b3d04ccd59 Web: Client: added media error ru translation 2023-02-06 19:50:55 +05:00
c97c281dea Web: Components: Toast: Fixed error toast with custom body 2023-02-06 16:35:50 +03:00
d3bed594a9 Web: Client: ChangeUserTypeEvent: Fixed client error message, added payments setting link 2023-02-06 16:33:40 +03:00
6fa291abce Web: Client: Locales: Payment: Fixed key: QuotaPaidUserLimitError 2023-02-06 16:32:29 +03:00
52fd2400e1 Web: Client: Locales: Payment: Added new key: QuotaPaidUserLimitError 2023-02-06 15:15:44 +03:00
33630ce818 Web: Client: ChangeUserTypeEvent: Added client error message 2023-02-06 15:15:08 +03:00
1b14e863b4 Web: Client: UsersStore: Fixed updateUserType action 2023-02-06 15:14:28 +03:00
ac7944370a Web: Client: Fixed Typo fixed 2023-02-06 15:13:36 +03:00
68242853a7 Web: Files: fixed SelectionArea 2023-02-06 14:31:53 +03:00
DmitrySychugov
2e2e6145d9 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-06 16:10:55 +05:00
DmitrySychugov
fa650bad45 Web: Client: added error media component 2023-02-06 16:10:43 +05:00
DmitrySychugov
321298d809 Web: Client: added en media error translation 2023-02-06 16:09:55 +05:00
Viktor Fomin
075374c43a Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-06 13:52:41 +03:00
65534fc670 Merge branch 'release/rc-v1.2.0' into bugfix/mediaviewer-primary-loading 2023-02-06 13:23:29 +03:00
73eb1a220e
Merge pull request #1166 from ONLYOFFICE/bugfix/ssr-translations
Bugfix/ssr translations
2023-02-06 13:00:09 +03:00
Akmal Isomadinov
33283cc63b Web:Components:Viewer:Sub-Components:Mobile-Viewer Fixed image size on mobile 2023-02-06 13:40:35 +05:00
c38e0885a2 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-02-06 11:33:07 +03:00
fac357c357 Web:Components:Adding Animation. 2023-02-06 11:32:19 +03:00
Timofey Boyko
ca973c0002 Merge branch 'bugfix/ssr-translations' of https://github.com/ONLYOFFICE/DocSpace into bugfix/ssr-translations 2023-02-06 11:32:10 +03:00
Timofey Boyko
6137e2a122 Web: remove before-build-webpack-plugin and apply custom plugin for create autoGeneratedTranlsations files 2023-02-06 11:32:02 +03:00
538adba4cf Web:Client:Adding animation to files when updating a version higher than the second when downloading and converting. 2023-02-06 11:31:47 +03:00
Akmal Isomadinov
4f22a2a462 Merge branch 'bugfix/mediaviewer-primary-loading' of github.com:ONLYOFFICE/DocSpace into bugfix/mediaviewer-primary-loading 2023-02-06 12:35:30 +05:00
Akmal Isomadinov
7521acb1ad Web:Components:Viewer:Sub-Components:Viewer-Base Fixed image size 2023-02-06 12:35:02 +05:00
0c10732df8 Merge branch 'release/rc-v1.2.0' into bugfix/mediaviewer-primary-loading 2023-02-03 20:22:39 +03:00
313008a5e4 Update webpack.base.js 2023-02-03 20:14:12 +03:00
f9d0c7f4f6 Merge branch 'release/rc-v1.2.0' into bugfix/ssr-translations 2023-02-03 19:51:54 +03:00
a92cd3991e Fix empty DeleteDialog text on preview delete on mobile 2023-02-03 19:51:26 +03:00
Timofey Boyko
cafc004db1 Web:Client: add autoGeneratedTranslations.ts to gitignore file 2023-02-03 19:10:11 +03:00
Timofey Boyko
f29d92f745 Web:Editor: add autoGeneratedTranslations.ts to gitignore file 2023-02-03 19:09:36 +03:00
Timofey Boyko
ccbe89546f Web:Login: add autoGeneratedTranslations.ts to gitignore file 2023-02-03 19:08:46 +03:00
Timofey Boyko
7df2d0dd0f Merge branch 'bugfix/ssr-translations' of https://github.com/ONLYOFFICE/DocSpace into bugfix/ssr-translations 2023-02-03 19:07:02 +03:00
Timofey Boyko
0b7b214fbb Web: change prebuild-webpack-plugin for before-build-webpack-plugin 2023-02-03 18:52:51 +03:00
08df544bcd Fix crash on mobile after remove file on viewer 2023-02-03 18:51:45 +03:00
Akmal Isomadinov
c9012ab76f Web:Common:Components: Added MediaViewer 2023-02-03 20:05:26 +05:00
79d074689a Merge branch 'release/rc-v1.2.0' into bugfix/ssr-translations 2023-02-03 17:54:09 +03:00
Timofey Boyko
d83c9520dc Web:Login: fix 2023-02-03 17:51:44 +03:00
Timofey Boyko
81dbf9c840 Web:Editor: update work with translation files 2023-02-03 17:49:28 +03:00
Timofey Boyko
7d1aa41ebb Web:Editor: add new alias, add additionalPath at beforeBuild function and remove file loader for json file for server 2023-02-03 17:48:59 +03:00
Viktor Fomin
ca601dc231 Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-03 17:27:15 +03:00
Viktor Fomin
d507702150 Client: Wizard: add license input 2023-02-03 17:27:07 +03:00
Viktor Fomin
af1c429b16 Components: Themes: fix 2023-02-03 17:25:13 +03:00
Timofey Boyko
d4314b6601 Web:Login: commit new autoGeneratedTranslations 2023-02-03 17:16:32 +03:00
Timofey Boyko
69c2390895 Web:Login:Client: fix helpers for work with translations files 2023-02-03 17:16:01 +03:00
Timofey Boyko
2502557c58 Web:Login:Server: send only en and current lang locales to client 2023-02-03 17:15:17 +03:00
Timofey Boyko
e8cdfd6213 Web:Login:Server:i18n: import locales as resources 2023-02-03 17:14:54 +03:00
Timofey Boyko
500d1fe09b Web:Login: remove file loader for json file for server 2023-02-03 17:14:20 +03:00
Timofey Boyko
bc3cf59630 Web:Login: add additional path for beforeBuild script 2023-02-03 17:14:02 +03:00
Timofey Boyko
dcb1f29306 Web:Login: add new alias CLIENT_PUBLIC_DIR 2023-02-03 17:13:29 +03:00
Timofey Boyko
c3461b61e8 Web:Common:Utils: add logic for work with additionalPath for beforeBuild function 2023-02-03 17:13:03 +03:00
1759f7c564 Merge branch 'release/rc-v1.2.0' into bugfix/mediaviewer-primary-loading 2023-02-03 16:49:46 +03:00
ba0ff963cb Update FilesStore.js 2023-02-03 16:36:32 +03:00
Viktor Fomin
0c6986f593 Client: Wizard: use constants 2023-02-03 15:44:35 +03:00
Viktor Fomin
9623c3a322 Client: add constants 2023-02-03 15:44:22 +03:00
Viktor Fomin
fe1cbda2f2 Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-03 14:53:23 +03:00
Timofey Boyko
7fff409f0f Web:Login:Server: add function for changed currentLanguage to correct currentLanguage 2023-02-03 14:22:08 +03:00
6fcb5eb605 Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-03 10:55:17 +03:00
Timofey Boyko
7f61aa85ca Web:Client: fix src={false} for files 2023-02-03 10:28:43 +03:00
Viktor Fomin
38608bb394 Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-02 23:27:55 +03:00
Viktor Fomin
fad0655c97 Wizard: Client: fix 2023-02-02 23:27:28 +03:00
961b0ad613 Merge branch 'release/rc-v1.2.0' into feature/fonts-static-versioned 2023-02-02 17:46:41 +03:00
Viktor Fomin
5a8db3cab7 Client: Wizard: fix 2023-02-02 17:11:28 +03:00
Timofey Boyko
9f0d2b62cb Web: fix regexp for json locales 2023-02-02 17:09:26 +03:00
Timofey Boyko
9e67aadbe9 Web: delete useless code 2023-02-02 17:07:41 +03:00
de95953b14 Web: Fix OS path separator split 2023-02-02 16:50:45 +03:00
Timofey Boyko
b19f7f37bf Merge branch 'release/rc-v1.2.0' into feature/fonts-static-versioned 2023-02-02 15:19:27 +03:00
Timofey Boyko
2f532533de Web:Editor: delete useless code 2023-02-02 15:16:58 +03:00
Timofey Boyko
70f319160c Web:Editor: add asset/resource type for woff2 format and disable emit files, also change asset path 2023-02-02 15:16:31 +03:00
Timofey Boyko
4bd1483718 Web:Login:Template: change fonts import 2023-02-02 15:15:17 +03:00
Timofey Boyko
27b7723cb2 Web:Login:Client: delete useless code 2023-02-02 15:14:57 +03:00
Timofey Boyko
9b07ea2b61 Web:Login: add asset/resource type for woff2 format and disable emit files, also change asset path 2023-02-02 15:14:23 +03:00
Timofey Boyko
92f59e31b5 Web:Client: add asset/resource type for woff2 format and disable emit files 2023-02-02 15:12:19 +03:00
Timofey Boyko
3a3cedde88 Web:Common: update import for fonts 2023-02-02 15:10:54 +03:00
409366d807 Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-02-02 14:12:03 +03:00
Akmal Isomadinov
5794262bc1 Web: Fixed memory leak 2023-02-02 15:56:21 +05:00
Akmal Isomadinov
7a2ca63577 Web: Fixed mediaviewer primary loading 2023-02-02 15:55:27 +05:00
Viktor Fomin
42feb5475a Client: Wizard: fix timezone select 2023-02-02 13:22:16 +03:00
Elyor Djalilov
272c57a1fd Web: PortalSettings: fix translate 2023-02-02 13:45:05 +05:00
Elyor Djalilov
9469d12f83 Web: PortalSettings: fix style 2023-02-02 13:40:45 +05:00
Elyor Djalilov
b9b7a5c7db Web: PortalSettings: fix style 2023-02-02 13:36:36 +05:00
Timofey Boyko
5125fec48f Web:Client: delete console log 2023-02-02 10:05:53 +03:00
Timofey Boyko
9e67f4343f Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-02-02 09:45:44 +03:00
1501d0f537 Web: Client: InvitePanel: Fixed disabling external links and generating new ones when external links enabled 2023-02-01 23:00:32 +03:00
f7823f4269 Web: Client: InvitePanel: Fixed restore external link access after reopen panel 2023-02-01 22:58:07 +03:00
508bb218df Web: Components: AccessRightSelect: Fixed property error 2023-02-01 22:57:07 +03:00
334c032c15 Fix Bug 60961 - Accounts. The account is selected twice when clicking on the user icon (checkbox) 2023-02-01 21:59:00 +03:00
Viktor Fomin
08d4e98e67 Common: LoginContainer: fix 2023-02-01 20:23:14 +03:00
Viktor Fomin
95395f1f1e Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-01 19:02:39 +03:00
Viktor Fomin
c755132000 Client: Wizard: fix win crash 2023-02-01 19:02:23 +03:00
Timofey Boyko
a4171c6749 Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-02-01 18:50:26 +03:00
Timofey Boyko
779cd5f4c8 Web: update regexp for webpack for work with locales files as url 2023-02-01 18:49:17 +03:00
DmitrySychugov
663da51fce Web: Client: removed the display of one item in the context menu in the viewer 2023-02-01 20:44:02 +05:00
Timofey Boyko
e3ba3fe29d Web:Client:Webpack: delete useless code 2023-02-01 18:43:26 +03:00
Timofey Boyko
0c63349dd1 Web:Editor: fix multi create auto generated translations file 2023-02-01 18:43:12 +03:00
Timofey Boyko
7beb8403cc Web:Login: fix multi create auto generated translations file 2023-02-01 18:43:01 +03:00
Timofey Boyko
57d6925791 Web: update webpack configs for work with auto generated translations file 2023-02-01 18:36:43 +03:00
Timofey Boyko
bf63c3e1ec Web:Common:Utils: update beforeBuild function, now it auto generate translations file 2023-02-01 18:35:13 +03:00
Timofey Boyko
72e3fe9032 Web: rename translations to autoGeneratedTranslations 2023-02-01 17:53:33 +03:00
Timofey Boyko
b717ce6f30 Web:Editor:Webpack: delete console.log 2023-02-01 16:13:37 +03:00
Timofey Boyko
d7b059afaa Web:Common:Utils: delete useless code from beforeBuild function 2023-02-01 16:11:34 +03:00
Timofey Boyko
2b2b8377c7 Web: add beforeBuild to all modules 2023-02-01 16:06:33 +03:00
Timofey Boyko
c3154d88a3 Web:Common:Utils: add beforeBuild function 2023-02-01 16:06:08 +03:00
Timofey Boyko
531e265e73 Web:Login: add prebuild-webpack-plugin 2023-02-01 16:04:41 +03:00
Timofey Boyko
581d81a347 Web:Editor: add prebuild-webpack-plugin 2023-02-01 16:03:42 +03:00
DmitrySychugov
6f3b53f353 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-01 17:44:56 +05:00
DmitrySychugov
90c2c19fc0 Fix Bug 60888 - Web: Common: removed the context menu items if there are no rights 2023-02-01 17:44:47 +05:00
Viktor Fomin
24f52ce97a Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-01 15:13:34 +03:00
Viktor Fomin
4123bfb5b6 Client: Wizard: fix style 2023-02-01 15:13:29 +03:00
Elyor Djalilov
2514de24a0 Web:Client: Fix translate 2023-02-01 17:10:23 +05:00
Viktor Fomin
459b61e1c2 Client: Wizard: fix 2023-02-01 15:03:34 +03:00
Elyor Djalilov
3b4312137c Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-01 16:49:10 +05:00
Elyor Djalilov
baf75b0c42 Web:PortalSettings: Changed portal settings navigation 2023-02-01 16:49:02 +05:00
Viktor Fomin
1e832f817a Common: SettingsStore: disable set cookie for wizard 2023-02-01 13:50:58 +03:00
Viktor Fomin
4e50fdf9ac Client: auto detect user lang 2023-02-01 13:50:29 +03:00
Viktor Fomin
5aefc7840b Client: Wizard: getUserTimezone 2023-02-01 13:13:23 +03:00
Timofey Boyko
26e3008b8c Web:Client: add prebuild-webpack-plugin 2023-02-01 12:39:44 +03:00
Timofey Boyko
ac032a29c3 Web:Editor: fix path for server 2023-02-01 12:08:24 +03:00
Timofey Boyko
1dd4f2b42d Web:Login: delete useless code 2023-02-01 11:50:45 +03:00
Timofey Boyko
440e80e9d3 Web:Login:Helpers: fix loadLanguagePath and initI18n functions for work with static locales 2023-02-01 11:45:20 +03:00
Timofey Boyko
a8f550b0c5 Web:Login: disable copy file with file-loader and return copy-webpack-plugin for locales 2023-02-01 11:41:34 +03:00
Timofey Boyko
9a5171a72d Web:Editor:Helpers: fix loadLanguagePath and initI18n functions for work with static locales 2023-02-01 11:29:36 +03:00
Timofey Boyko
2bfb6ef7b0 Web:Editor: return Common locales import 2023-02-01 11:28:36 +03:00
Timofey Boyko
3048f56b19 Web:Editor: disable copy file with file-loader and return copy-webpack-plugin for locales 2023-02-01 11:26:58 +03:00
Timofey Boyko
e57ee84e6e Web:Client:Helpers: change loadLanguagePath function for work with static locales 2023-02-01 11:13:20 +03:00
Timofey Boyko
930b71b424 Web:Client: disable copy file with file-loader and return copy-webpack-plugin for locales 2023-02-01 11:02:32 +03:00
Viktor Fomin
ee8803abe1 Fix Bug 60677: double button 2023-01-31 20:19:10 +03:00
Timofey Boyko
64005a3576 Web:Client: change public_dir to assets_dir 2023-01-31 19:24:10 +03:00
Timofey Boyko
ce06b2984e Web:Editor: fix work with hashed translation 2023-01-31 19:23:49 +03:00
Timofey Boyko
f56f136e8e Web:Login: fix work with hashed translation 2023-01-31 19:23:36 +03:00
Timofey Boyko
6c7ec4c45b Revert dd3faacd16 2023-01-31 18:57:24 +03:00
Timofey Boyko
71c14db6df Revert 6bbf8e3a62 2023-01-31 18:56:58 +03:00
Timofey Boyko
713b8b6369 Web:Login: delete useless code 2023-01-31 18:54:13 +03:00
Timofey Boyko
bfc9ccf84a Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-01-31 17:13:48 +03:00
Timofey Boyko
521a1658c6 Web:Editor: disable sw and fix tranlsation hash 2023-01-31 17:10:19 +03:00
a35cc5a5d8 Web: Client: GlobalEvents: Fixed page error on change user status after change type 2023-01-31 14:40:30 +03:00
f704d7f4df Web: Client: InfoPanel: Fixed comboBox outside events for mobile devices 2023-01-31 13:18:55 +03:00
Timofey Boyko
ebf15af681 Web:Client: fix useless favicon from webpack 2023-01-31 13:11:19 +03:00
Timofey Boyko
fe8a1bf081 Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-01-31 12:46:43 +03:00
Timofey Boyko
e277023401 Web:Client: fix branding for favicon 2023-01-31 12:44:26 +03:00
Timofey Boyko
68de333e2a Web: Client: remove hash for js files 2023-01-31 12:27:08 +03:00
Timofey Boyko
776b0b7627 Web:Common: delete useless code 2023-01-31 12:18:19 +03:00
Timofey Boyko
51e53c58c1 Web:Client: fix work with hashed translation 2023-01-31 12:17:25 +03:00
Timofey Boyko
f9e09b2299 Web:Login: fix work with hashed translation 2023-01-31 11:27:45 +03:00
dae4bddbbf Web: Accounts: Fix infinite loading on change user type to the same 2023-01-31 00:56:26 +03:00
edddc5ca6e Web: InvitePanel: Added isLoading 2023-01-31 00:38:40 +03:00
bae287b32b Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-31 00:29:39 +03:00
813d23bf01 Disable third-party storages connect in UI 2023-01-31 00:29:07 +03:00
5f79824e2f Fix restore previous user role on errors 2023-01-31 00:06:54 +03:00
73a5a4c3aa Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-01-30 22:14:13 +03:00
77422c7b88 Web:Client:Fix missing version badge when uploading a file on the upload page and from another client. 2023-01-30 22:13:47 +03:00
Timofey Boyko
2a46b713d9 Web:Common:Utils: change loadLanguagePath 2023-01-30 19:19:35 +03:00
Timofey Boyko
5dcfac2dc8 Web:Common:Utils: import all locales 2023-01-30 19:19:14 +03:00
Timofey Boyko
17a1ab2152 Web:Login: update webpack config for work with json files as url 2023-01-30 19:18:49 +03:00
Timofey Boyko
2002564c1a Web:Editor: update webpack config for work with json files as url 2023-01-30 19:18:31 +03:00
Timofey Boyko
2ca548359a Web:Client: update webpack config for work with json files as url 2023-01-30 19:18:13 +03:00
DmitrySychugov
919b268994 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-30 20:44:45 +05:00
DmitrySychugov
1f9dd80192 Fix Bug 60881 - Web: removed unnecessary items in the context menu in the viewer if the room is in the archive 2023-01-30 20:44:15 +05:00
85edd62a76 Web: Client: InfoPanel: Fixed callback after change role 2023-01-30 18:01:56 +03:00
5efd5c7f5d Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-30 17:22:00 +03:00
ca2fbecfea Web: Client: InfoPanel: Fixed svg imports 2023-01-30 17:20:35 +03:00
37088ad7c9 Web: Client: AccountsContextOptionsStore: Fixed image import 2023-01-30 17:01:19 +03:00
8e745b2680 Web: Client: InfoPanel: Fixed errors 2023-01-30 17:00:22 +03:00
Elyor Djalilov
6dc710be0a Fix Bug - Files. Create folder with dialog 2023-01-30 17:56:07 +05:00
825c346bf2 Web: Selection-area: fixed table selection 2023-01-30 15:32:52 +03:00
Timofey Boyko
6bbf8e3a62 Web: move all Locales from Login and Editor to public dir 2023-01-30 15:11:30 +03:00
dd3ef94eaa Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-30 15:06:33 +03:00
bdbf4d84d0 Web: Client: InfoPanel: Added loading and aborting callbacks 2023-01-30 15:02:18 +03:00
8d7a98b51d Web: Client: TableRow: Added loading callback 2023-01-30 15:01:39 +03:00
ad7ff92fa6 Web: Client: GlobalEvents: Added callbacks for ChangeUserTypeEvent 2023-01-30 15:00:59 +03:00
622946f254 Web: Client: PeopleStore: Fixed user role recognition, added abort and success callbacks for change type action 2023-01-30 14:59:31 +03:00
Timofey Boyko
dd3faacd16 Web: move all Locales from Client to public dir 2023-01-30 14:44:43 +03:00
9d5011e330 Web: SelectionArea: fixed scroll 2023-01-30 13:49:35 +03:00
45f62ac03c Web: Files: removed useless code 2023-01-30 13:49:11 +03:00
ec44f0ed7e Merge branch 'release/rc-v1.2.0' into feature/selection-area
# Conflicts:
#	yarn.lock
2023-01-30 13:35:00 +03:00
99ab71fb34 Web: Files: fixed select with shift 2023-01-30 13:18:20 +03:00
Akmal Isomadinov
daa4331f79 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-30 14:31:36 +05:00
Akmal Isomadinov
8bf53e54a4 Web:Client Fixed delete forever dialog for trash 2023-01-30 14:31:16 +05:00
Mushka Nikita
bf0e404ba2 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-01-30 12:07:07 +03:00
Mushka Nikita
a05d7e4f18 fixed createEditRoomDialog visibility issues 2023-01-30 12:07:00 +03:00
8362d9d0c5 Fixed Bug 60159 - Mobile.A FAB button is available to create a room for the user. 2023-01-30 11:21:32 +03:00
Mushka Nikita
8df95e230d updated styling in historyBlock 2023-01-30 11:05:35 +03:00
Mushka Nikita
5a2b8c871f Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-01-30 09:47:48 +03:00
Mushka Nikita
bcbf37b7da created new CreateEditRoomConfirmDialog component 2023-01-30 08:14:11 +03:00
76f62accf4 Web:Client:Add t. 2023-01-29 21:02:11 +03:00
183c38e648 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-01-29 20:46:14 +03:00
c4abc6f423 Web:Client:Fixed the appearance of a deleted converted file after converting a file after deleting the converted file and pressing the convert button again. 2023-01-29 20:45:54 +03:00
Viktor Fomin
c9cc59d04c Client: FilesStore: add delete folder socket 2023-01-28 05:52:20 +03:00
Akmal Isomadinov
90f6bcd8a2 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 22:38:20 +05:00
Akmal Isomadinov
705885d691 Web:Client:Pages:Files Removed old paths 2023-01-27 22:33:32 +05:00
Akmal Isomadinov
b68388d8e6 Web:Client:Store:FilesStore Removed toaster about request cancellation 2023-01-27 22:16:23 +05:00
223558d1bb Fix Bug 60878 - Registration: No redirect when following wrong portal alias (500 Error) 2023-01-27 20:13:31 +03:00
Akmal Isomadinov
e79a16cc8a Web:Client:Components:Article:Body Fixed closing article on mobile phone 2023-01-27 22:08:09 +05:00
DmitrySychugov
e1e9577ff6 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 20:20:59 +05:00
DmitrySychugov
cdddb4e4ac Fix Bug 60879 - Web: Client: removed an extra check for an event when closing the viewer 2023-01-27 20:20:48 +05:00
Elyor Djalilov
289dbab023 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 19:54:48 +05:00
Elyor Djalilov
14c0d8ce09 Fix Bug - Accounts. Upload multiple image 2023-01-27 19:54:41 +05:00
03753ccdc6
Merge pull request #1154 from ONLYOFFICE/bugfix/images-static-versioned
Bugfix/images static versioned
2023-01-27 17:42:16 +03:00
Timofey Boyko
7e1e9ad20b Web:Components: add alias PUBLIC_DIR for storybook 2023-01-27 17:10:22 +03:00
Timofey Boyko
baa30e0305 Web:Common/Client/Components: add PUBLIC_DIR alias 2023-01-27 17:08:30 +03:00
Timofey Boyko
064c7b593d Web:Editor: fix PUBLIC_DIR 2023-01-27 17:07:56 +03:00
Viktor Fomin
97238451b0 Client: FilesStore: fix for create folder 2023-01-27 16:59:29 +03:00
Timofey Boyko
d3e28341a7 Web:Login: add PUBLIC_DIR alias 2023-01-27 16:30:33 +03:00
Timofey Boyko
46fd0401c8 Web:Editor: add PUBLIC_DIR alias 2023-01-27 16:27:39 +03:00
Timofey Boyko
ab7e49b93e Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 16:01:11 +03:00
Timofey Boyko
0574f8d3d8 Web:Client: fix svg import 2023-01-27 15:59:55 +03:00
Timofey Boyko
0ce27827a3 Web:Client:InfoPanel: fix svg import 2023-01-27 15:51:01 +03:00
1402137756 Merge branch 'bugfix/restoring-portal' of github.com:ONLYOFFICE/AppServer into bugfix/restoring-portal 2023-01-27 15:24:30 +03:00
31784ada66 Web: PortalSettings: Restore: Fixed options. 2023-01-27 15:23:55 +03:00
5343ad2c23 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-27 15:01:35 +03:00
Elyor Djalilov
799fdd9679 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 15:56:14 +05:00
Elyor Djalilov
418bc2d3c3 Fix Bug 60695 - Settings: Common. The minimum length of the portal name cannot be less than 6 characters. 2023-01-27 15:56:07 +05:00
Timofey Boyko
cfe642a82f Web:Login:Server: disable cache-control 2023-01-27 13:53:34 +03:00