Commit Graph

707 Commits

Author SHA1 Message Date
514aadfc13 Web: Components: fixed color props 2021-07-20 11:27:07 +03:00
a3b20c12dc Web: Components: added color props 2021-07-20 11:07:41 +03:00
f645d6acc0 Web: Components: added background image props 2021-07-20 06:51:29 +03:00
624b0703c9 Web: Components: fixed color 2021-07-15 09:56:09 +03:00
d7b5f504ed Web: Components: added btnText props 2021-07-15 09:55:21 +03:00
29866d73ac Web: Components: deleted unused 2021-07-14 17:13:16 +03:00
728b6d359d Web: Components: replaced snackbar 2021-07-14 17:12:13 +03:00
a3592ca94d Web: Common: added snackbar 2021-07-13 14:36:27 +03:00
4295ec2ecc Web: Components: Snackbar: Fixed mobile and small tablet margin 2021-07-09 19:21:34 +03:00
3cfc3bd924 Web: Components: Snackbar: Fixed mobile margin 2021-07-09 19:10:34 +03:00
b4c4625f3f Moved getting firebase config to API method /api/2.0/settings.json 2021-07-09 18:28:08 +03:00
0297620036 Fix SnackBar usage 2021-07-09 17:25:20 +03:00
3556497de6 Merge branch 'develop' into feature/personal 2021-07-08 14:38:26 +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
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
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
57b485906c Web: Components: fixed banner margin 2021-07-02 18:08:04 +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
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
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
6fa5368336 Web: Components: fixed banner sub-header line height 2021-07-01 15:18:02 +03:00
bca3f0f3d8 Web: Components: fixed banner width for tablet 2021-07-01 14:36:48 +03:00
79c7a461d7 Web: Components: fixed banner width 2021-07-01 13:46:18 +03:00
a7d56b56f2 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner 2021-07-01 13:12:18 +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
a4929bbdd4 Web: Components: fixed banner style 2021-07-01 11:23:39 +03:00
fe1a787d1b Web: Components: disabled hover button in banner 2021-07-01 10:51:47 +03:00
19c9f88d6a Web: Common: added locales path 2021-07-01 10:40:37 +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
348a0577e7 Web: Components: fixed banner 2021-07-01 00:50:15 +03:00
0d3f441fd5 Web: Components: added body link for banner 2021-07-01 00:28:58 +03:00
6fe51a936e Web: Components: added campaigns banner test 2021-06-30 18:35:25 +03:00
1edb2662f1 Web: Components: added campaigns banner storybook 2021-06-30 18:31:44 +03:00
be88eae6bf Web: Components: added campaigns banner 2021-06-30 18:10:16 +03:00
c93a4eda8e Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
2021-06-30 17:20:54 +03:00
Artem Tarasov
ef25c07ddc Web: Common: FilterInput: fixed transfer viewSettings 2021-06-30 17:05:11 +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
dae7215376 Web: Common: fixed article max width 2021-06-30 13:57:48 +03:00
567d3b46ed Web: Common: fixed button height on mobile 2021-06-30 13:49:33 +03:00
0a82baea4c WebL Common: fixed article max width 2021-06-30 13:38:53 +03:00