52ae3d2732
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-09-07 09:49:25 +03:00
184adfa53a
Fix Bug 52249 - Client.Editor.Favorite. "Add to favorites" button for a third-party user opened by an external link of a registered file.
2021-09-07 09:49:00 +03:00
0eaee99856
Fix bug 51365: update avatar in header
2021-09-07 02:31:56 +03:00
5a5bb8fb25
Merge branch 'develop' into release/1.0.0
2021-09-05 22:59:31 +03:00
d099326e7f
Merge branch 'develop' into feature/backup.core
...
# Conflicts:
# common/services/ASC.Data.Backup/Program.cs
2021-09-05 12:50:05 +03:00
Vashchuk Nikita
3b4cb1dfc6
Added GlobalFilter, fix
2021-09-03 17:02:52 +03:00
8171563965
backup.core: move backup.core
2021-09-02 15:41:54 +03:00
fa204303f5
Merge branch 'develop' into release/1.0.0
2021-09-01 16:08:41 +03:00
1fdb42a53a
Fix Error 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries.
2021-09-01 15:25:20 +03:00
99903b3fab
Merge branch 'develop' into feature/compare-files-in-editor
2021-09-01 10:25:39 +03:00
b4c5edfa21
Merge branch 'develop' into feature/backup.core
2021-08-31 17:58:07 +03:00
a6b55a7496
Files: settings. Added ChunkUploadSize
2021-08-31 14:34:30 +03:00
4b3cb1b4fb
backup.core: first version
2021-08-31 12:40:28 +03:00
51c2341248
Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button.
2021-08-30 15:59:17 +03:00
e52cd01fa2
Fix Error 52249 - Client.Editor.Favorite. "Add to favorites" button for a third-party user opened by an external link of a registered file.
2021-08-30 14:47:56 +03:00
cd66c4ffdb
Web: Editor: Refactoring.
2021-08-27 14:21:51 +03:00
beb2a6c707
Web:Editor: Refactoring.
2021-08-27 14:13:50 +03:00
19290bf8cb
Web: Editor: Added translation for documents type.
2021-08-27 13:46:03 +03:00
7fba408991
Web: Editor: Added option "Compare files" for editor.
2021-08-27 13:25:23 +03:00
Vashchuk Nikita
45d221a109
Split webhooks into service and core
2021-08-26 21:43:41 +03:00
dd9e5e9b5d
Merge branch 'develop' into feature/webhooks
2021-08-26 15:17:53 +03:00
c66268a9c2
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/helpers/utils.js
2021-08-26 13:49:25 +03:00
30afd1eca0
Merge branch 'develop' into feature/file-folder-selectors
2021-08-26 09:51:21 +03:00
14e8c59b17
Merge branch 'develop' into release/1.0.0
2021-08-25 21:17:41 +03:00
c37fd46e6f
fix remove photo
2021-08-25 21:17:06 +03:00
040afb10fd
Merge branch 'develop' into feature/file-folder-selectors
2021-08-25 19:11:14 +03:00
b791586252
net6
2021-08-25 18:26:13 +03:00
Vashchuk Nikita
c41361bdd8
fix
2021-08-24 11:08:58 +03:00
20e5efec70
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-08-23 18:20:44 +03:00
a8f2f7348a
Web: Files: Editor: fixed successAuth
2021-08-23 18:20:36 +03:00
a0f5c4231f
fixed run via vs
2021-08-23 15:55:19 +03:00
68e0da72d7
Web: Added no selection of logo.
2021-08-23 13:56:35 +03:00
0cfb70d9e2
Error 52089 - Client.Files. Elements of the page are not selected using left mouse button.
2021-08-23 13:50:21 +03:00
Vashchuk Nikita
9f0e41b880
Merge branch 'develop' into feature/webhooks
2021-08-23 12:36:01 +03:00
9207238d8d
Merge branch 'develop' into release/1.0.0
2021-08-20 16:12:40 +03:00
b377c450a2
Merge branch 'develop' into feature/file-folder-selectors
2021-08-19 19:14:42 +03:00
bbbdc79a21
WEb: Files: Added folder tree reset.
2021-08-19 19:08:58 +03:00
6767c2ac2e
Api: release config
2021-08-19 17:36:13 +03:00
02d2f04b94
Web: Editor: Fixed renaming of documents when save as.
2021-08-19 17:23:16 +03:00
fbf82a59ca
Web: Files/Editor: Fixed folder tree for select file component.
2021-08-19 16:44:41 +03:00
258c866f73
Merge branch 'develop' into feature/file-folder-selectors
2021-08-19 15:03:01 +03:00
fc32619c9a
WEb: Editor: Deleted useless code.
2021-08-19 14:55:39 +03:00
779f52b028
Web: Editor: rewrite with loadScript
2021-08-19 13:31:17 +03:00
1bc7863168
Web: Editor: Fixed sharing settings display.
2021-08-19 11:45:03 +03:00
3b8cf0a275
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
cf87addaa3
Security: added new method
2021-08-18 17:04:16 +03:00
46a97efb52
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
2021-08-18 16:59:00 +03:00
03a030ebd0
Web: Editor: Added missing await syntactic.
2021-08-18 09:57:55 +03:00
34408c6e41
Web: Components: added style props for snackbar
2021-08-17 21:20:31 +03:00
0f2bb18bb4
Web: Editor: Deleted useless code.
2021-08-17 12:53:23 +03:00
c6ec0fbee6
Web: Editor: Refactoring.
2021-08-17 12:52:33 +03:00
e634b5c72f
Web: Editor: Fixed converting file when open in new tab.
2021-08-16 13:17:49 +03:00
92f0126e5d
Web: Editor: Added displaying tooltip with the message instead of info toastr.
2021-08-16 11:21:14 +03:00
9715719994
Merge branch 'develop' into bugfix/canShare
2021-08-16 11:07:30 +03:00
e60815b15d
Web: Refactoring and API calls optimization
2021-08-13 20:32:50 +03:00
e992b9f3e5
Web: Files: Re-written code to canShare and canEdit from Server's fileInfo
2021-08-13 19:26:37 +03:00
6e9ceea8c0
Web: Editor: Added link for insert image and mail merge.
2021-08-13 14:50:24 +03:00
922d25dcb4
WEb: Editor: Fixed sharing access (added canShare function), fixed rename function (added accessEdit function).
2021-08-12 17:38:17 +03:00
b9d242df6f
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2021-08-12 16:19:23 +03:00
fad2a178d8
Build: Added build.static.bat + change rimraf, mkdirp packages to single shx package (npm command line util)
2021-08-12 16:18:48 +03:00
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log
...
Feature/log
2021-08-12 15:00:53 +03:00
39b93080bd
Web: Editor: Added config id for editor.
2021-08-12 14:41:57 +03:00
4919b34fd0
Web: Webpack: increased performance maxEntrypointSize and maxAssetSize
2021-08-11 20:40:31 +03:00
a26e475c94
Web: fix no license warning
2021-08-11 20:39:24 +03:00
f642090c66
Web: Client: fixed
2021-08-11 10:44:00 +03:00
3f56790c85
Fix bug 51365: update avatar in header
2021-08-11 10:18:10 +03:00
999e1157d5
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# web/ASC.Web.Editor/src/Editor.jsx
2021-08-11 09:59:57 +03:00
0d10967912
Merge branch 'develop' into release/1.0.0
2021-08-10 18:48:36 +03:00
643b7b66dc
Optimization: removed autofac ILifetimeScope
2021-08-10 17:56:38 +03:00
75f659a9eb
WEb:Editor: Fixed removing current open document from recents.
2021-08-10 12:54:10 +03:00
b92b29e510
Web: Editor: Added error handler for recent folders.
2021-08-10 12:49:51 +03:00
94d1939613
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
2021-08-09 19:53:21 +03:00
a0722a17d3
Editor: Optimized getting recent
2021-08-09 19:53:13 +03:00
b04b8c7edb
Fix bug 51828: about links
2021-08-09 16:39:03 +03:00
634ea15ec2
Fix bug 51815: editor favicon
2021-08-09 16:15:17 +03:00
dfa6e97c94
Fix bug 51437: no ability to share files available for viewing
2021-08-09 15:53:54 +03:00
546c1872a3
Added asp logging
2021-08-08 16:19:54 +03:00
5ec78df6ee
Fix Bug 51547 Client.Files. "When opened for viewing, the document is opened for editing"
2021-08-06 16:26:42 +03:00
9230d4c62d
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
2021-08-05 19:11:20 +03:00
5687e6bca2
Merge branch 'develop' into release/1.0.0
2021-08-05 19:11:02 +03:00
a3fae3bc2a
Fix Bug 51695 Client.Files. ‘Firefox prevented this site from opening pop-up window’ on FF
2021-08-05 19:10:08 +03:00
88b55606bc
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-08-05 14:38:03 +03:00
3beec799e7
Web: Editor: Added action link.
2021-08-05 14:05:09 +03:00
514387652e
Web: Client: fixed about
2021-08-05 12:30:14 +03:00
89b79b8523
Web: Files/Editor: Fixed styles.
2021-08-04 12:42:59 +03:00
fbf0ee3bf0
Web: Client: added about dialog
2021-08-04 12:06:37 +03:00
a9734f78e1
Web: Client: added about content
2021-08-04 12:06:16 +03:00
98032d281c
Web: Editor: Added mail merge option.
2021-08-04 11:32:14 +03:00
d2fbca0a27
Web: Client: rewrite about page
2021-08-03 16:01:56 +03:00
fb922f04d6
Web: Client: change About translations
2021-08-03 16:01:31 +03:00
93f51a19e2
Web: Editor: Added possibility to save in folder where access is not denied.
2021-08-03 12:04:18 +03:00
e05aaf6042
Web:Editor: Added condition for footer
2021-08-03 10:09:08 +03:00
dddef0e03b
Web: Editor: Add option "Insert Image" only if user is logged in.
2021-08-02 11:05:30 +03:00
ba37ea8be6
Web: Editor: SelectFolder: Added header, refactoring, fixed height (aside view).
2021-07-30 19:23:23 +03:00
a20956e5c7
Web: Editor: Fixed styles.
2021-07-30 17:54:30 +03:00
fdefba1514
Web: Editor/Files: SelectFile: Added editor folders tree for select file component.
2021-07-30 17:50:02 +03:00
b85b2dfa52
Web: Editor/Files: SelectFile: Refactoring, the component has been extended.
2021-07-30 16:26:26 +03:00
4a0c42e97d
Web: Editor: Added translations.
2021-07-30 15:50:25 +03:00
52b1e2f741
Web: Editor: First selected folder from root is temporary commented out.
2021-07-30 15:24:59 +03:00
304df579ce
Web: Editor: Refactoring.
2021-07-30 15:16:53 +03:00
24c1b73a45
Web: Editor: Add option "Save as" only if user is logged in.
2021-07-30 15:13:10 +03:00
a7e3fd60cb
Web: Editor: Added selector folder.
2021-07-30 15:04:24 +03:00
4f593df4c4
WEb: Editor: The folder identifier of selected folder is temporary commented out.
2021-07-29 20:04:17 +03:00
9b7d74733a
Web: Editor: Added folder id and refactoring.
2021-07-29 19:41:49 +03:00
a7ba985ea0
Web: Files/Editor: Added tree folder for editor.
2021-07-29 15:52:30 +03:00
dba5275eb2
Web: Editor/Files: Component expansion for modal view, refactoring.
2021-07-29 14:35:27 +03:00
9697677ce4
Web: Editor: Added SaveAs method for selector folder component, extension select folder dialog.
2021-07-29 14:04:30 +03:00
b6258b4ff1
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withLoader.js
2021-07-28 20:15:09 +03:00
75e7ca893f
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
2021-07-28 17:19:05 +03:00
5c5235cf3a
Merge branch 'develop' into feature/editor-extention
2021-07-28 13:43:49 +03:00
cf7d002bc1
Merge branch 'develop' into feature/calendar
2021-07-28 12:16:39 +03:00
48d94b4a2d
Merge branch 'develop' into feature/editor-extention
2021-07-28 11:53:36 +03:00
ede002065c
Web:Editor: Fixed folder of creating new file.
2021-07-28 11:49:38 +03:00
ccb268caf9
Web: Editor: Added error checks.
2021-07-28 11:19:15 +03:00
2a8052bc51
Web: Editor: Fixed display by users access rights.
2021-07-28 11:02:44 +03:00
455c1cb2a3
Web: Editor: Added constants for type of document.
2021-07-27 19:05:18 +03:00
bef7cdd0b8
Web: Editor: Added possibility to add files to favorites and to delete from favorites.
2021-07-27 18:55:59 +03:00
180c0a7407
Web: Client: fixed
2021-07-27 16:09:56 +03:00
8ac333f380
WEb: Editor: Deleted share folder from recent list.
2021-07-27 16:00:30 +03:00
eddb323ff6
Web: Editor/Files: Added create new file option.
2021-07-27 15:47:08 +03:00
f1668a3b43
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
2021-07-27 12:43:01 +03:00
d24f5185f9
Web: Editor: Added rename option.
2021-07-27 10:36:21 +03:00
c6ccfbe44f
Web: Editor: Added recent files.
2021-07-27 09:51:56 +03:00
Vashchuk Nikita
8a51dee296
modified DbWorker(Lazy), Sender. Added BuildQueueService and WorkerService.cs.
2021-07-26 20:03:55 +03:00
e2d3f3195d
Merge branch 'develop' into release/1.0.0
2021-07-26 15:40:05 +03:00
538d65c724
Web: Remove query hash from remoteEntry.js
2021-07-26 14:02:10 +03:00
30b41aac42
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-07-26 12:37:01 +03:00
0f27a6c673
Merge branch 'develop' into release/1.0.0
2021-07-23 17:34:43 +03:00
675fb8de21
Web: Fix caching remoteEntry.js
2021-07-23 17:20:42 +03:00
fa500d094f
Merge branch 'develop' into release/1.0.0
2021-07-22 11:12:37 +03:00
e703927239
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-07-21 18:30:33 +03:00
13f8f5ef7d
Fix sw.js creation
2021-07-21 18:28:56 +03:00
e44040cf8a
Web: Client: fix
2021-07-21 12:57:20 +03:00
a8d4a2678a
Web: Client: added snackbar button action
2021-07-21 12:52:57 +03:00
5371b7682e
Web: Client: fixed show snackbar
2021-07-21 12:45:18 +03:00
653066af0c
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
eab97bbfed
Web: init new single sw.js creation
2021-07-20 12:32:27 +03:00
2d75554b0d
DbContext: optimization
2021-07-15 13:07:47 +03:00
e81c3df0be
Added displaying version from appsettings.json (api/2.0/settings.json)
2021-07-14 17:31:06 +03:00
1ebc588a93
Web: Bumped version to 1.0.0
2021-07-14 13:26:36 +03:00
ad57feecd8
Log: fix configuring
2021-07-13 21:17:18 +03:00
cb8d225707
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/src/store/index.js
2021-07-12 13:08:40 +03:00
d125220aa0
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
2021-07-09 18:28:24 +03:00
b4c4625f3f
Moved getting firebase config to API method /api/2.0/settings.json
2021-07-09 18:28:08 +03:00
1c24e809fc
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-07-09 17:41:07 +03:00
537fe50394
Web: Client: About: fixed logo
2021-07-09 17:40:53 +03:00
1c0e201c2c
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
2021-07-09 17:25:42 +03:00
0297620036
Fix SnackBar usage
2021-07-09 17:25:20 +03:00
d90413a436
Web: Client: Firebase: removed unused code
2021-07-09 16:32:37 +03:00
d26169adca
Web: Client: fixed header-module-title styles
2021-07-09 16:23:47 +03:00
2f12a90838
Web: Editor: refactoring
2021-07-09 10:51:26 +03:00
9a4067fa9a
Web: Editor: added SelectFolderDialog
2021-07-09 10:49:57 +03:00
Vashchuk Nikita
2dcf6b8225
Added WebhookHostedService, modified Publisher and Sender
2021-07-08 20:32:59 +03:00
ab48513c3d
Web: Editor: fixed
2021-07-08 15:12:13 +03:00
5b76c9bfc6
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
2021-07-08 14:38:45 +03:00
3556497de6
Merge branch 'develop' into feature/personal
2021-07-08 14:38:26 +03:00
14b27ab7e6
WebL EditorL fixed dialog type
2021-07-08 14:13:00 +03:00
2da9e556bd
Web: Editor: added select image dialog
2021-07-08 13:57:53 +03:00
1ebe1f1ded
Web: Client: fixed
2021-07-07 11:18:40 +03:00
db7ea5c88f
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/index.js
2021-07-06 11:38:02 +03:00
f0f0c49bb8
Web: Client: fixed campaigns logic
2021-07-05 17:59:58 +03:00
181240854f
Web: Client: get campaigns from firebase
2021-07-05 15:51:09 +03:00
a31dc583c1
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
658b7052c3
Web: Client: About: Removed useless component
2021-07-02 15:42:04 +03:00
c940aae128
Web: refactoring translation loaders
2021-07-02 12:25:36 +03:00
513ec04e33
Merge branch 'develop' into feature/translations-loaders
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/Home/Section/Header/index.js
2021-07-01 16:47:34 +03:00
bcf7ceb568
Merge branch 'develop' into feature/translations-loaders
...
# Conflicts:
# packages/asc-web-common/components/Loaders/index.js
2021-07-01 09:13:17 +03:00
c5da5a1950
Web: Client: added tReady for confirm pages
2021-06-30 18:24:29 +03:00
69889cab4c
Merge branch 'develop' into feature/privacy-rooms-page
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/constants.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:28:37 +03:00
1083fd8416
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:09:53 +03:00
2d718c33f8
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
2021-06-30 13:39:02 +03:00
8ee188346b
Api: setphone can be authorized by confirm link
2021-06-30 11:20:55 +03:00
NikolayRechkin
5060e81b5f
Calendar: core: api
2021-06-30 09:37:17 +03:00
cc1fc30b0f
Web: Client: fixed logo header position
2021-06-28 10:40:42 +03:00
99f9d27fd0
Web: Files: added checkProtocol helper, fixed toast
2021-06-27 09:31:07 +03:00
715907f114
Merge branch 'develop' into feature/privacy-rooms-page
2021-06-25 15:01:19 +03:00
fbcdba3b17
Merge branch 'develop' into feature/personal
2021-06-25 11:10:49 +03:00
bf67b5c296
Web: Files: added PrivateRoomsPage
2021-06-24 16:23:14 +03:00
d59f9a2aa2
fixed urls
2021-06-23 20:12:50 +03:00
20d1f9a738
merge from develop
2021-06-23 16:10:46 +03:00
3788bab48e
HealthCheck: fix Studio
2021-06-22 19:55:47 +03:00
282738cb13
Merge branch 'develop' into feature/personal
2021-06-22 18:44:12 +03:00
8963df11c3
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
2021-06-22 13:41:22 +03:00
b1662e7ac6
Web: Init maintenance displaying
2021-06-22 13:41:11 +03:00
741de9f2f7
Web: Files: added react-selecto library
2021-06-17 14:36:45 +03:00
6118e95028
Merge branch 'develop' into feature/personal
2021-06-17 14:25:09 +03:00
a8527e1a57
WebApi: sendsms, setphone
2021-06-16 20:46:24 +03:00
01639a56cc
RazorCompileOnBuild:false<
...
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
...
Feature/crm migrate
2021-06-16 17:02:46 +03:00
5fcbdbd7dd
added health checks
2021-06-16 16:54:36 +03:00
469678ac85
Api: fix settings
2021-06-16 13:03:41 +03:00
429f5a1ea2
Smtp: fix warning
2021-06-15 21:40:36 +03:00
65378cc089
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
Artem Tarasov
f181a491fb
Merge branch 'develop' into bugfix/fixed-styles
2021-06-11 14:56:52 +03:00
637be57e84
People: resize fix
2021-06-11 14:48:49 +03:00
bac090e180
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
7c7d548825
Merge branch 'develop' into feature/access-rights-admins
2021-06-10 11:50:49 +03:00
e257012a9a
Notify: fix
2021-06-10 11:47:58 +03:00
1d9e49b88f
Web: Client: Settings: Fixed translation keys
2021-06-10 11:31:47 +03:00
fbb480671b
Web: Client: fixed translates
2021-06-09 17:30:10 +03:00
a3c5eea477
Web: Client: deleted unused translations key
2021-06-09 17:16:37 +03:00
ff5ea3019b
Web: Client: added select all
2021-06-09 16:42:43 +03:00
026ceec20c
Web: Client: fixed
2021-06-09 16:18:06 +03:00
82fddadd6d
Web: Client: fixed tooltip color
2021-06-09 04:03:18 +03:00
4fcd83ae6d
Web: Client: fixed translate
2021-06-09 03:31:52 +03:00
20a1869cfd
Web: Client: fixed label
2021-06-09 03:10:38 +03:00
bc46acebcc
Web: Client: bringing code to common style
2021-06-09 02:57:11 +03:00
5ea562e996
Web: Client: fixed translations
2021-06-09 02:43:07 +03:00
167ca1fbb5
Web: Client: fixed loading
2021-06-09 00:39:08 +03:00
9019b36951
Web: Client: moved pages in sub-components
2021-06-09 00:33:04 +03:00
db21597f17
Web: Client: fixed access portal urls
2021-06-09 00:30:19 +03:00
3db9fde5aa
Web: Client: fixed title
2021-06-09 00:25:45 +03:00
b7ce4a35e7
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
...
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
Artem Tarasov
3db9b30e5e
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-08 17:58:29 +03:00
783bedffbb
Web: Client: deleted unused image
2021-06-08 16:06:07 +03:00
Artem Tarasov
c25fa589a9
Web: People: deleted fonts with ext .woff, added hash to font name
2021-06-08 15:26:56 +03:00
d881c48b4b
Web: Client: fixed translations
2021-06-08 15:20:03 +03:00
5f16720aba
Web: NavMenu: Was Done for tablet and mobile:
...
- hide module name
- added logo
- added short logo fro mobile
- changed width of logo
2021-06-08 13:40:59 +03:00
9c5a960d40
Web: Client: submit by numpad enter
2021-06-08 13:09:46 +03:00
655f250cdb
Web: Client: fixed accessPortal page
2021-06-08 12:08:25 +03:00
58f7a0f285
Tfa: fix
2021-06-08 11:34:14 +03:00
9d5e2ab828
Web: NavMenu: Fixed style for Headline component.
2021-06-08 10:34:27 +03:00
cc67c93479
Web: NavMenu: Hid turn on desktop.
2021-06-08 09:33:17 +03:00
b925943cb6
merge from develop
2021-06-07 17:23:25 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth
2021-06-07 11:54:06 +03:00
Artem Tarasov
6d7361ecd0
Web: People: added HOC withLoader
2021-06-07 01:09:13 +03:00
Artem Tarasov
9f21862f51
Merge branch 'develop' into bugfix/fixed-styles
2021-06-07 00:24:19 +03:00
Artem Tarasov
9a798506e0
Web: deleted unnecessary code
2021-06-06 23:43:20 +03:00
Artem Tarasov
acd4a3893c
Web: added rule to webpack.config for woff, woff2
2021-06-06 23:39:52 +03:00
5754a9b753
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-04 14:43:10 +03:00
d01ef10cc5
Web: NavMenu/PageLayout: Was done:
...
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
d465b105e7
Web: Client: NavMenu: Fixed opening "My" profile at new tab
2021-06-04 12:03:40 +03:00
a682cdd3f7
Web: Client: fixed settings tree
2021-06-03 20:25:54 +03:00
ce35405190
Web: Client: deleted duplicate key
2021-06-03 20:25:35 +03:00
43de25b62a
Merge branch 'develop' into feature/remove-unused-dep
...
# Conflicts:
# common/ASC.Data.Storage/ASC.Data.Storage.csproj
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
374f34a78e
Personal: fix login
2021-06-03 12:34:28 +03:00
f21188b5cb
Web: Client: fixed wizard culture
2021-06-03 12:22:38 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth
2021-06-02 23:57:00 +03:00
43ff5210bf
Web: Client: access portal page refactoring
2021-06-02 20:30:54 +03:00
2be10b8bd9
Settings: added personal settings
2021-06-02 19:13:47 +03:00
Artem Tarasov
d960ae6220
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2021-06-02 15:09:03 +03:00
bd299a718b
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-06-02 13:55:19 +03:00
62ac315c8d
Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring
2021-06-02 13:55:11 +03:00
Artem Tarasov
418f7161c5
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-06-02 12:22:57 +03:00
Artem Tarasov
2d8b044458
Web: fixed usage translation key "Settings" in NavMenu
2021-06-02 12:22:38 +03:00
77242ad326
Web: Client: fixed TimeZone translation
2021-06-02 11:58:41 +03:00
11640e211c
Web: Confirm : Added usage for translation key "ConfirmOwnerPortalSuccessMessage"
2021-06-02 11:33:26 +03:00
3f964a1649
Web: Fix not translated toast issue ("Successfully sent")
2021-06-02 11:12:47 +03:00
929adc773a
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-06-02 10:59:15 +03:00
908310041f
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
2021-06-02 10:59:07 +03:00
7ce24557e0
Web: Client: fixed toast translations
2021-06-02 10:58:11 +03:00
Artem Tarasov
a38195d506
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.CRM/Client/src/custom.scss
# products/ASC.Calendar/Client/src/custom.scss
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/src/custom.scss
# products/ASC.People/Client/src/custom.scss
# products/ASC.Projects/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
95dbfb8c5c
Merge branch 'develop' into feature/translations
2021-06-01 20:02:48 +03:00
23e1083be7
Web: Removed empty translations keys
2021-06-01 13:49:37 +03:00
76d8ebb459
Tests moved to separate projects.
...
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
de98856728
Web: Tests: Added new 'sk' translations;
2021-06-01 11:21:39 +03:00
8e532bc8b9
Web: Tests: Added new 'ro' translations;
2021-06-01 11:20:14 +03:00
3d62da4422
Web: Tests: Added new 'pt-BR' translations;
2021-06-01 11:19:13 +03:00
c5a5072aa7
Web: Tests: Added new 'lo' translations;
2021-06-01 11:17:19 +03:00
8eb62d8079
Web: Tests: Added new 'it' translations;
2021-06-01 11:15:24 +03:00
a0fc465678
Web: Tests: Added new 'fr' translations;
2021-06-01 11:13:50 +03:00
e3b5ac774a
Web: Tests: Added new 'de' translations;
2021-06-01 10:56:47 +03:00
7beccd192b
Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue)
2021-05-31 20:33:12 +03:00
2018820472
Merge branch 'develop' into feature/crm-migrate
2021-05-31 19:37:51 +03:00
061b4e46e7
Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue)
2021-05-31 19:11:58 +03:00
e2b9561d7b
Web: Rewritten all json translation files with sorting of properties alphabetically
2021-05-31 18:34:15 +03:00
f78742ac39
Web: Fix UselessModuleTranslationKeysTest issues
2021-05-31 17:35:25 +03:00
6b56b539c5
Web: Update EN language
2021-05-31 17:10:34 +03:00
f30b84fddf
Web: Client: fixed group buttons menu
2021-05-31 13:57:19 +03:00
570ede7bba
Merge branch 'develop' into feature/11.5.2
...
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
889c99243e
Web: Client: added translations
2021-05-31 13:05:19 +03:00
6b20b6ee4a
Web: Client: added AddAdmin button
2021-05-31 13:05:06 +03:00
8381b7da75
Merge branch 'feature/access-rights-admins' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
2021-05-31 12:57:43 +03:00
611a6a67b4
Web: Client: fixed
2021-05-31 12:53:48 +03:00
66f36bf0a6
Web: Client: added empty screen
2021-05-31 12:51:23 +03:00
Alexey Kostenko
df44f98e53
Web: Client: Fixed the number of administrators on access-rights page
2021-05-31 12:45:27 +03:00
7026b19db0
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-31 09:23:53 +03:00
Alexey Kostenko
0374ff6c5d
Web: Client: Fixed adding and removing users (with paging), set url filter when come from access-rights page
2021-05-31 09:23:24 +03:00
f0f6400563
Web: Client: commentary changes
2021-05-30 22:40:44 +03:00
Alexey Kostenko
90973fa769
Web: Client: Fixed header name on admins page, fixed value of admins on access-rights page, added filter to url on admins page
2021-05-30 19:11:16 +03:00
68d9f90faf
Web: Client: commentary changes
2021-05-30 17:27:31 +03:00
f993108d69
Web: Common: commentary changes
2021-05-30 17:26:30 +03:00
Alexey Kostenko
095b79dc31
Web: Client: Added Paging on admins page
2021-05-30 16:00:05 +03:00
74064fc76d
Merge branch 'develop' into feature/translations
2021-05-29 21:59:02 +03:00
72527ccded
Merge branch 'master' into develop
...
# Conflicts:
# lerna.json
# package.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
2021-05-29 21:57:42 +03:00
d585c0a785
Web: Bumped version to 0.1.10
2021-05-29 21:26:13 +03:00
Artem Tarasov
215c933d9e
Web: added new translation keys "ProviderNotConnected", "Mail" to "static/locale/de/Common.json"
2021-05-28 13:28:40 +03:00
12bcf816b5
Web: Client: added new translations keys
2021-05-28 12:09:10 +03:00
d0bbcb8d5a
Files: moved from 08a01422
2021-05-28 11:22:35 +03:00
527a650601
WebStudio: resources
2021-05-27 21:30:15 +03:00
bda786f844
WebStudio: moved from 08a01422
2021-05-27 20:13:24 +03:00
Alexey Kostenko
7435ee0c7b
Web: Client: Fixed pages (infinite loading, when portal has no admins)
2021-05-27 19:12:50 +03:00
Alexey Kostenko
b1cf90b591
Web: Client: Admins page - style fix (temporary solution for desktop)
2021-05-27 15:40:11 +03:00
Alexey Kostenko
4269bde116
Web: Client: Added rows loader to admins page, fixed when switching between admins - access-rights (Blank screen for a few seconds), small refactoring loader on access-rights page
2021-05-27 15:22:25 +03:00
90821d3fe1
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-27 12:15:53 +03:00
f5909cc0e0
Web: Temporary removed minimal translations lng files
2021-05-27 12:14:36 +03:00
Artem Tarasov
102f26ed3c
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-27 11:58:53 +03:00
Artem Tarasov
46d80f7b34
Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json"
2021-05-27 11:57:20 +03:00
b57da432bf
Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common.
2021-05-27 11:50:11 +03:00
Alexey Kostenko
bc5fd2aa9d
Web: Client: Added loader on access-rights page
2021-05-27 11:47:37 +03:00
7d1af40f6a
Web: Fix translation tests issues
2021-05-27 11:27:27 +03:00
25ac98e272
Merge branch 'develop' into feature/translations
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/DeleteDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
2021-05-27 11:13:41 +03:00
Alexey Kostenko
727804180b
Revert "Web: Common: Added InfiniteLoader"
...
This reverts commit 09ff37ac0f
2021-05-27 10:38:06 +03:00
Artem Tarasov
a12ab6c970
Web: moved translationKeys "Error520Text", "ErrorInitWizardHeader" to "static/locales/{lng}/Common.json"
2021-05-26 18:30:57 +03:00
Artem Tarasov
d5ddeb4c42
Web: moved translation keys "AboutCompanyVersion", "Version" to "static/locales/{lng}/Common.json"
2021-05-26 17:58:05 +03:00
d8adef733c
ASC.Files: moved from 08a01422
2021-05-26 16:54:46 +03:00
364fc6bbeb
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-26 16:40:10 +03:00
Artem Tarasov
1616b8e5e6
Web: deleted duplicated translation keys "PasswordRecoveryPlaceholder", "RegisterPlaceholder", instead of added key "RegistrationEmail"
2021-05-26 16:43:52 +03:00
541b14c8fe
Web: moved translationKeys "DisableUserButton", "NotFoundLanguage"
2021-05-26 16:40:02 +03:00
bf63128496
Web: moved translationKeys "LastName", "Language", "Mail"
2021-05-26 16:28:58 +03:00
2c5b95e352
Web: moved translationKeys "ProjectsProduct", "InviteLinkTitle", MoveConfirmationMessage"
2021-05-26 16:06:40 +03:00
252fef7ae3
Web: moved translationKeys "AboutCompanyTitle", "ClearButton", "CommunityProduct", "EmptyFieldError"
2021-05-26 14:36:58 +03:00
3c1e322406
Web: moved translationKeys "Profile", "RecoverErrorMessage"
2021-05-26 14:21:11 +03:00
49bf2618d2
Web: moved translationKeys "Enable", "ProviderLoginError", "ProviderNotConnected"
2021-05-26 13:35:11 +03:00
Artem Tarasov
1aba7c5dbe
Web: Client: Settings: fixed max-width for unselected TreeNode
2021-05-25 19:17:17 +03:00
4228b0a5dc
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-25 17:26:12 +03:00
2452ec957d
Web: Moved translationKeys "Enable" to "/static/locales/{lng}/Common.json"
2021-05-25 17:16:09 +03:00
Artem Tarasov
671f98519a
Web: Moved translation Keys "ContinuteButton" to "/static/locales/{lng}/Common.json"
2021-05-25 12:49:56 +03:00
60679a5da7
Web: Moved translationKeys "Disabled", "Close"
2021-05-25 11:43:42 +03:00
f6fbe33814
Web.Core: moved from 08a01422
2021-05-24 20:41:31 +03:00
e01af3fd20
Web: Moved translationKeys "AdminSettings" to "/static/locales/{lng}/Common.json"
2021-05-24 19:47:26 +03:00
a80890f7cc
Web: Moved translationKeys "Guest" to "/static/locales/{lng}/Common.json"
2021-05-24 19:40:26 +03:00
f94c19385f
Web: Moved translationKeys "Settings" to "/static/locales/{lng}/Common.json"
2021-05-24 19:31:41 +03:00
43e65a51d1
Web: Moved translationKeys "Next", "Previous", "PageOfTotalPage" and "CountPerPage" to "/static/locales/{lng}/Common.json"
2021-05-24 19:22:20 +03:00
b8dd8b3048
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-24 19:07:46 +03:00
1e954b15d7
Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json"
2021-05-24 19:05:29 +03:00
4e32c53567
Web: Moved translationKeys "About" to Common.json
2021-05-24 18:36:31 +03:00
b8edf32f87
Web: Moved translationKeys "User", "Warning" to Common.json
2021-05-24 17:55:14 +03:00
Alexey Kostenko
09ff37ac0f
Web: Common: Added InfiniteLoader
2021-05-24 16:24:11 +03:00
c652209b49
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-24 13:58:54 +03:00
90c67cac13
ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422
2021-05-24 13:26:13 +03:00
1b730233c9
ElasticSearch: moved from 08a01422
2021-05-23 19:11:25 +03:00
Artem Tarasov
098e04891c
Web: deleted "WhiteLabel" translation key
2021-05-22 01:31:50 +03:00
Artem Tarasov
28dc774e26
Web: Client: Settings: fixed tKey for AccessRights'
2021-05-21 18:47:08 +03:00
Artem Tarasov
11166ed85a
Web: Client: fixed usage translation keys for Settings page
2021-05-21 18:37:16 +03:00
6b7cab8236
Web: Moved translationKeys "Sending", "RecoverProcessSending", "ThirdPartyProcessSending" and "RegisterProcessSending" to "/static/locales/{lng}/Common.json"
2021-05-21 18:06:31 +03:00
4fdeec00e7
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-21 17:59:37 +03:00
e83d1d5922
Web: Moved translationKeys "DirectionAscLabel" and "DirectionDescLabel" to "/static/locales/{lng}/Common.json"
2021-05-21 17:59:28 +03:00
ae56fc0ecc
Web: fixed translation usage for keys "Alert", "Done", "Info"
2021-05-21 17:57:55 +03:00
c664e80ae8
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-21 17:39:01 +03:00
9960cef423
Web: Removed useless translations "OwnerSettings", "PortalSecurity", "ProductsAndInstruments"
2021-05-21 17:38:55 +03:00
b0bc8ec720
Web: Removed useless translations (DataManagement, DeactivationDeletionPortal, GreetingSettingsTitle, GreetingTitle, LoginHistoryNav)
2021-05-21 17:31:03 +03:00
66b30360de
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-21 17:21:16 +03:00
389ee969a2
Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json"
2021-05-21 17:19:00 +03:00
81febda210
Web: Removed useless translations "CommunityUserCapability", "CrmProduct", "CRMUserCapabilityCreate", "CRMUserCapabilityEdit"
2021-05-21 17:04:16 +03:00
d6a5041c3d
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-21 16:38:23 +03:00
facf0a01cf
Web: Moved translationKeys "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" to "/static/locales/{lng}/Common.json"
2021-05-21 16:37:46 +03:00
8e889049c2
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-21 15:03:19 +03:00
14214f2ad8
Web: Fixed translation usage for keys: "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter"
2021-05-21 15:00:30 +03:00
f825c6eabd
Web: Resolved NotFoundKeysTest issues (OkButton, LoadingLicenseSuccess, LoadingLicenseError, OrganizationName)
2021-05-21 14:58:00 +03:00
