f9feb35afc
Merge branch 'develop' into feature/backup
2021-05-30 20:57:01 +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
3ede66f9cd
Web: Settings: Backup: Added input with folder path. Added panel with only common documents.
2021-04-29 19:39:35 +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
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