|
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 |
|
|
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 |
|
|
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 |
|
|
c5da5a1950
|
Web: Client: added tReady for confirm pages
|
2021-06-30 18:24:29 +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 |
|
|
bf67b5c296
|
Web: Files: added PrivateRoomsPage
|
2021-06-24 16:23:14 +03:00 |
|
|
282738cb13
|
Merge branch 'develop' into feature/personal
|
2021-06-22 18:44:12 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|