Commit Graph

6552 Commits

Author SHA1 Message Date
89e7b494c4 Web: People: Fixed translation ChangeUserStatusDialog, fixed translation ChangeUsersActiveStatus, ChangeUsersDisableStatus for en language 2021-11-23 12:24:24 +03:00
ff6986ddb1 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 14:50:11 +03:00
3bee202d41 Web: Files: Replaced translation on common. 2021-11-22 14:23:45 +03:00
38feb79725 Web: Fixed aside loader. 2021-11-22 14:18:46 +03:00
2b84cd3f63 Web: Files: Fix translation 2021-11-22 13:03:16 +03:00
e883e86e64 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 11:47:45 +03:00
228394727e Web: Styles: Fixed styles. 2021-11-22 11:43:37 +03:00
3bd204cbdb Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 11:29:07 +03:00
3417cb28f4 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 11:25:49 +03:00
05c96e140a Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 11:22:25 +03:00
470fd7ffcb Web: People: MainButton: Added missing actions 2021-11-22 11:21:58 +03:00
ca60cc8e0a Web: Files: Replaced translation to Common 2021-11-22 11:18:36 +03:00
b6f98f9531 Web: Files: Added missing mobile translations 2021-11-22 11:17:33 +03:00
2e58ea6061 Web: Files: removed useless code. 2021-11-22 10:19:49 +03:00
b632f3a623 Web: Fixed styles according layouts, renaming. 2021-11-22 10:15:24 +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
56ecbc95ea Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 18:18:13 +03:00
e7f92b096c Web: Added new translation and files for another languages. 2021-11-19 18:17:46 +03:00
180ca914ad Web: Files: HOC: Fixed form icon inside context menu 2021-11-19 18:08:11 +03:00
677263354f Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 18:01:56 +03:00
4b095ecdd6 Web: People: MainButton: Reworked data model for button items 2021-11-19 18:01:47 +03:00
922622676c Web: Files: MainButton: Reworked data model for button items 2021-11-19 18:01:34 +03:00
8e88d27340 Web: Files: Article: Added translations for sub-level menu 2021-11-19 18:00:40 +03:00
4cd9d042de Web: Files: fixed styles after Cherry picking. 2021-11-19 16:58:31 +03:00
4ccc19981b Web: Files: Force loading dialog translations. 2021-11-19 16:10:24 +03:00
50fb593b39 Web: People: Changed Email Dialog according to layouts. 2021-11-19 16:09:41 +03:00
9608cabeb0 Web: People: Forced download of translations. 2021-11-19 16:08:17 +03:00
5b98387057 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 14:26:01 +03:00
0c09d46eca Web: Removed warnings. 2021-11-19 14:12:16 +03:00
839d81f356 Web: Files: Added "Fill in the form" context menu action from ".ofrom" files 2021-11-19 13:25:09 +03:00
ce41e5d4cb Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 12:58:03 +03:00
8a0b29c12b Web: Files: Added '.oform' files edit icon + update access.edit.react.svg 2021-11-19 12:57:56 +03:00
1b9b7e163d Web: Files: Article: Fixed translate file 2021-11-19 12:55:38 +03:00
c63ad1792f Web: Files: Fixed document filtering by extension in the file selection dialog. 2021-11-19 12:12:54 +03:00
2356ace636 Web: Files: Fixed the name of the created docx file from the existing file. 2021-11-19 12:09:18 +03:00
3dcebb924d Web: Deleted useless code. 2021-11-19 10:29:21 +03:00
981dede88a Files: fixed creating link 2021-11-18 20:42:36 +03:00
7a2e48d066 Web: People: fix translations 2021-11-18 19:10:51 +03:00
ac09d3691d Web: People: fix translations 2021-11-18 19:03:24 +03:00
27c731dbb3 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53453 2021-11-18 18:40:29 +03:00
65a82827a0 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-18 18:21:30 +03:00
d5fb86fd41 Web: Files: delete useless 2021-11-18 17:47:11 +03:00
c3cc75401c Web: Files: fix comment 2021-11-18 17:41:38 +03:00
ce528338b8 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53151 2021-11-18 17:39:27 +03:00
8c8bf95fae Web: Files: fixed empty trash 2021-11-18 17:39:12 +03:00
68ab26ed6d Web: Files: Fixed loaders. 2021-11-18 16:21:28 +03:00
594b767a3d Web: Files: Fixed loaders according layouts. 2021-11-18 15:26:48 +03:00
407e4db69c Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53453 2021-11-18 14:53:24 +03:00
26d5de5c93 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53151 2021-11-18 14:52:57 +03:00
783eb2295b Files: added CanWebRestrictedEditing and CanFillForms 2021-11-18 12:53:31 +03:00