|
28c0dced54
|
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 18:50:04 +03:00 |
|
|
fccdd5f97a
|
Web: Files: fixed translations
|
2021-07-09 18:49:57 +03:00 |
|
|
d8612e2e01
|
Hide Privacy Rooms on personal
|
2021-07-09 18:41:07 +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 |
|
|
ee544dcde5
|
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 17:02:01 +03:00 |
|
|
d14655900c
|
Web: Files: fixed
|
2021-07-09 17:01:48 +03:00 |
|
|
d90413a436
|
Web: Client: Firebase: removed unused code
|
2021-07-09 16:32:37 +03:00 |
|
|
5cea2de9f6
|
Merge branch 'develop' into feature/personal
|
2021-07-09 16:29:14 +03:00 |
|
|
d26169adca
|
Web: Client: fixed header-module-title styles
|
2021-07-09 16:23:47 +03:00 |
|
Sergey Kirichenko
|
9546e04e44
|
Add cache control in the backend proxy (#299)
* Modify cache control in the proxy
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Add expires conf
* Del swp file
|
2021-07-09 16:16:15 +03:00 |
|
|
4cd1b3fa75
|
Web: People: Applied prettier style fix
|
2021-07-09 16:15:13 +03:00 |
|
|
dde99b792a
|
Web: Files: Applied prettier style fix
|
2021-07-09 16:13:50 +03:00 |
|
|
e0b37cfd1b
|
Fix Cancel click on edit profile on personal
|
2021-07-09 15:30:32 +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 |
|
|
1f76d64048
|
Merge pull request #296 from ONLYOFFICE/bugfix/v1.0.0
Bugfix/v1.0.0
|
2021-07-08 14:36:12 +03:00 |
|
|
84fa1f8eb3
|
Web: Common: fixed height
|
2021-07-08 13:59:48 +03:00 |
|
|
523fb66248
|
Web: Common: fixed buttons height
|
2021-07-07 13:20:16 +03:00 |
|
|
2e2f121d26
|
Web: Common: disabled hover
|
2021-07-07 12:47:01 +03:00 |
|
|
1ebe1f1ded
|
Web: Client: fixed
|
2021-07-07 11:18:40 +03:00 |
|
|
04173a1426
|
Web: Common: fixed
|
2021-07-07 11:05:18 +03:00 |
|
|
a9ed86fee7
|
Web: Common: open selector on button
|
2021-07-06 17:37:07 +03:00 |
|
|
fed1ece277
|
Web: Files: fixed display of share menu
|
2021-07-06 17:07:56 +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 |
|
|
77b5a5a440
|
Web: Common: fixed load translate rules for campaigns
|
2021-07-05 20:47:49 +03:00 |
|
|
49db5f5348
|
Web: Files: fixed campaigns logic
|
2021-07-05 18:00:15 +03:00 |
|
|
f0f0c49bb8
|
Web: Client: fixed campaigns logic
|
2021-07-05 17:59:58 +03:00 |
|
|
2413daa175
|
Web: Files: get campaigns from firebase
|
2021-07-05 15:51:56 +03:00 |
|
|
181240854f
|
Web: Client: get campaigns from firebase
|
2021-07-05 15:51:09 +03:00 |
|
|
57b485906c
|
Web: Components: fixed banner margin
|
2021-07-02 18:08:04 +03:00 |
|
|
8811bf1d1f
|
Web: Files: fixed ThirdPartyList width
|
2021-07-02 18:02:56 +03:00 |
|
|
71608b1a1b
|
Web: Files: show banner only for personal
|
2021-07-02 16:42:43 +03:00 |
|
|
b3fd47a216
|
Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-07-02 16:42:05 +03:00 |
|
|
dfaaf254e4
|
Web: Files: consecutive ads
|
2021-07-02 16:39:10 +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 |
|
|
da924cc3b3
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-07-02 16:12:06 +03:00 |
|
|
5a16c5a6ff
|
Merge pull request #294 from ONLYOFFICE/feature/translations-loaders
Feature/translations loaders
|
2021-07-02 16:00:15 +03:00 |
|
|
658b7052c3
|
Web: Client: About: Removed useless component
|
2021-07-02 15:42:04 +03:00 |
|
Artem Tarasov
|
8abb14c9c5
|
Merge branch 'feature/translations-loaders' of github.com:ONLYOFFICE/AppServer into feature/translations-loaders
|
2021-07-02 14:55:01 +03:00 |
|
Artem Tarasov
|
88ca0fb0af
|
Web: Files: fixed selection
|
2021-07-02 14:54:12 +03:00 |
|
|
2a44887b22
|
Web: hid temp loaders
|
2021-07-02 14:28:11 +03:00 |
|
|
45920f7535
|
Web: fixed MainButton loader
|
2021-07-02 14:05:38 +03:00 |
|
|
4f9e03212f
|
Web: Files: added filter cleaning
|
2021-07-02 13:44:58 +03:00 |
|
|
81f93c3640
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
|
2021-07-02 13:22:40 +03:00 |
|
|
749728d085
|
Web: Components: fixed banner width
|
2021-07-02 13:21:54 +03:00 |
|