Commit Graph

70 Commits

Author SHA1 Message Date
98fa906954 Web:Files:Badges: Added favorite icons to appserver /public /images. Сhanged the onClickFavorite method in HOC withBadges. Changed the display of favorite icons. 2021-12-06 22:00:50 +03:00
d9afc8ff4f Web:Files:Badges: Changed icons of the favorite, edit, lock. Changed the display of lock icons. 2021-12-05 16:37:33 +03:00
9ea13156cb Web:Files:Badges:SharedButton icon change, resize 2021-12-03 12:20:45 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
1b6c02352b Web: Fixed icons for docxf and oform file formats 2021-11-12 19:20:14 +03:00
1e1df5b5c9 Web: Fixed icons for docxf and oform file formats 2021-11-12 17:17:28 +03:00
20e59a7cbe Web: Common: changed media-viewer icons, fixed media styles 2021-11-02 17:51:44 +03:00
8cc08045b7 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +03:00
fe65632277 Web: Common: changed media-viewer icons, fixed media styles 2021-10-28 14:20:06 +03:00
93ab1e46ce Web: Fixed docxf icon container width 2021-10-26 19:54:19 +03:00
743325984b Web: Fixed docxf icon container width 2021-10-26 19:48:41 +03:00
f5d31dcff2 Web: Files: Fixed icons blur, added new icons 2021-10-26 16:55:52 +03:00
9128a3d0ff Web: Files: Added docxf and oform format icons 2021-10-26 16:55:09 +03:00
5bd9c06c1a Merge branch 'develop' into table-group-menu
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-10-22 12:20:20 +03:00
26183d14bf Web: add new pencil icon 2021-10-20 00:41:05 +03:00
f04a1a5403 Web: People: fixed table group menu, added new icons 2021-10-19 17:36:47 +03:00
0c63c41ef7 Web: Files: changed folder icons, added new icons 2021-10-18 12:24:01 +03:00
ff97e3134f Web: Components: added new icons, created GroupMenuItem component 2021-10-14 18:18:08 +03:00
e3718c3697 Merge branch 'release/1.0.0' into table-group-menu
# Conflicts:
#	packages/asc-web-components/table-container/StyledTableContainer.js
2021-10-14 13:46:11 +03:00
5005e0a6c0 Web: Icons: Fixed old checkbox icons, change header plus icon 2021-10-14 13:09:54 +03:00
2ecf75434e Web: Components: fixed TableGroupMenu styles 2021-10-13 17:44:40 +03:00
bb2cac21d7 Fix bug 51706: missing icons 2021-10-12 15:38:05 +03:00
ebcb6c93ea Web: Client: Files: Added kDrive, WebDav and Yandex clouds icons for tree menu 2021-09-30 12:13:52 +03:00
a10ad2939a Fix bug 52276: fuzzy icons 2021-09-08 10:43:57 +03:00
bd0388ea62 Web: fixed icons size 2021-08-31 19:31:59 +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
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
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
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
ea6219c787 Web: added icons 2021-07-27 13:58:05 +03:00
d84229886f Web: Components: Table: added header filtering, refactoring 2021-07-20 13:29:39 +03:00
cb8d225707 Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/src/store/index.js
2021-07-12 13:08:40 +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
ffb1e32c23 Web: Files: SelectFileDialog: Added empty container to the files list. 2021-07-02 20:53:41 +03:00
b3fd47a216 Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2021-07-02 16:42:05 +03:00
77606f11c1 Web: Files: Removed icons 24 size to the root folder. 2021-07-02 15:36:58 +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
a7d56b56f2 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner 2021-07-01 13:12:18 +03:00
44e4eceaa3 Web: moved banners images 2021-07-01 00:52:24 +03:00
29fbee557c Web: added campaigns images 2021-07-01 00:29:34 +03:00
1083fd8416 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:09:53 +03:00
Artem Tarasov
2ae591f839 Web: added svg for view 2021-06-29 15:28:44 +03:00
65378cc089 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.CRM/Client/public/index.html
#	products/ASC.Calendar/Client/public/index.html
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Mail/Client/public/index.html
#	products/ASC.People/Client/public/index.html
#	products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
e0d076a7bc Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 15:17:35 +03:00
bac090e180 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00