Commit Graph

34 Commits

Author SHA1 Message Date
96775f7a0a fix for eb896018d4 2b19ec7997 2022-06-23 15:43:22 +03:00
eb896018d4 whitelabel 2022-06-20 14:09:47 +03:00
3c077c023d Web:Replaced light_small_general and dark_general logotypes with doc_space for WhiteLabel. 2022-06-14 10:31:11 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
Timofey
cbb18e87d2 Web:Client: change logo in dark theme for about page 2022-02-08 18:31:55 +08:00
41681d0c94 Server: Files: Configuration: Fixed logo type for filling form mode 2021-12-09 12:45:52 +03:00
1c38f29440 Web: Added new logo files and setup is_retina cookie for better icons inside Editor on retina resolution 2021-10-13 15:19:31 +03:00
c0cd0ea269 fix Bug 51444 2021-09-07 22:42:31 +03:00
514387652e Web: Client: fixed about 2021-08-05 12:30:14 +03:00
537fe50394 Web: Client: About: fixed logo 2021-07-09 17:40:53 +03:00
d568693154 Big Fix commit:
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
TatianaLopaeva
5412f7b860 Web: NavMenu: Fixed icon path, deleted useless icons from modules. 2021-03-05 11:09:23 +03:00
TatianaLopaeva
e81d2c8bb7 Web: Common: Fixed logoUrl. 2021-03-05 11:01:49 +03:00
507fadff55 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
#	packages/asc-web-common/src/store/auth/selectors.js
#	packages/asc-web-components/src/components/icons/svg/index.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	yarn.lock
2021-02-24 10:57:03 +03:00
TatianaLopaeva
5fdb5c8508 Web: Fix not displaing of icons. 2021-02-20 18:25:46 +03:00
TatianaLopaeva
7023cf5f3a Web: Transferring icons from a shared folder to modules. Icons are displayed by url. 2021-02-20 11:46:32 +03:00
Ilya Oleshko
e486a7919a Web: Fixed modules icons 2021-01-25 14:28:51 +03:00
52798af66e Notification images 2020-12-18 16:12:48 +03:00
Vladislav Makhov
1e483de4ba Merge branch 'develop' into feature/third-party-settings
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
#	web/ASC.Web.Client/src/store/settings/actions.js
#	web/ASC.Web.Client/src/store/settings/reducer.js
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-03 15:29:09 +03:00
TatianaLopaeva
5d01d660a5 Return lock.png 2020-09-24 13:05:17 +03:00
TatianaLopaeva
59716a184b Deleted png images 2020-09-24 12:14:56 +03:00
TatianaLopaeva
6021ea4a76 Deleted png images 2020-09-24 12:01:08 +03:00
Vladislav Makhov
31f28acf88 Fix logos 2020-09-08 10:21:49 +03:00
TatianaLopaeva
792f2368ce Changed images and rename them 2020-08-28 10:33:59 +03:00
TatianaLopaeva
9fff932736 Changed App and images from png into svg, added action and reducer for payments 2020-08-28 10:26:39 +03:00
TatianaLopaeva
fecb7383dd added styled for desktop 2020-08-18 08:49:35 +03:00
Tatiana Lopaeva
271bfc1eb8 added payments 2020-08-17 12:20:24 +03:00
Artem Tarasov
36f11ff673 Created page Wizard 2020-06-19 16:47:41 +03:00
35ee20c957 Web: Client: added logo icons 2020-02-14 16:05:32 +03:00
Ilya Oleshko
e99d1acc3c Web: Common: Layout: Added use of icons from module 2020-02-12 16:18:23 +03:00
effad5439c web: Added dummy Documents product 2020-01-27 14:07:02 +03:00
Daniil Senkiv
5c61500118 Web.Client: Settings: added WhiteLabel page with getting logo urls, sizes, text for logo; added function for generating (drawing) logo 2019-11-13 12:22:50 +03:00
4da674ab75 web: People: Added people.svg 2019-08-05 18:24:34 +03:00
d24a08b16f Moved Studio->ClientApp to separated ASC.Web.Client folder 2019-07-09 14:51:18 +03:00