Commit Graph

686 Commits

Author SHA1 Message Date
731cbc649b
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
2022-02-03 20:58:18 +03:00
655ae73a65 Web: Files: Fix refresh last page on delete all items (+ socket refactoring) 2022-02-03 14:57:23 +03:00
Artem Tarasov
6562e36a13
Merge pull request #502 from ONLYOFFICE/bugfix/fix-display-images-in-media-viewer
Bugfix/fix display images in media viewer
2022-02-02 14:55:38 +03:00
bf07a141d8 Web:Common:Fix. 2022-02-02 14:22:41 +03:00
b91348695e Web:Common:Changed props previewFile to isPreviewFile. Changed propTypes to boolean for isPreviewFile. Web:Files:Added onButtonBackHandler function. 2022-01-30 21:46:39 +03:00
8add87820c Web:Files:Added isFirstUrl data to localStorage. Changed the condition for changing the url. 2022-01-28 16:34:15 +03:00
218990c4fa b:Common: Added props onChangeUrl to the MediaViewer component. 2022-01-27 18:48:14 +03:00
4c6d130ea9 Web:Files:Added MediaViewer closing handling when the Close button is clicked. 2022-01-26 20:56:01 +03:00
e200898978 Added isMediaViewerOpen key to localStorage. 2022-01-25 18:29:18 +03:00
ef6682ab32 Web:Files:Added check for open MediaViewer. Added checkURLchange function to MediaViewer. 2022-01-25 18:20:59 +03:00
e810605a4d Web: Socket: Fix proxy ws by web:hub:url (appsettings.json) 2022-01-25 12:54:21 +03:00
b25f339c3e Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-24 15:43:04 +03:00
ee2fd6bb0f Web:Files:Added a check for the absence of other pictures in the playlist for moving through the picture via a direct link in MediaViewer. 2022-01-21 19:21:29 +03:00
efe799d712 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/helpers/utils.js
2022-01-21 14:44:06 +03:00
5dbe35f4d1 Web:Common:Сhanged history.pushState method to history.push. 2022-01-19 12:27:41 +03:00
5222666d2e Web:Common:Added history.pushState method to display images in MediaViewer. 2022-01-18 10:47:00 +03:00
1a8d88345a Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
#	yarn.lock
2022-01-17 19:02:40 +03:00
aa8903b0ef Web: Files: Added copy method to save in 'oform' format. 2022-01-17 15:54:14 +03:00
77937390ef Web: Fix crash of Wizard with default en-US language 2022-01-14 19:12:58 +03:00
6f90864ed8 Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-13 10:49:43 +03:00
8b327ceb66 Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage 2022-01-12 20:13:30 +03:00
0c341f0709 Merge branch 'hotfix/v1.1.1' into feature/convert-password 2022-01-11 16:14:46 +03:00
c7bb1a51d5 Fixed Bug 50858 - People. ‘Something went wrong.’ when following the back arrow from a blocked profile card 2022-01-10 16:24:21 +03:00
3c23f4d892 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-12-30 14:34:49 +03:00
febf172875 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/avatar-editor/index.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/main-button/index.js
#	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/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Login/package.json
2021-12-28 13:35:02 +03:00
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
b047ae3c0b Web: Common: Added password field to api method. 2021-12-22 12:15:56 +03:00
6d84bd5f04 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-15 17:22:17 +03:00
gectokot
e9449b5a72 Web: Studio: Homepage: Fixed vertical scroll appearing on mobile in landscape mode 2021-12-14 14:45:40 +03:00
39f172bd22 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-13 17:58:34 +03:00
530d1a18a8 Web: Api: Added property for setEncryptionKeys 2021-12-13 17:58:25 +03:00
9269594b8a Web: DesktopEditors mode: Added more logs 2021-12-13 01:32:47 +03:00
2afce477b1 Web: Common: Removed useless code. 2021-12-10 09:30:11 +03:00
51b7921ed4 Web: Edit: Added doc property to api methods for history versions.
# Conflicts:
#	packages/asc-web-common/api/files/index.js
2021-12-08 16:30:26 +03:00
d5a77379b3 Web: Editor: Added api method for restore document version. 2021-12-08 16:28:30 +03:00
317750f909 Web: Added api methods.
# Conflicts:
#	packages/asc-web-common/api/files/index.js
2021-12-08 16:28:25 +03:00
c44f580681 Fix issues of UselessModuleTranslationKeysTest 2021-12-07 13:04:06 +03:00
3a50fca3cc Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display 2021-12-02 18:32:36 +05:00
27e732e9a3 Web: Login: Added usage of new API /authentication.json parameter "session" 2021-12-01 10:56:50 +03:00
626ad87077
Merge pull request #469 from ONLYOFFICE/feature/make-form
Feature/make form
2021-11-30 11:36:23 +03:00
7f39ebd499 Web: Files: SelectFileDialog: Fixed loaders according layouts. 2021-11-30 10:11:49 +03:00
5bb3602964 Web: Common: Api: Fixed copyAs api call params 2021-11-30 08:20:55 +03:00
0b9a9b633d Web: Common: Api: Added fileCopyAs action 2021-11-29 16:31:40 +03:00
bce51d74b6 Fix Bug 53438 - Client.Editor. Added redirect to homepage due to error 2021-11-25 16:37:36 +03:00
08746974f4 Web: SW: Added SW unregister + refactoring 2021-11-25 15:08:18 +03:00
73d3b00c07 Web: added missing classNames for autotests 2021-11-25 12:11:22 +03:00
465c57b8f6 Fixed Bug 54013 - Client.Files.Returned the ability to select elements on the About program page. 2021-11-24 11:09:52 +03:00
54a58916ed Web: Common: Filter: fixed multiple api request 2021-11-22 16:29:32 +03:00
52626a548e Web: fixed Snackbar styles 2021-11-22 15:01:33 +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