Commit Graph

53 Commits

Author SHA1 Message Date
c666520c74 Merge branch 'develop' into feature/thirdparty-integrations 2020-11-17 12:04:33 +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
Viktor Fomin
97d9d58a29 Web: Files: added header loader 2020-11-12 13:30:54 +03:00
73268462cb Web: Files: added service icons 2020-11-12 11:25:48 +03:00
Viktor Fomin
0852dd0814 Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-10 18:25:25 +03:00
Viktor Fomin
237084a749 Web: Files: fix first loader 2020-11-10 18:20:42 +03:00
Viktor Fomin
df4c89cb91
Merge branch 'develop' into feature/filter-loader 2020-11-10 18:09:58 +03:00
Ilya Oleshko
8a462c1e7a Merge branch 'develop' into feature/thirdparty-integrations 2020-11-10 17:07:00 +03:00
Viktor Fomin
067ee4fc5a Web: Files: delete first header preloader 2020-11-10 10:40:17 +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
Viktor Fomin
7211978a38 Web: Files: fix first loader 2020-11-09 15:10:51 +03:00
Viktor Fomin
3c84424d8f Web: Files: delete logo 2020-11-09 13:07:27 +03:00
Viktor Fomin
1a4ced2195 Web: Files: fix color 2020-11-06 16:17:40 +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
60e66c1abe Web: Fixed PWA App icon url on iOS 2020-11-02 21:42:53 +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
41d0c3e9d9 Merge branch 'develop' into feature/people-filter-empty-screen 2020-10-19 12:11:34 +03:00
TatianaLopaeva
14af00ffd7 Web: Added styles and changed images by layout 2020-10-16 16:21:33 +03:00
Vladislav Makhov
ccab1949d5 Merge branch 'feature/files' 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/store/files/selectors.js
2020-10-16 11:28:31 +03:00
Vladislav Makhov
4531619362 Merge branch 'feature/files' into feature/files-favorites 2020-10-14 13:45:13 +03:00
5d76e7e6b0 Web: Redesigned displaying of loading processes 2020-10-13 15:51:14 +03:00
b53e34a0f0 Web: Removed useless Link duplicates 2020-10-13 14:02:04 +03:00
TatianaLopaeva
4b81c0adfd Web: Files: Added images by layout 2020-10-12 16:15:35 +03:00
Vladislav Makhov
a179ae0e6c Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-12 14:45:53 +03:00
Vladislav Makhov
2476b306f9 Merge branch 'feature/files' into feature/files-recent
# Conflicts:
#	web/ASC.Web.Common/src/api/files/index.js
#	web/ASC.Web.Components/package.json
2020-10-12 10:04:24 +03:00
e25c59fb09 Web: Files: Changed initialization of DocsAPI 2020-10-09 18:11:02 +03:00
215e33d053 Web: Files: Replaced hard-coded link for DocsAPI 2020-10-09 13:39:22 +03:00
Vladislav Makhov
b24bc1f05a Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	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/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-10-07 17:11:40 +03:00
Vladislav Makhov
e7fc2fef13 Add Recent to the tree node. 2020-10-07 14:26:08 +03:00
Vladislav Makhov
1992be53b8 Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
2020-10-06 11:40:12 +03:00
Vladislav Makhov
5309d8ecf6 Add Favorites empty screen picture 2020-09-29 13:34:59 +03:00
ad4b28d1f2 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.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/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/index.js
2020-09-29 11:48:36 +03:00
Ilya Oleshko
ac9262f4c9 Web: Files : Fixed editor url, always last 2020-09-28 17:46:27 +03:00
01abc6d4f1 Web: Files: Added default loader before react is ready 2020-09-23 17:20:51 +03:00
a4ef8c42a2 Web: Files: Re-written Files to load content dynamically (applied new Main and NavMenu and ContentLoader) 2020-09-21 19:33:38 +03:00
9623029d82 Web: Files: Speeded up loading first page + refactoring 2020-09-17 12:07:36 +03:00
2ccb4eebac Web: Files: Replaced title (People style) 2020-09-11 21:46:51 +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
Ilya Oleshko
54f70b74c8 Web: Files: DocEditor: Fixed editor script path 2020-04-24 11:28:11 +03:00
Ilya Oleshko
aa56005a72 Web: Files: DocEditor: Added simple editor 2020-04-24 10:17:06 +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