Commit Graph

30 Commits

Author SHA1 Message Date
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
Artem Tarasov
30adb42aaa Web: Files: added new icons for folder 24x24 2020-11-05 17:22:45 +03:00
Vladislav Makhov
5441db9b76 Add private room empty screen container 2020-10-23 15:31:10 +03:00
352c04fd5f
Merge branch 'develop' into feature/files-recent 2020-10-20 19:14:43 +03:00
Vladislav Makhov
967a01061a Merge branch 'develop' into feature/files-recent
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	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/store/files/selectors.js
#	web/ASC.Web.Common/src/api/files/index.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-10-20 09:23:58 +03:00
05a6034b05
Merge branch 'develop' into feature/people-filter-empty-screen 2020-10-19 20:53:59 +03:00
TatianaLopaeva
14af00ffd7 Web: Added styles and changed images by layout 2020-10-16 16:21:33 +03:00
TatianaLopaeva
4b81c0adfd Web: Files: Added images by layout 2020-10-12 16:15:35 +03:00
Vladislav Makhov
e7fc2fef13 Add Recent to the tree node. 2020-10-07 14:26:08 +03:00
Vladislav Makhov
5309d8ecf6 Add Favorites empty screen picture 2020-09-29 13:34:59 +03:00
Alexey
c6fa5aecef Web: Files: fixed tile styles 2020-07-10 10:35:36 +03:00
5121869447 Web: Files: added convert dialog 2020-07-07 10:26:28 +03:00
9d1708e198 Web: Files: added empty screen containers to root folders and filter 2020-04-14 13:33:52 +03:00
Ilya Oleshko
ed382f7d7d Web: Files: Home: Fixed format icon name 2020-04-10 14:57:20 +03:00
Ilya Oleshko
3c5107d802 Web: Files: Home: Added file and folder format icons (24, 32, 64, 96). Added type selectors for file and folders 2020-04-10 13:31:14 +03:00
e25abf6f9d Web: Files: added empty folder container, added new images 2020-02-28 13:55:27 +03:00
044147baa4 web: files: Added nav.log svgs 2020-02-26 11:02:55 +03:00
7942dbadf8 web: files: Added Module images 2020-02-25 11:13:08 +03:00
4ca24f0077 Files: Init Files.Client 2020-02-25 09:58:09 +03:00