Commit Graph

341 Commits

Author SHA1 Message Date
9062431197 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-25 17:02:18 +03:00
2e5f2cb7a6 Web: Components: Themes: fix padding 2022-07-23 01:39:54 +03:00
44c65ee52c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
#	web/ASC.Web.Client/src/store/index.js
2022-07-22 19:04:35 +03:00
6dcac0eb0d Web: Components: Themes: fix color 2022-07-22 18:04:54 +03:00
4ce9acce3d Merge branch 'develop' into feature/sso
# Conflicts:
#	products/ASC.Files/Server/DocStore
2022-07-22 17:23:36 +03:00
75042eedf0 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	packages/asc-web-common/components/Article/styled-article.js
2022-07-20 10:00:32 +03:00
TimofeyBoyko
0782af817f Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 08:36:31 +03:00
9e68c29d4f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
2022-07-19 21:22:18 +03:00
81aa52e074 Web: Components: Themes: fix menu header colors 2022-07-18 16:31:40 +03:00
afd5bc40f1 Web: Components: add theme 2022-07-18 16:00:14 +03:00
fd6f4bc6e4 Web: Components: Themes: fix header background 2022-07-15 14:01:02 +03:00
mushka
1b895976f5 fixed DownloadAs panel 2022-07-14 17:26:21 +03:00
TimofeyBoyko
09122918f6 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-12 16:19:00 +03:00
72b00ffe94 Merge branch 'develop' into feature/modal-redesign 2022-07-12 14:24:11 +03:00
mushka
45f2e63836 changed ConnectCloud dark theme and fixed ConsumerModalDialolg 2022-07-12 14:19:04 +03:00
404e014a59 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	products/ASC.Files/Client/src/Files.jsx
2022-07-12 14:18:29 +03:00
59121d0ced Web: Components: add base avatar size 2022-07-12 11:02:00 +03:00
412bc21104 Web: Components: Themes: add upload button theme 2022-07-08 13:42:28 +03:00
TimofeyBoyko
c8feb7899b Merge branch 'develop' into feature/virtual-rooms-page 2022-07-08 12:32:26 +03:00
0da612710d Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-07 19:39:12 +03:00
mushka
89dd7ab365 fixed translations, styles and dark theme for ConnectCloud 2022-07-07 19:25:31 +03:00
e5f56f6855 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-07 18:12:26 +03:00
mushka
58aa87ff19 fixed Article CloseBtn and Header offset 2022-07-05 13:53:43 +03:00
mushka
9f002e3249 Merge branch 'release/v1.2' into feature/modal-redesign 2022-07-05 12:17:58 +03:00
d81f33e6de Fix Bug 57753: too dark final version badge 2022-07-04 18:37:45 +03:00
mushka
24c0397ef0 fixed DeleteProfileEver and DeleteUsersDialog + fixed ModalDialogComponent 2022-07-04 13:20:18 +03:00
31fbe6f058 Bug 57777 - Docs: Paging buttons text moved upper common buttons line 2022-07-03 16:25:41 +03:00
b54e47a10e Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-01 13:37:47 +03:00
TimofeyBoyko
3e07ef1efc Merge branch 'develop' into feature/virtual-rooms-page 2022-07-01 10:09:47 +03:00
e891f8b6d6 Fixed Bug 57880: Added theme support for download dialog. 2022-06-30 13:14:31 +03:00
8624e75c30 Fix Bug 57875: white row when create file 2022-06-30 11:13:58 +03:00
21f8cb54a1 Fixed Bug 57842: Components: Added a different svg color for the dark theme. 2022-06-29 16:16:51 +03:00
2307f22b33 Web: Components: Themes: Fixed default lineHeight for DropDownItem icon component 2022-06-28 15:38:21 +03:00
f0f4e13633 Fix Bug 57771 - The text color of the hotkeys on the Hotkeys page is not adapted to the dark theme 2022-06-24 18:39:33 +03:00
d445b9e05d Fix Bug 57753 - badge Revision is not visible clearly on dark theme 2022-06-24 10:44:53 +03:00
TimofeyBoyko
581a8c1148 Web:Components:CatalogItem: change style for docspace 2022-06-22 14:09:04 +03:00
35a7663598 Web: Components: add themes 2022-06-21 12:29:04 +03:00
mushka
d4cfd235fc merge with release 2022-06-20 11:25:28 +03:00
5aa615f315 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-06-09 12:01:36 +03:00
mushka
3fd0fc39f9 added dark theme to new Icon avatar 2022-06-09 11:53:49 +03:00
d77b0b6b32 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/security-settings
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/trustedMail.js
2022-06-08 17:53:49 +03:00
mushka
2463e3cfc3 updated Avatar component for it to also display provided SVGs and filled its Storybook 2022-06-08 17:37:58 +03:00
c534db530c Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages 2022-06-07 13:40:14 +03:00
e594cdaf4d Web: Files/Components: Fixed dark theme of files icons for selection folder dialog. 2022-06-03 12:53:12 +03:00
d221e4dca2 Web: Files/Components: Added restriction on moving a folder into itself 2022-06-03 11:37:30 +03:00
1de68d0247 Web: Fixed dark theme for backup module. 2022-06-01 14:43:43 +03:00
mushka
5ad2231fc3 Merge branch 'release/v1.2' into feature/modal-redesign 2022-05-27 15:24:29 +03:00
cd802863f6 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
# Conflicts:
#	packages/asc-web-common/store/SettingsStore.js
2022-05-22 21:21:28 +03:00
e4736c399f Web: Components: Themes: fix gradient 2022-05-20 14:16:20 +03:00
218d699e99 Web: Components: Themes: Fixed width for catalog item badge for tablet devices 2022-05-20 12:18:58 +03:00