Commit Graph

221 Commits

Author SHA1 Message Date
216a6480c8 Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/common/constants/index.js
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	yarn.lock
2023-02-22 15:50:55 +03:00
7fcdf899cf Web: Notifications: Changed styles to match layouts. 2023-02-22 15:07:34 +03:00
Mushka Nikita
629effb5d2 added trash erasure warning 2023-02-14 03:23:06 +03:00
Viktor Fomin
358f9ea1d3 Merge branch 'develop' into bugifx/wizard 2023-02-08 12:48:55 +03:00
ca2906ebee Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/store/FilesStore.js
2023-02-08 12:44:15 +03:00
17a6d8785f Web: Correcting the absence of the background of the button when isChecked in the storybook. 2023-02-08 10:34:02 +03:00
d8c1bf08f9 Web: Added room check for notifications disabled. 2023-02-07 13:34:52 +03:00
Viktor Fomin
075374c43a Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-06 13:52:41 +03:00
fac357c357 Web:Components:Adding Animation. 2023-02-06 11:32:19 +03:00
Viktor Fomin
af1c429b16 Components: Themes: fix 2023-02-03 17:25:13 +03:00
Timofey Boyko
baa30e0305 Web:Common/Client/Components: add PUBLIC_DIR alias 2023-01-27 17:08:30 +03:00
5343ad2c23 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-27 15:01:35 +03:00
7db5e5f353 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-27 12:11:11 +03:00
Viktor Fomin
e9946006e6 Components: Themes: fix text input padding 2023-01-26 18:25:15 +03:00
addfd7dad0 Web: PreparationPortal: Fixed text color. 2023-01-26 14:33:16 +03:00
552c046514 Web: PreparationPortal: Fixed styles. 2023-01-26 14:16:50 +03:00
Viktor Fomin
9d58b079cb Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-25 13:03:30 +03:00
Viktor Fomin
cdb4f5394e Components: Themes: add colors 2023-01-25 12:55:26 +03:00
Akmal Isomadinov
2dd7ffe703 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-25 14:05:01 +05:00
Akmal Isomadinov
6ca51c697e Web: Change text download report button, Added download report description and added loader for download report button 2023-01-25 14:04:38 +05:00
Viktor Fomin
9c70c86471 Components: Themes: add colors 2023-01-22 01:14:14 +03:00
Timofey Boyko
901de648d6 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-19 16:17:02 +03:00
Timofey Boyko
f20a1db341 Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned 2023-01-19 16:15:19 +03:00
Mushka Nikita
ad7b2f614d Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-01-19 16:04:52 +03:00
Mushka Nikita
812751f2a7 added new colors for InfoPanel/Details 2023-01-19 16:03:59 +03:00
050f7fffe6 Web: Components: ErrorContainer: Added new element. 2023-01-19 14:29:16 +03:00
Timofey Boyko
6b8afcaa33 Web: add import svg with url 2023-01-11 18:08:01 +03:00
Timofey Boyko
c9c523261f Fixed Bug 60407 - Files. The button for calling the sort menu settings does not work when opening the information panel. 2023-01-09 10:09:37 +03:00
577cd224c7 Web: Client: ItemIcon: Added outline styles 2022-12-20 11:41:41 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
e3acab3758 Web: Components: ComboBox: Corrected styles according to UI Kit 2022-12-12 11:00:50 +03:00
Akmal Isomadinov
7bf73d427d Web: Fixed component DownloadDialog and Add styled component LinkWithDropdown 2022-12-09 18:49:53 +05:00
Timofey Boyko
05422bf331 Web:Components:Combobox: fix background colors for modern view 2022-12-08 19:51:33 +03:00
Timofey Boyko
8abbb0f250 Web:Common:Article: fix show text button color 2022-12-08 16:24:34 +03:00
Akmal Isomadinov
1228ff5026 Web:Client:Components: Fixed empty container 2022-12-08 11:43:18 +05:00
Akmal Isomadinov
67a994171d Web:Components:Empty-Screen-Container Fixed description color 2022-12-07 17:32:52 +05:00
Akmal Isomadinov
af37879c18 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 16:13:47 +05:00
Akmal Isomadinov
d8fc76e789 Web:Components:Selector-Add-Button Fixed the color theme 2022-12-07 16:13:36 +05:00
Elyor Djalilov
a687cd3152 fix color 2022-12-07 13:57:22 +05:00
Elyor Djalilov
6cd251efe0 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 13:48:11 +05:00
Elyor Djalilov
56eff4a55b fix color 2022-12-07 13:47:58 +05:00
35f694e722 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 11:39:50 +03:00
918bd1cc0b Web: Added color for filter tags on hover, change color for dark theme. 2022-12-07 11:38:26 +03:00
Viktor Fomin
eb37008dd4 Components: Themes: add colors 2022-12-07 11:38:09 +03:00
Viktor Fomin
cb42aeef3c Components: Themes: add colors 2022-12-06 18:41:54 +03:00
fa863d3055 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-06 17:29:26 +03:00
a976c1523a Web: Components: Scroll: fixed theme colors 2022-12-06 17:29:20 +03:00
Viktor Fomin
89ef1ab18b Components: Themes: fix colors 2022-12-06 16:55:21 +03:00
eac08833bb Web: PortalSettings: Restore: Fixed text color. 2022-12-06 16:33:10 +03:00
Viktor Fomin
49bb0be1de Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-06 14:05:06 +03:00