|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
