Commit Graph

68 Commits

Author SHA1 Message Date
17c7a3b0eb Web: Files: Fixed editing form badge. Fixed icon. 2021-12-02 15:32:30 +03:00
4af7032a9a Web: Files: Added blank actions for form file. Added form action icons. Added en translation key`s for action buttons. 2021-11-16 16:40:27 +03:00
5005e0a6c0 Web: Icons: Fixed old checkbox icons, change header plus icon 2021-10-14 13:09:54 +03:00
73c6409b83 Web: Client: Files: Added "en" Yandex disk icon 2021-09-30 17:52:43 +03:00
0d3b9bb7b7 Web: Files: add custom cursor 2021-09-16 15:16:14 +03:00
4c8449b48e Web: Files: fixed folders icons 2021-08-28 16:07:36 +03:00
2e46034ab0 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-27 20:45:31 +03:00
28393c90f6 Web: moved file icons 2021-08-27 20:44:50 +03:00
ccd7532161 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-27 17:45:52 +03:00
ff7f3926ce Merge branch 'develop' into feature/table-view
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	public/locales/de/Common.json
#	public/locales/it/Common.json
#	public/locales/lo/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/ro/Common.json
2021-08-26 16:05:15 +03:00
c66268a9c2 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/helpers/utils.js
2021-08-26 13:49:25 +03:00
8e0320460c Web: Fixed after merge. 2021-08-19 10:40:40 +03:00
3b8cf0a275 Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/utils.js
#	web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
4683899262 Fix bug 51706: missing icons 2021-08-18 13:51:48 +03:00
f5e9e17e11 Merge branch 'develop' into feature/table-view
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-16 10:53:48 +03:00
15b46ca366 Fix bug 51706: missing icons 2021-08-10 13:19:44 +03:00
a2c1a30d18 Web: Files: added missing icons 2021-08-06 11:14:04 +03:00
bd2a5070a2 Web: Components: fixed checkbox onChange event 2021-07-29 18:13:57 +03:00
5ed5adbb9b Web: Components: Table: added settings, fixed table group menu header 2021-07-19 14:09:09 +03:00
9906380a96 Web: Files: Return folder icon to the files module. 2021-07-08 16:22:32 +03:00
57bba777dc Web: Files: Removed icons (32, 64, 96 sizes) to the root folder. 2021-07-08 14:08:44 +03:00
b1029b7e9e Web: Files: Fixed icon path, deleted icon from files module. 2021-07-07 17:33:12 +03:00
87c556ec85 Web: Files: Deleted icons 24px size. 2021-07-02 16:16:52 +03:00
0d4159a907 Web: Files: Removed icon to common folder. 2021-07-01 19:18:24 +03:00
15a268f83b Web: Settings: Removed icons to common folder. 2021-07-01 13:38:24 +03:00
d5ff576188 Web: Files: Store: Added mark read action, added remove from list and mark read icons 2021-05-19 13:54:45 +03:00
TatianaLopaeva
5ccb86abeb Web: Editor/Files: Refactoring & Moved icon to the common folder for icons. 2021-03-28 21:38:48 +03:00
TatianaLopaeva
7777d05515 Web: Editor/Files: Added full list of access rights for SharingPanel to Editor. 2021-03-26 17:18:43 +03:00
TatianaLopaeva
f27c38e2d9 Web: Moved icons from files to common folder. 2021-03-26 14:45:29 +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
b4fa1b2bb1 Web: Files: fixed icons imports, fixed components imports, fixed files module 2021-02-25 17:20:06 +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
8226d9185c Merge branch 'develop' into feature/not-implemented-page 2021-01-29 12:38:22 +03:00
Ilya Oleshko
e486a7919a Web: Fixed modules icons 2021-01-25 14:28:51 +03:00
Viktor Fomin
02974a973b Web: Files: fixed icon name typo 2021-01-22 11:22:43 +03:00
c7c9225923 Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2021-01-11 12:37:31 +03:00
b88d418d41 Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Settings/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-12-25 15:27:44 +03:00
Vladislav Makhov
79989f7bf4 Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	web/ASC.Web.Common/src/store/auth/actions.js
2020-12-24 10:21:02 +03:00
Ilya Oleshko
7b671162b0 Web: Files : Added webm icon 2020-12-21 20:16:54 +03:00
Vladislav Makhov
fb465b3e05 Add security icon 2020-12-08 13:54:30 +03:00
Ilya Oleshko
9e28ae23f0 Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2020-11-12 14:46:29 +03:00
Ilya Oleshko
385f8002c1 Web: Files : Added new folders icons 2020-11-12 14:46:20 +03:00
73268462cb Web: Files: added service icons 2020-11-12 11:25:48 +03:00
Ilya Oleshko
8a462c1e7a Merge branch 'develop' into feature/thirdparty-integrations 2020-11-10 17:07:00 +03:00
Artem Tarasov
57ca2d2603 Web: Files/Components: fixed viewBox for folder.svg, fixed margin between checkbox and icon of file 2020-11-09 18:33:45 +03:00
8aad3dbc6f Web: Files: added new icons 2020-11-06 12:08:29 +03:00