|
|
1f5554c748
|
Web: Shell: Fix bad merge
|
2021-09-15 15:56:15 +03:00 |
|
|
|
3c77982f4a
|
Fix Bug 51819 Web: Editor. Fixed openEdit
|
2021-09-15 14:52:36 +03:00 |
|
|
|
1ca554f82d
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-15 14:45:33 +03:00 |
|
|
|
8857702fcb
|
Web: Client: fix open profile
|
2021-09-15 13:59:48 +03:00 |
|
|
|
b92deb5391
|
Web: Shell: Added key to login route
|
2021-09-15 11:49:20 +03:00 |
|
|
|
03d8d560ba
|
Web: Hide internal login from personal mode
|
2021-09-14 16:44:39 +03:00 |
|
|
|
8835570193
|
Settings: added param withpassword
|
2021-09-13 15:42:09 +03:00 |
|
|
|
fe6014a440
|
Web: Update webpack to v5.52.1
|
2021-09-13 15:08:48 +03:00 |
|
|
|
6cea372119
|
Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries.
|
2021-09-13 13:48:30 +03:00 |
|
|
|
f06e3c076b
|
Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries
|
2021-09-13 12:54:59 +03:00 |
|
|
|
c7ad040293
|
Web: Sorted all "package.json" files by vscode-sort-package-json
|
2021-09-13 12:36:07 +03:00 |
|
|
|
38242e83c1
|
Web: Moved other common dependencies to sharedDependencies.js
|
2021-09-13 12:29:44 +03:00 |
|
|
|
a47c73b5ce
|
Web: Moved "mobx", "moment", prop-types" to sharedDependencies.js
|
2021-09-10 16:50:23 +03:00 |
|
|
|
956c9b3467
|
Web: Moved "react", "react-dom", "react-router", "react-router-dom", "styled-components" to sharedDependencies.js
|
2021-09-10 15:57:14 +03:00 |
|
|
|
d2f3c93c14
|
Web: Moved "@babel/runtime", "i18next", "i18next-http-backend", "react-i18next" to sharedDependencies.js
|
2021-09-10 15:15:51 +03:00 |
|
|
|
46161eef95
|
Web: Moved axios to sharedDependencies.js
|
2021-09-10 14:49:20 +03:00 |
|
|
|
f0c7a09a6c
|
Web: Moved common shared dependencies to sharedDependencies.js + moved workbox-window
|
2021-09-10 14:20:19 +03:00 |
|
|
|
4661dd4344
|
Web: Editor: Fix WARNING in shared module react-toastify
|
2021-09-10 11:37:45 +03:00 |
|
|
|
f7c46a70fa
|
Web: Updates next dev packages:
- @babel/preset-env
- css-loader
- sass
- sass-loader
- serve
- source-map-loader
- style-loader
- terser-webpack-plugin
- webpack-dev-server
+ Fixed css-loader url resolution issues
|
2021-09-10 11:30:27 +03:00 |
|
|
|
a5b320764f
|
Web: Removed useless package compression-webpack-plugin
|
2021-09-09 13:19:58 +03:00 |
|
|
|
15dab2adaa
|
Web: Updated copy-webpack-plugin package
|
2021-09-09 13:17:27 +03:00 |
|
|
|
b4661539ec
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-09 13:06:12 +03:00 |
|
|
|
5b880d5b6a
|
Web: Updated clean-webpack-plugin package
|
2021-09-09 12:58:49 +03:00 |
|
|
|
f73ffec535
|
Web: Layout: Fixed selection of scroll body for ipad.
|
2021-09-09 11:55:16 +03:00 |
|
|
|
d4bd4dcb50
|
Web: Updated webpack and it's dependencies (new v5.52.0) + moved to new webpack-dev-server v4.1.1
|
2021-09-09 11:28:52 +03:00 |
|
|
|
18718aab93
|
Web: Updated babel packages
|
2021-09-08 17:40:31 +03:00 |
|
|
|
bfb85fd05f
|
Web: Removed duplicated dependency declaration (attr-accept)
|
2021-09-08 17:17:57 +03:00 |
|
|
|
8c731a1630
|
Web: Turned off wdyr
|
2021-09-08 16:57:40 +03:00 |
|
|
|
618cf7a1ce
|
Api: fix SendJoinInviteMail
|
2021-09-08 16:28:10 +03:00 |
|
|
|
fabaaef0f9
|
Web: Updated react-toastify and extended ModuleFederationPlugin shared section
|
2021-09-08 16:28:10 +03:00 |
|
|
|
da606cb574
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-08 16:24:28 +03:00 |
|
|
|
899507000f
|
Web: fixed login route
|
2021-09-08 16:24:20 +03:00 |
|
|
|
11aa89a628
|
Web: Updated @babel/runtime and extended ModuleFederationPlugin shared section
|
2021-09-08 16:04:05 +03:00 |
|
|
|
124df88c58
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-08 15:47:02 +03:00 |
|
|
|
1501c1d91e
|
FIx Bug 52243 Client.Editor. There is no prompt message indicating that the file was saved successfully when using Save Copy As.
|
2021-09-08 15:46:52 +03:00 |
|
|
|
c41eb97a0f
|
Web: Extended ModuleFederationPlugin shared section
|
2021-09-08 15:41:11 +03:00 |
|
|
|
67eeb56f16
|
Web: Removed duplicated dependency declaration (email-addresses)
|
2021-09-08 13:54:49 +03:00 |
|
|
|
c3578df58b
|
Web: Editor: fixed document opening for desktop editors
|
2021-09-08 13:48:28 +03:00 |
|
|
|
0167083a03
|
Fixed Bug 51819 - Client.Editor. Fixed file conversion
|
2021-09-08 12:32:03 +03:00 |
|
|
|
d66e8a4046
|
Web: Files: fixed drag files
|
2021-09-08 11:36:43 +03:00 |
|
|
|
c0cd0ea269
|
fix Bug 51444
|
2021-09-07 22:42:31 +03:00 |
|
|
|
7684723dd1
|
Web: Fixed scroll for mobile layout.
|
2021-09-07 14:22:00 +03:00 |
|
|
|
a30f75b0b4
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-07 11:38:30 +03:00 |
|
|
|
009a801be7
|
Web: Personal: fixed redirect to login
|
2021-09-07 11:38:24 +03:00 |
|
|
|
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 |
|
