850eb13b0d
Merge branch 'release/v1.1.0' into feature/make-form
2021-11-29 14:20:02 +03:00
4dac8e9ce6
Web: Components: changed expander-down.react.svg, fixed styles
2021-11-29 13:11:01 +03:00
aed178f0b1
Web: updated icons
2021-11-29 11:58:27 +03:00
45c5562262
Web: Added make form icon
2021-11-26 17:36:22 +03:00
2f21f2246a
Merge branch 'develop' into feature/mobile-main-button
2021-11-22 16:39:22 +03:00
f675415228
Merge branch 'master' into release/v1.1.0
...
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +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
180ca914ad
Web: Files: HOC: Fixed form icon inside context menu
2021-11-19 18:08:11 +03:00
8a0b29c12b
Web: Files: Added '.oform' files edit icon + update access.edit.react.svg
2021-11-19 12:57:56 +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
3f532f6765
Merge branch 'develop' into feature/mobile-main-button
2021-11-02 13:36:34 +05:00
d6544c073c
Web: Public: added icons
2021-11-02 13:31:54 +05: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
5f16720aba
Web: NavMenu: Was Done for tablet and mobile:
...
- hide module name
- added logo
- added short logo fro mobile
- changed width of logo
2021-06-08 13:40:59 +03:00
d01ef10cc5
Web: NavMenu/PageLayout: Was done:
...
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
5e8751d9f1
Web: Files: added convert file icon, refactoring convert dialog
2021-06-02 16:03:46 +03:00
Alexey Kostenko
2cc413ed16
Web: Client: Added button "AddUsers" on header on access-rights/admins page
2021-04-26 09:14:08 +03:00
Alexey Kostenko
a21d40ca87
ThirdParty: Handling error
2021-04-22 14:45:33 +03:00
Alexey Kostenko
571b412d27
Web: Client/Components: Fixed facebook button styles/icon, fixed translations
2021-04-13 11:17:39 +03:00
Alexey Kostenko
b017562eaf
Web: Changed facebook icon
2021-04-09 10:30:54 +03:00
Alexey Kostenko
ec6c1df3cf
Merge branch 'develop' into feature/oauth2.0
2021-04-08 11:59:08 +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
Alexey Kostenko
ab3d5f1e77
Web: Login: Added icons and translations
2021-03-26 17:17:34 +03:00
TatianaLopaeva
f27c38e2d9
Web: Moved icons from files to common folder.
2021-03-26 14:45:29 +03:00
9fcbb5c873
Web: Storybook issues fix:
...
+ Added copy public/images to static/images for publish
+ Fix checkbox click in theme-provider.stories.js
+ Added empty_screen_filter.png for EmptyScreenContainer
2021-03-24 13:55:50 +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
Artem Tarasov
c8d614a3ba
Web: Components: refactoring stories, add public/images to components for storybook
2021-03-07 14:57:26 +03:00
TatianaLopaeva
200049ccee
Web: Components: input-block: Fix icons displaying & added search.react icon.
2021-03-01 15:50:16 +03:00
TatianaLopaeva
65949fa1a9
Web: Common: Fix not displaying icons at nav and header.
2021-02-25 13:08:20 +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
3e3b079b5a
Web: Components: Deleted useless Icons component.
2021-02-23 22:14:42 +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
