Commit Graph

4666 Commits

Author SHA1 Message Date
b1417e68ea Files: fixed creating file from template in thirdparty 2021-12-03 17:38:13 +03:00
01b46993e3 Merge branch 'feature/translate-1.1.0' of github.com:ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-02 18:52:10 +03:00
857c8f91d3 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-02 18:51:52 +03:00
3a50fca3cc Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display 2021-12-02 18:32:36 +05:00
db16f4b2ec edit ru 2021-12-02 16:08:04 +03:00
318348737d update translations 2021-12-02 15:53:18 +03:00
65981155da Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-02 15:52:30 +03:00
8c750d6f17 edit ro 2021-12-02 15:51:59 +03:00
17c7a3b0eb Web: Files: Fixed editing form badge. Fixed icon. 2021-12-02 15:32:30 +03:00
fed3177aa0 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-02 14:34:14 +03:00
a2f26ee4b6 Web: Files: Store: Added encoding for string file id`s 2021-12-02 14:28:20 +03:00
83fad7a7c8 update ja 2021-12-02 13:49:27 +03:00
e75031c7b8 Web: Files: Translations: Changed translations for form actions 2021-12-02 13:00:13 +03:00
066ae39f5e add az 2021-12-02 12:48:07 +03:00
af2f355e34 edit ru 2021-12-02 11:02:33 +03:00
1aeff5ef85 edit pt_PT 2021-12-02 10:53:54 +03:00
79e151e1e0 add pt_PT 2021-12-02 10:46:34 +03:00
ecac004a95 edit de 2021-12-01 18:56:28 +03:00
49a2dc7c24 Web: Files: Store: Fixed displaying make form action for privacy folder 2021-12-01 14:48:17 +03:00
f185b92d0c Web: Files: Header: Fixed form creating for privacy folder 2021-12-01 14:47:40 +03:00
aaf9acec35 Web: Files: MainButton: Fixed form creating for privacy folder 2021-12-01 14:47:18 +03:00
f24a2c690e Web: Files: Download dialog: fixed dialog styles 2021-12-01 12:42:01 +03:00
d7f12761f9 Web: Files: Download dialog: fixed filename width 2021-12-01 12:25:16 +03:00
1ea835b0bf Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-01 12:05:51 +03:00
6510142ed1 Web: Files: added new conversion format for docxf 2021-12-01 12:03:25 +03:00
ac5cf8301f Web: Files: fixed SelectFileDialog tree-folders styles 2021-11-30 17:43:16 +03:00
591809883f Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-30 14:22:54 +03:00
5b0536d7d8 Web: Files: fixed EncryptedFileIcon styles 2021-11-30 14:22:41 +03:00
1764ad579d Files: fixed migrations 2021-11-30 14:21:49 +03:00
27af300dd5 Web: Files: fixed EncryptedFileIcon styles 2021-11-30 12:07:51 +03:00
e7028edeac Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-11-30 11:56:27 +03:00
d8e4880227 update translations 2021-11-30 11:56:02 +03:00
b2c123d6f4 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-11-30 11:46:22 +03:00
0cefb001f1 Web: Files: disabled master form for privacy rooms 2021-11-30 11:44:11 +03:00
626ad87077
Merge pull request #469 from ONLYOFFICE/feature/make-form
Feature/make form
2021-11-30 11:36:23 +03:00
1551a484dc Web: Files: Renamed constant 2021-11-30 11:35:25 +03:00
3d361fe268 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-30 10:11:56 +03:00
7f39ebd499 Web: Files: SelectFileDialog: Fixed loaders according layouts. 2021-11-30 10:11:49 +03:00
425fe34629 Web: Files: Store: Added fetch items after call copyAsAction at store 2021-11-30 08:52:36 +03:00
fa40ca0e0d Web: Files: HOC: Added error catching for copyAsAction api 2021-11-30 08:51:32 +03:00
2b45442f29 Merge branch 'release/v1.1.0' into feature/make-form 2021-11-30 08:21:32 +03:00
5192da3ddf Files: added recent to openEdit 2021-11-29 21:42:42 +03:00
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
26b00f9ee2 Merge branch 'release/v1.1.0' into feature/make-form 2021-11-29 17:58:41 +03:00
88c1f3271d Files: fix copyAs 2021-11-29 17:52:50 +03:00
f905ad0e23 Web: Files: Store/HOC: Added copyAsAction at store, fixed HOC action 2021-11-29 16:32:30 +03:00
3d5f3aa604 Web: Files: fixed display article panel 2021-11-29 16:30:52 +03:00
1be4134b7a edit vi 2021-11-29 16:15:07 +03:00
d53b130f35 edit cs 2021-11-29 16:02:06 +03:00
40c3eb03c7 Web: Files: fixed aside scroll 2021-11-29 15:55:36 +03:00
cd6b3cab52 edit cs 2021-11-29 15:48:07 +03:00
148227cf99 edit cs 2021-11-29 15:44:48 +03:00
1870273c63 Web: Files: fixed "Create Master Form from file" dialog scroll styles 2021-11-29 15:28:29 +03:00
9746006457 Fixed Bug 54082 - Client.Files.Removed change of confirmation text. 2021-11-29 14:59:27 +03:00
850eb13b0d Merge branch 'release/v1.1.0' into feature/make-form 2021-11-29 14:20:02 +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
d3071bcfb0 update translations 2021-11-29 12:53:44 +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
084677dfcd Web: Files: Store/HOC: Added make form action 2021-11-26 17:37:38 +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
4155dfde5c Fix Bug 53418 - Client.Files.Drag’n’drop. Fixed dragging file by filename 2021-11-24 14:17:11 +03:00
838e734078 Web: Files: removed useless code from withBadges HOC 2021-11-24 14:15:32 +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
b99b3d8ca5 Web: Files: fixed file loader after closing ConflictResolveDialog 2021-11-24 11:58:02 +03:00
2678c8cf6e Fixed Bug 53123 - Client.Files.Added a filter at the stage of creating a file or folder. 2021-11-23 14:37:48 +03:00
a50d35e30a Fixed Bug 53901 - Client: Upload.There will be not a border line after clicking on SVG element. Tooltip will not be selected. 2021-11-23 10:23:05 +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
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
11d527ba03 Merge branch 'master' into hotfix/v1.1.1
# 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/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	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:40: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
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
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
638f6b6ddb Fixed Bug 53878 - Client: Check box. Fixed checkbox clickability 2021-11-19 13:44:41 +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
4732b8c16b Fixed Bug 53879 - Client: Check box. Fixed reset of file selection 2021-11-19 11:35:26 +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
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
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
3dbb55cfc4 Web: Files: Removed global changes of tree when changes local tree at file dialog. 2021-11-18 10:45:36 +03:00
ea27fb433b Web: fixed modal dialog styles. 2021-11-18 10:28:36 +03:00
3a866b14bb Web: Fixed styles of aside files list. 2021-11-18 10:24:51 +03:00
8ff0bbba61 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-18 10:02:47 +03:00
eaa7bd9c80 Web: Fixed translations according layouts. 2021-11-18 10:01:09 +03:00
2a842cc401 Web: Files: Remove extra padding for folder dialog. 2021-11-18 09:29:12 +03:00
d113abe541 Web: Files: Fixed translation for file dialog. 2021-11-18 09:16:40 +03:00
68d889fb2b Web: Fixed can create in editor dialog, changed translation, added buttons of selection folder for files dialog. 2021-11-18 09:06:03 +03:00
92cd04914a
Merge pull request #459 from ONLYOFFICE/bugfix/loader-for-file-operations
Bugfix/loader for file operations
2021-11-17 19:32:50 +03:00
cd698e56bb Web: Files: fixed clearActiveOperations 2021-11-17 19:00:38 +03:00
e6f008cc6f Web: Files: Store: Added convert map docx to docxf 2021-11-17 18:16:23 +03:00
0e7aee7918 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-17 18:11:27 +03:00
fb903bd9bf Web: Files: Store: Added new formats inside document constant 2021-11-17 18:11:18 +03:00
84439d98e1 Web: Files: delete action 2021-11-17 17:43:27 +03:00
4894779a17 Web: Files: add restore all 2021-11-17 17:42:59 +03:00
017b9e912c Web: Files: add menu in trash 2021-11-17 17:41:46 +03:00
b5fa787353 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-17 17:41:27 +03:00
7560d4aae5 Web: Files: Added new form from file. 2021-11-17 17:39:56 +03:00
5f4a1c5f40 Fixed Bug 51982 - Client.Sort. Fixed filter pageCount 2021-11-17 17:26:20 +03:00
8546bc2662 Web: Files: Home: Fixed translate file 2021-11-17 17:15:28 +03:00
9bbaf3f4a7 Web: Files: refactoring file loader 2021-11-17 17:01:46 +03:00
bc4758114f Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-17 16:48:29 +03:00
cc4d835335 Updated forms 2021-11-17 16:43:29 +03:00