|
|
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 |
|
|
|
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 |
|
|
|
b195036cd0
|
Web: People: added withLoader HOC to Section Header
|
2021-07-01 16:43:42 +03:00 |
|
|
|
a1f5596f9c
|
Merge pull request #292 from ONLYOFFICE/feature/privacy-rooms-page
Feature/privacy rooms page
|
2021-07-01 16:32:34 +03:00 |
|
|
|
13acc5f511
|
Web: Files: added banner store
|
2021-07-01 15:53:28 +03:00 |
|
|
|
abfcba8993
|
Web: People: added withLoader HOC to MainButton
|
2021-07-01 15:48:26 +03:00 |
|
|
|
6fa5368336
|
Web: Components: fixed banner sub-header line height
|
2021-07-01 15:18:02 +03:00 |
|
|
|
8776c45895
|
Web: Files: fixed ThirdPartyList width
|
2021-07-01 14:37:09 +03:00 |
|
|
|
bca3f0f3d8
|
Web: Components: fixed banner width for tablet
|
2021-07-01 14:36:48 +03:00 |
|
|
|
57550164ed
|
Web: Files: fixed banner visibility
|
2021-07-01 13:46:44 +03:00 |
|
|
|
79c7a461d7
|
Web: Components: fixed banner width
|
2021-07-01 13:46:18 +03:00 |
|
|
|
50d9d9113f
|
Web: Files: fixed files selection
|
2021-07-01 13:15:10 +03:00 |
|
|
|
a7d56b56f2
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
|
2021-07-01 13:12:18 +03:00 |
|
|
|
5a07094755
|
Web: Files: added banner loader
|
2021-07-01 13:10:45 +03:00 |
|
|
|
7b3f411605
|
Web: Files: fixed scroll
|
2021-07-01 12:50:01 +03:00 |
|
|
|
cfeeb6c17b
|
Web: Files: fixed privacy icons styles
|
2021-07-01 12:35:06 +03:00 |
|
|
|
a489e73245
|
Web: Components: fixed banner styles
|
2021-07-01 12:23:20 +03:00 |
|
|
|
e2adbff10f
|
Web: Components: fixed banner styles
|
2021-07-01 11:52:56 +03:00 |
|
