Commit Graph

58 Commits

Author SHA1 Message Date
c74d98edb9 Web: Files: fixed arrow icon 2022-12-06 12:27:32 +03:00
bc01d0ef49 Web: Added new icon for payment page. 2022-12-05 13:38:29 +03:00
6132883419 Web: fixed mark as read icon 2022-11-23 12:10:22 +03:00
Viktor Fomin
954ccc79d6 Client: change logo 2022-11-01 15:51:42 +05:00
Viktor Fomin
2afea89545 Merge branch 'develop' into feature/whitelabel 2022-11-01 15:25:52 +05:00
Viktor Fomin
a145543f15 Client: change image 2022-10-31 18:56:28 +05:00
Elyor Djalilov
12824c1f03 Web:Client:ActiveSessions: bugfix 2022-10-31 18:27:07 +05:00
Elyor Djalilov
42471135ba Merge branch 'develop' into feature/active-sessions
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
2022-10-25 13:41:42 +05:00
TimofeyBoyko
30799fa082 Merge branch 'develop' into bugfix/files-context-menu 2022-10-24 14:09:25 +05:00
TimofeyBoyko
a8910f6d25 Web:Client: add new context option for room 'Select' 2022-10-21 13:14:43 +05:00
Elyor Djalilov
d819128bdb Web:Client:ActiveSessions: added translations 2022-10-19 18:30:22 +05:00
73fa3205e2 Web:Client:Add small icon thirdParty. 2022-10-13 14:16:27 +03:00
08379aeaa3 Web:Client:Delete small icons. 2022-10-12 17:21:42 +03:00
6d78f37729 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-11 16:05:49 +03:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
b018be53f9 Web:Client:Add reconnect image. 2022-10-10 19:11:37 +03:00
ce2618fe57 Web:Client:Add icons for tags ThirdParty. 2022-10-05 14:31:05 +03:00
ca1cd06fad Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/public/images/plus.react.svg
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/components/PrivateRoute/index.js
2022-10-04 17:13:46 +03:00
mushka
1b2dae0890 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-02 03:45:40 +03:00
mushka
af16f21d4a Merge branch 'develop' into feature/doc-space-info-panel 2022-09-26 11:00:34 +03:00
7f1d946269 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
fd2799163a Web:Client:Add personal image. 2022-09-22 15:26:13 +03:00
6f1290671d Web:Client:Moved the picture to the client section. 2022-09-22 15:24:45 +03:00
058d3acbd3 Merge branch 'develop' into feature/favorites-redesign-empty-screen 2022-09-21 18:15:08 +03:00
1dfcb5f6d8 Web:Client:Change image favorites. 2022-09-21 17:34:59 +03:00
ee42f4be3a Merge branch 'develop' into bugfix/trash-context-menu
# Conflicts:
#	packages/client/public/locales/en/Files.json
2022-09-21 17:18:42 +03:00
TimofeyBoyko
ed067146c0 Web:Client:Public: add new icon for restore all 2022-09-21 15:58:20 +03:00
91490ae7bf Merge branch 'develop' into feature/recent-redesign-empty-screen 2022-09-21 13:19:49 +03:00
ffabcea9d6
Merge branch 'develop' into feature/archived-redesign-empty-screen 2022-09-21 11:07:04 +03:00
fd72f668ba Web: added new third-party icons 2022-09-20 16:34:15 +03:00
2e44136820 Merge branch 'feature/archived-redesign-empty-screen' into feature/recent-redesign-empty-screen 2022-09-20 11:06:06 +03:00
c9a0e3195c Web: Added backup icon. 2022-09-20 10:46:41 +03:00
c3680f8a4e Web:Client:Delete unnecessary image. 2022-09-19 11:24:17 +03:00
a8111836b2 Web:Client:Add person image. 2022-09-19 11:23:32 +03:00
a077a245b5 Web:Client:Add image recent empty screen. 2022-09-19 11:23:11 +03:00
26b07766fa Web:Client:Add image folder. 2022-09-16 11:10:21 +03:00
mushka
68ba76b6bf added new no room svg 2022-09-10 00:21:22 +03:00
4d08dae9be Web:Add image empty_screen_archive. 2022-09-09 16:05:49 +03:00
7b623c4e30 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/common/store/AuthStore.js
#	packages/components/slider/index.js
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-05 10:19:52 +03:00
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +03:00
d0da69a74b
Merge branch 'develop' into feature/settings-menu 2022-08-30 12:11:59 +03:00
TimofeyBoyko
2c3dd7276d Merge branch 'develop' into feature/accounts-list 2022-08-29 18:22:45 +03:00
69ecaa8df4 Merge branch 'develop' into feature/settings-menu 2022-08-29 16:37:58 +03:00
9154b971c0 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/api/settings/index.js
#	packages/common/components/Loaders/index.js
2022-08-29 13:06:44 +03:00
TimofeyBoyko
014858d554 Web: add new images for context menu options of user 2022-08-29 12:21:52 +03:00
TimofeyBoyko
937d99249e Merge branch 'develop' into feature/accounts-list 2022-08-29 09:47:42 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
17e2d0f063 Web:Client: Added new icons for settings menu sections. 2022-08-26 16:39:24 +03:00
52a008ca61 Web: Fixed translations,icons. 2022-08-22 16:16:49 +03:00
TimofeyBoyko
545605ef16 Web: Client: add new icons for accounts group menu 2022-08-18 15:36:29 +03:00