Commit Graph

7391 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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