|
|
ebcb6c93ea
|
Web: Client: Files: Added kDrive, WebDav and Yandex clouds icons for tree menu
|
2021-09-30 12:13:52 +03:00 |
|
|
|
4531d38e6f
|
Web: Removed duplicates
|
2021-09-24 21:18:50 +03:00 |
|
|
|
551c623541
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-09-08 14:36:10 +03:00 |
|
|
|
350f24cf56
|
Web: Client: Common: Fixed PasswordLimitLength translation key for SK locale
|
2021-09-08 11:12:22 +03:00 |
|
|
|
a10ad2939a
|
Fix bug 52276: fuzzy icons
|
2021-09-08 10:43:57 +03:00 |
|
|
|
24e13fb79d
|
Web: deleted campaigns locales
|
2021-09-07 12:47:53 +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 |
|
|
|
ccd7532161
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
|
2021-08-27 17:45:52 +03:00 |
|
|
|
4f30eb9a2a
|
Web: removed duplicate translations from Common.json
|
2021-08-27 11:09:19 +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 |
|
|
|
c66268a9c2
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/helpers/utils.js
|
2021-08-26 13:49:25 +03:00 |
|
|
|
38983cf306
|
Web: added tiff script
|
2021-08-19 13:27:44 +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 |
|
|
|
e6efbb45b1
|
Web: People: added new translations, moved translations to Common.json
|
2021-07-29 16:09:56 +03:00 |
|
|
|
75e7ca893f
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-07-28 17:19:05 +03:00 |
|
|
|
2abbd580c2
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-07-28 16:53:23 +03:00 |
|
|
|
93d1cb0f38
|
Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF
|
2021-07-27 15:56:19 +03:00 |
|
|
|
ea6219c787
|
Web: added icons
|
2021-07-27 13:58:05 +03:00 |
|
|
|
445c7ae43f
|
Web: Files: added cell type
|
2021-07-27 13:51:56 +03:00 |
|
|
|
9b47aa8d4a
|
Merge branch 'develop' into feature/table-view
|
2021-07-22 16:56:48 +03:00 |
|
|
|
2c8756dee3
|
Web: fixed translations
|
2021-07-22 15:09:29 +03:00 |
|
|
|
e703927239
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-21 18:30:33 +03:00 |
|
|
|
13f8f5ef7d
|
Fix sw.js creation
|
2021-07-21 18:28:56 +03:00 |
|
|
|
f7ce0e210b
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts:
# packages/asc-web-common/utils/sw-helper.js
|
2021-07-21 07:20:51 +03:00 |
|
|
|
d84229886f
|
Web: Components: Table: added header filtering, refactoring
|
2021-07-20 13:29:39 +03:00 |
|
|
|
eab97bbfed
|
Web: init new single sw.js creation
|
2021-07-20 12:32:27 +03:00 |
|
|
|
075d9232ec
|
Web: People: moved translation "Name" to Common.json
|
2021-07-16 13:23:52 +03:00 |
|
|
|
1203ee314d
|
Web: added translations
|
2021-07-14 15:44:01 +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 |
|
|
|
4829db5490
|
Web: Files: Return translations.
|
2021-07-07 17:05:00 +03:00 |
|
|
|
ffb1e32c23
|
Web: Files: SelectFileDialog: Added empty container to the files list.
|
2021-07-02 20:53:41 +03:00 |
|
|
|
577a720691
|
WEb:Files: Removed translations for empty header container from files to root.
|
2021-07-02 20:52:48 +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 |
|
|
|
83884f1a60
|
Web: added link in locales
|
2021-07-01 11:03:42 +03:00 |
|
|
|
29446f1c36
|
Web: moved locales
|
2021-07-01 10:40:07 +03:00 |
|
|
|
44e4eceaa3
|
Web: moved banners images
|
2021-07-01 00:52:24 +03:00 |
|
|
|
3369cc2c7d
|
Web: added campaigns locales
|
2021-07-01 00:30:08 +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 |
|
