Commit Graph

6578 Commits

Author SHA1 Message Date
dec07c931c moved from d50a38db 2021-11-29 18:40:22 +03:00
d28cb30305 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-29 18:26:24 +03:00
fae03617d4 Web: Files: Fixed styles according of layouts. 2021-11-29 18:26:11 +03:00
88c1f3271d Files: fix copyAs 2021-11-29 17:52:50 +03:00
3d5f3aa604 Web: Files: fixed display article panel 2021-11-29 16:30:52 +03:00
40c3eb03c7 Web: Files: fixed aside scroll 2021-11-29 15:55:36 +03:00
1870273c63 Web: Files: fixed "Create Master Form from file" dialog scroll styles 2021-11-29 15:28:29 +03:00
85316c9d63 Moved from 45122194 2021-11-29 14:11:03 +03:00
99c71148d8 Web: Files: fixed SharingPanel styles 2021-11-29 12:58:21 +03:00
e774dd0561 Web: Files: fixed modal dialog styles 2021-11-29 12:01:39 +03:00
4f4fd7811f Web: Files: fixed modal-dialog_file-name styles 2021-11-29 11:29:46 +03:00
b716f95a71 Web: Files: fixed FilesListRow styles 2021-11-26 18:22:30 +03:00
3f56b01832 Web: Files: added margin to modal-dialog_file-name 2021-11-26 18:08:43 +03:00
826b2928c3 Web: Files: fixed the selected folder in the tree for the dialog "Create Master Form from file" 2021-11-26 17:05:59 +03:00
0f833bd860 Web: Files: DeleteDialog: fixed dialog crash 2021-11-26 16:03:05 +03:00
27bcb67d84 Web: Files: added master form for empty folder screen 2021-11-26 15:57:29 +03:00
789ea1cbc7 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-26 15:48:00 +03:00
c965295d2f Web: Files: added copy external link icon 2021-11-26 15:41:19 +03:00
5288c96dd2 Web: Files: FilesPanel: Fixed translation keys 2021-11-26 14:51:57 +03:00
076cc463a0 Web: Files: MainButton: Fixed translation keys 2021-11-26 14:51:33 +03:00
d70ec139b7 Web: Files: Header: Added forms actions 2021-11-26 14:50:31 +03:00
f1fa0d6304 Web: Files: Locales: Moved keys for forms to common module translations 2021-11-26 14:49:51 +03:00
08746974f4 Web: SW: Added SW unregister + refactoring 2021-11-25 15:08:18 +03:00
ff9bb93efd Web: Scripts: Hide shx mkdir errors 2021-11-25 15:06:19 +03:00
49897b0617 update docxf and oform with embedded mime type 2021-11-25 11:07:32 +03:00
c1f9bcc445 Web: Files: Store: Disabled form filling for external access sharing 2021-11-25 00:11:29 +03:00
d572debd4e Web: Files: Store: Fixed ‘Fill in the form’ context menu item for the .oform format in the Trash folder. 2021-11-24 13:02:19 +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