|
|
7e90eebf07
|
Web: Editor: Added translations.
|
2023-03-01 16:24:37 +03:00 |
|
|
|
d09f28176b
|
Web: Editor: Renaming.
|
2023-03-01 14:38:59 +03:00 |
|
|
|
25bc273d7f
|
Web: Editor: Added list of users and sending mentions.
|
2023-03-01 14:23:58 +03:00 |
|
|
|
05249ddf77
|
Merge branch 'develop' into feature/browserlist
|
2023-02-28 13:48:19 +03:00 |
|
|
|
0386034439
|
Added browserDetector at editor and login templates
|
2023-02-28 13:47:43 +03:00 |
|
Viktor Fomin
|
64484eaa29
|
Editor: xss protection
|
2023-02-27 12:23:12 +03:00 |
|
Timofey Boyko
|
93d1675bfb
|
Fixed Bug 61190 - Files. The editor does not open + errors in the console if the username contains XSS injection
|
2023-02-15 12:16:11 +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
|
131dd06bdb
|
Web: fix build
|
2023-02-06 19:15:04 +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 |
|
Timofey Boyko
|
f29d92f745
|
Web:Editor: add autoGeneratedTranslations.ts to gitignore file
|
2023-02-03 19:09:36 +03:00 |
|
Timofey Boyko
|
0b7b214fbb
|
Web: change prebuild-webpack-plugin for before-build-webpack-plugin
|
2023-02-03 18:52:51 +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 |
|
|
|
961b0ad613
|
Merge branch 'release/rc-v1.2.0' into feature/fonts-static-versioned
|
2023-02-02 17:46:41 +03:00 |
|
Timofey Boyko
|
9f0d2b62cb
|
Web: fix regexp for json locales
|
2023-02-02 17:09:26 +03:00 |
|
|
|
de95953b14
|
Web: Fix OS path separator split
|
2023-02-02 16:50:45 +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
|
779cd5f4c8
|
Web: update regexp for webpack for work with locales files as url
|
2023-02-01 18:49:17 +03:00 |
|
Timofey Boyko
|
0c63349dd1
|
Web:Editor: fix multi create auto generated translations file
|
2023-02-01 18:43:12 +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
|
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
|
2b2b8377c7
|
Web: add beforeBuild to all modules
|
2023-02-01 16:06:33 +03:00 |
|
Timofey Boyko
|
581d81a347
|
Web:Editor: add prebuild-webpack-plugin
|
2023-02-01 16:03:42 +03:00 |
|
Timofey Boyko
|
ac032a29c3
|
Web:Editor: fix path for server
|
2023-02-01 12:08:24 +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
|
ce06b2984e
|
Web:Editor: fix work with hashed translation
|
2023-01-31 19:23:49 +03:00 |
|
Timofey Boyko
|
71c14db6df
|
Revert 6bbf8e3a62
|
2023-01-31 18:56:58 +03:00 |
|
Timofey Boyko
|
521a1658c6
|
Web:Editor: disable sw and fix tranlsation hash
|
2023-01-31 17:10:19 +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
|
6bbf8e3a62
|
Web: move all Locales from Login and Editor to public dir
|
2023-01-30 15:11:30 +03:00 |
|
Timofey Boyko
|
064c7b593d
|
Web:Editor: fix PUBLIC_DIR
|
2023-01-27 17:07:56 +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
|
046df1e16e
|
Web:Editor:Server: disable cache-control
|
2023-01-27 13:53:13 +03:00 |
|
|
|
7db5e5f353
|
Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal
|
2023-01-27 12:11:11 +03:00 |
|
Timofey Boyko
|
76bd31350f
|
Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned
|
2023-01-27 11:42:52 +03:00 |
|
|
|
761a8357dd
|
Fix Bug 60788 - Rooms.Search. The background scrolls behind the List accounts panel on the touchpad in Chrome on MacOS.
|
2023-01-26 20:23:50 +03:00 |
|
Timofey Boyko
|
c87c82a6ea
|
Web:Editor: change 'client/' to '/docedtor/' to images
|
2023-01-26 18:12:08 +03:00 |
|
Timofey Boyko
|
8c71569d04
|
Web:Editor: change webpack asset rule
|
2023-01-26 18:11:45 +03:00 |
|
|
|
05b8f4ea81
|
Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal
|
2023-01-25 10:37:37 +03:00 |
|
|
|
9b6c0f9003
|
Editor: Added check for config.editorConfig.customization.customer
|
2023-01-24 22:27:05 +03:00 |
|
|
|
d2bd062b2f
|
Editor: Added console error logging
|
2023-01-24 20:57:23 +03:00 |
|
|
|
75ef9b68f3
|
Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal
|
2023-01-24 18:36:09 +03:00 |
|
Timofey Boyko
|
b560fe18a6
|
Web:Editor: delete console log
|
2023-01-24 18:24:14 +03:00 |
|
Timofey Boyko
|
ce38924f18
|
Web:Editor: fix hash url at template
|
2023-01-24 18:22:55 +03:00 |
|
Timofey Boyko
|
9e5f76d7c0
|
Web: fix double slash for favicon
|
2023-01-24 17:37:18 +03:00 |
|
|
|
31fd0c4acf
|
Web: Editor: Added text when restoring the portal from a backup.
|
2023-01-24 17:01:09 +03:00 |
|
|
|
ffe96b00b6
|
Web: Editor: Deny editing rights when portal restoring.
|
2023-01-24 11:02:46 +03:00 |
|
|
|
55d4b19542
|
Fix open editor error page
|
2023-01-19 17:55:12 +03:00 |
|
Timofey Boyko
|
f20a1db341
|
Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned
|
2023-01-19 16:15:19 +03:00 |
|
|
|
4f75a19927
|
Web: Editor: Returned logoUrls.
|
2023-01-19 15:57:55 +03:00 |
|
|
|
226d9da326
|
Web: Fixed translation.
|
2023-01-19 15:51:41 +03:00 |
|
Timofey Boyko
|
ef1d0c0184
|
Web: change assetModuleFilename rule
|
2023-01-19 15:37:15 +03:00 |
|
|
|
dd2a45129c
|
Web: Editor: Added translation.
|
2023-01-19 14:44:13 +03:00 |
|
|
|
17bd1b711e
|
Web: Editor: Added text error.
|
2023-01-19 14:29:57 +03:00 |
|
|
|
ddf6132965
|
Web: Editor: Fixed theme.
|
2023-01-19 12:40:57 +03:00 |
|
|
|
3ca63a7077
|
Web: Editor: Renamed.
|
2023-01-18 15:49:20 +03:00 |
|
|
|
ffaaad93df
|
Web: Editor: Removed automatic notification closure.
|
2023-01-18 15:42:48 +03:00 |
|
|
|
b4a342f334
|
Web: Editor: Added display of an image with an error, added conditions for deleting the main loader.
|
2023-01-18 15:36:18 +03:00 |
|
|
|
fc1d6d9249
|
Fixed Bug 60481 - Added additional error handlers.
|
2023-01-18 15:29:32 +03:00 |
|
Timofey Boyko
|
be4265bbda
|
Web:Editor: fix assets path for customization logos
|
2023-01-13 18:04:16 +03:00 |
|
Timofey Boyko
|
5730a5e8ac
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-12 18:10:15 +03:00 |
|
|
|
46b99d1f25
|
Removed old resources (Team titles - custom names)
|
2023-01-12 16:20:35 +03:00 |
|
Timofey Boyko
|
21b2b9502f
|
Web:Editor: fix favicon
|
2023-01-12 15:39:00 +03:00 |
|
Timofey Boyko
|
2a3176f820
|
Web: fix after merge
|
2023-01-11 19:04:31 +03:00 |
|
Timofey Boyko
|
b46d21c258
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-11 18:47:06 +03:00 |
|
Timofey Boyko
|
98e5ce3240
|
Web: move imgs from components to public
|
2023-01-11 18:38:08 +03:00 |
|
|
|
c2ceab129a
|
Merge branch 'release/rc-v1.2.0' into feature/edit-en
|
2023-01-11 10:57:10 +03:00 |
|
|
|
0b64d4223c
|
Web: Default document names have been moved to 'Common' file.
|
2023-01-10 15:26:57 +03:00 |
|
|
|
89c7348ccf
|
Web: Editor: Restored back url.
|
2023-01-09 17:44:40 +03:00 |
|
|
|
f7bcbf54e0
|
Web: Editor: Fixed document type for creation url.
|
2023-01-09 17:22:42 +03:00 |
|
|
|
5a83f41348
|
Fixed Bug 60464 - Files. ‘Sorry, the resource could not be found’ on the page when creating a new document from the editor.
|
2023-01-09 17:14:54 +03:00 |
|
Timofey Boyko
|
973284162e
|
Web:Editor: fix import images
|
2023-01-09 16:41:05 +03:00 |
|
|
|
6526b1463d
|
edited en
|
2022-12-30 14:56:53 +03:00 |
|
|
|
0a9fd4354e
|
Merge pull request #1135 from ONLYOFFICE/feature/form-links
Feature/form links
|
2022-12-27 15:01:11 +03:00 |
|
Viktor Fomin
|
e730861894
|
Editor: use custom favicon
|
2022-12-27 14:43:29 +03:00 |
|
Timofey Boyko
|
42b1862e4b
|
Web:Editor: fix empty toastr
|
2022-12-27 11:10:26 +03:00 |
|
|
|
ea430c6181
|
Merge branch 'release/rc-v1.2.0' into feature/form-links
|
2022-12-26 17:13:51 +03:00 |
|
Akmal Isomadinov
|
c62000f3f5
|
Web: Fixed redirection after login
|
2022-12-23 15:56:42 +05:00 |
|
Timofey Boyko
|
ad860a20f4
|
Fixed Bug 60296 - Rooms.Files. Error 'Warning. Unable to set properties of undefined (setting 'message')' when opening a file link for room members by an unregistered user
|
2022-12-23 10:54:29 +03:00 |
|
|
|
bd5ed37eb6
|
Web: Editor: added linked form check
|
2022-12-22 15:52:09 +03:00 |
|
|
|
e8141c6f22
|
Web: Changed load Docspace config for clients
|
2022-12-20 19:51:49 +03:00 |
|
|
|
941ad53a08
|
Web: Added check for third-party file.
|
2022-12-16 19:57:41 +03:00 |
|
|
|
c28f6943dc
|
Web: Editor: Added onRequestReferenceData.
|
2022-12-16 19:34:01 +03:00 |
|
|
|
67a85a0095
|
Merge branch 'release/rc-v1.2.0' into feature/advanced-security
|
2022-12-16 16:45:54 +03:00 |
|
Akmal Isomadinov
|
2e66174a87
|
Web Fixed catch
|
2022-12-16 17:17:30 +05:00 |
|
|
|
57707de013
|
Web: Deleted canConvert;
|
2022-12-16 13:54:39 +03:00 |
|
|
|
5a80f7184d
|
Web: Editor: Changed rights.
|
2022-12-15 13:32:53 +03:00 |
|
|
|
c209e55210
|
Web: Deleted useless code.
|
2022-12-14 19:35:35 +03:00 |
|
|
|
90c596fe53
|
Web: Fixed rights for editor.
|
2022-12-14 11:50:49 +03:00 |
|
|
|
4affc5f58f
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-07 18:50:14 +03:00 |
|
|
|
135ea764dc
|
Web: Editor: Fixed action link.
|
2022-12-02 13:46:06 +03:00 |
|
|
|
1b7844b44a
|
Merge branch 'develop' into feature/socket-newtag
|
2022-11-25 17:17:31 +03:00 |
|
|
|
e2e81982f9
|
SocketIO: new rooms and events
|
2022-11-25 12:42:15 +03:00 |
|
|
|
23a7210fbc
|
Merge branch 'develop' into bugfix/access-rights
|
2022-11-24 20:33:59 +03:00 |
|
