|
|
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 |
|
|
|
2576784207
|
Web: Common: added borderRadius prop
|
2021-06-30 12:57:05 +03:00 |
|
Artem Tarasov
|
51e17e5510
|
Web: Files: fixed reset selection when open aside
|
2021-06-30 12:55:10 +03:00 |
|
|
|
2a013c9c5c
|
Web: Common: refactoring tree menu loader
|
2021-06-30 12:54:10 +03:00 |
|
Artem Tarasov
|
4da80d3f0c
|
Web: Files: deleted unnecessary code
|
2021-06-30 10:50:06 +03:00 |
|
|
|
d163e09a1c
|
Web: Components: added isLoading prop to modal-dialog
|
2021-06-30 10:23:49 +03:00 |
|
|
|
1a3cfcbf27
|
Web: Common: added new loaders
|
2021-06-30 10:22:01 +03:00 |
|
Artem Tarasov
|
8d1be25dbc
|
Web: Component: ViewSelector: fixed styled
|
2021-06-29 22:02:12 +03:00 |
|
|
|
f327f42bf8
|
Web: Common: added filed encrypted to startUploadSession function
|
2021-06-29 17:54:24 +03:00 |
|
Artem Tarasov
|
4613940d15
|
Wb: Common: FileteInput: fixed display ViewSelector on mobile
|
2021-06-29 16:54:30 +03:00 |
|
Artem Tarasov
|
3385d367d4
|
Web: Files: refactoring
|
2021-06-29 15:48:17 +03:00 |
|
Artem Tarasov
|
0cae3990cc
|
Web: Files: added usage ViewSelector
|
2021-06-29 15:32:48 +03:00 |
|
Artem Tarasov
|
d73bb73dab
|
Web: Components: rewrited component SwitchButton to ViewSelector
|
2021-06-29 15:27:46 +03:00 |
|
