Commit Graph

139 Commits

Author SHA1 Message Date
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
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
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
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
Artem Tarasov
2ae591f839 Web: added svg for view 2021-06-29 15:28:44 +03:00
b1662e7ac6 Web: Init maintenance displaying 2021-06-22 13:41:11 +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
5db2e8a868 Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 17:50:28 +03:00
e0d076a7bc Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 15:17:35 +03:00
Artem Tarasov
f181a491fb Merge branch 'develop' into bugfix/fixed-styles 2021-06-11 14:56:52 +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
b7ce4a35e7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
# Conflicts:
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
Artem Tarasov
3db9b30e5e Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-08 17:58:29 +03:00
d9b4611517 added ResetApplication translations in Common 2021-06-08 15:30:11 +03:00
Artem Tarasov
c25fa589a9 Web: People: deleted fonts with ext .woff, added hash to font name 2021-06-08 15:26:56 +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
Artem Tarasov
7db667108b Web: added font-family Opne-Sans to /public, added import fonts to custom.scss 2021-06-06 23:35:56 +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
908310041f Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing") 2021-06-02 10:59:07 +03:00
46c198f89d Web: Added new 'ru' translations; 2021-06-01 19:04:45 +03:00
3ca36c9dd2 Web: Tests: Added new Common translations; 2021-06-01 17:00:55 +03:00
23e1083be7 Web: Removed empty translations keys 2021-06-01 13:49:37 +03:00
7ae9b19412 Web: Turn on new languages >= 78%
1. Language 'de' translated by '90%'
    2. Language 'fr' translated by '54%'
    3. Language 'it' translated by '78%'
    4. Language 'lo' translated by '78%'
    5. Language 'pt-BR' translated by '78%'
    6. Language 'ro' translated by '78%'
    7. Language 'ru' translated by '99%'
    8. Language 'sk' translated by '19%'
    9. Language 'en' translated by '100%'
2021-06-01 13:25:41 +03:00
7e82567331 Web: Added new Common translations; 2021-06-01 11:45:15 +03:00
de98856728 Web: Tests: Added new 'sk' translations; 2021-06-01 11:21:39 +03:00
8e532bc8b9 Web: Tests: Added new 'ro' translations; 2021-06-01 11:20:14 +03:00
3d62da4422 Web: Tests: Added new 'pt-BR' translations; 2021-06-01 11:19:13 +03:00
c5a5072aa7 Web: Tests: Added new 'lo' translations; 2021-06-01 11:17:19 +03:00
8eb62d8079 Web: Tests: Added new 'it' translations; 2021-06-01 11:15:24 +03:00
a0fc465678 Web: Tests: Added new 'fr' translations; 2021-06-01 11:13:50 +03:00
e2b9561d7b Web: Rewritten all json translation files with sorting of properties alphabetically 2021-05-31 18:34:15 +03:00
Artem Tarasov
215c933d9e Web: added new translation keys "ProviderNotConnected", "Mail" to "static/locale/de/Common.json" 2021-05-28 13:28:40 +03:00
Artem Tarasov
102f26ed3c Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-05-27 11:58:53 +03:00
Artem Tarasov
46d80f7b34 Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json" 2021-05-27 11:57:20 +03:00