|
|
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 |
|
|
|
adbb316dd2
|
Web: moved "Owner" translation to Common
|
2021-11-15 18:33:32 +03:00 |
|
|
|
d6836cc3d3
|
Merge pull request #457 from ONLYOFFICE/feature/translate-1.0.1
Feature/translate 1.0.1
|
2021-11-13 20:04:11 +03:00 |
|
|
|
c7c7267a9a
|
Test: Added new WrongTranslationVariablesTest and fix it's issues
|
2021-11-13 19:03:10 +03:00 |
|
|
|
1c8f091dce
|
Web: Fix DublicatesByContentTest translation issues
|
2021-11-12 20:12:33 +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 |
|
|
|
eb1db9eea6
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-02 18:15:53 +03:00 |
|
|
|
20e59a7cbe
|
Web: Common: changed media-viewer icons, fixed media styles
|
2021-11-02 17:51:44 +03:00 |
|
|
|
aa79ef2c9d
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-02 14:03:26 +03: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 |
|
|
|
4bd4954ad4
|
Merge branch 'release/1.0.0' into feature/desktop-login
|
2021-10-19 13:10:47 +03:00 |
|
|
|
9dd28a144d
|
Web: Fixed callback pages, added login callback for desktop client
|
2021-10-19 10:31:34 +03:00 |
|
|
|
0c63c41ef7
|
Web: Files: changed folder icons, added new icons
|
2021-10-18 12:24:01 +03:00 |
|
|
|
fb7922f579
|
Thirdparty: login. Desktop
|
2021-10-15 11:34:34 +03:00 |
|
|
|
ff97e3134f
|
Web: Components: added new icons, created GroupMenuItem component
|
2021-10-14 18:18:08 +03:00 |
|
|
|
678fa4c119
|
Web: Added desktop parameter from url for oAuth login
|
2021-10-14 15:24:13 +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 |
|
|
|
af31f2fb9b
|
Client: thirdparty. Fixed getObjectByLocation
|
2021-10-13 10:29:07 +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 |
|
|
|
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 |
|
