Commit Graph

288 Commits

Author SHA1 Message Date
c2ceab129a Merge branch 'release/rc-v1.2.0' into feature/edit-en 2023-01-11 10:57:10 +03:00
0b64d4223c Web: Default document names have been moved to 'Common' file. 2023-01-10 15:26:57 +03:00
89c7348ccf Web: Editor: Restored back url. 2023-01-09 17:44:40 +03:00
f7bcbf54e0 Web: Editor: Fixed document type for creation url. 2023-01-09 17:22:42 +03:00
5a83f41348 Fixed Bug 60464 - Files. ‘Sorry, the resource could not be found’ on the page when creating a new document from the editor. 2023-01-09 17:14:54 +03:00
Timofey Boyko
973284162e Web:Editor: fix import images 2023-01-09 16:41:05 +03:00
6526b1463d edited en 2022-12-30 14:56:53 +03:00
0a9fd4354e
Merge pull request #1135 from ONLYOFFICE/feature/form-links
Feature/form links
2022-12-27 15:01:11 +03:00
Viktor Fomin
e730861894 Editor: use custom favicon 2022-12-27 14:43:29 +03:00
Timofey Boyko
42b1862e4b Web:Editor: fix empty toastr 2022-12-27 11:10:26 +03:00
ea430c6181 Merge branch 'release/rc-v1.2.0' into feature/form-links 2022-12-26 17:13:51 +03:00
Akmal Isomadinov
c62000f3f5 Web: Fixed redirection after login 2022-12-23 15:56:42 +05:00
Timofey Boyko
ad860a20f4 Fixed Bug 60296 - Rooms.Files. Error 'Warning. Unable to set properties of undefined (setting 'message')' when opening a file link for room members by an unregistered user 2022-12-23 10:54:29 +03:00
bd5ed37eb6 Web: Editor: added linked form check 2022-12-22 15:52:09 +03:00
e8141c6f22 Web: Changed load Docspace config for clients 2022-12-20 19:51:49 +03:00
941ad53a08 Web: Added check for third-party file. 2022-12-16 19:57:41 +03:00
c28f6943dc Web: Editor: Added onRequestReferenceData. 2022-12-16 19:34:01 +03:00
67a85a0095 Merge branch 'release/rc-v1.2.0' into feature/advanced-security 2022-12-16 16:45:54 +03:00
Akmal Isomadinov
2e66174a87 Web Fixed catch 2022-12-16 17:17:30 +05:00
57707de013 Web: Deleted canConvert; 2022-12-16 13:54:39 +03:00
5a80f7184d Web: Editor: Changed rights. 2022-12-15 13:32:53 +03:00
c209e55210 Web: Deleted useless code. 2022-12-14 19:35:35 +03:00
90c596fe53 Web: Fixed rights for editor. 2022-12-14 11:50:49 +03:00
4affc5f58f Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 18:50:14 +03:00
135ea764dc Web: Editor: Fixed action link. 2022-12-02 13:46:06 +03:00
1b7844b44a Merge branch 'develop' into feature/socket-newtag 2022-11-25 17:17:31 +03:00
e2e81982f9 SocketIO: new rooms and events 2022-11-25 12:42:15 +03:00
23a7210fbc Merge branch 'develop' into bugfix/access-rights 2022-11-24 20:33:59 +03:00
d9c7bd924e Web: Added opening a document when saving a copy in the editor. 2022-11-24 13:56:30 +03:00
0a3c9466b8 Web: Fixed url. 2022-11-23 13:00:25 +03:00
eb64a033a8 Web: Refactoring. 2022-11-23 10:10:11 +03:00
702aaf3653 WEb: Editor: Commented useless code. 2022-11-22 11:07:43 +03:00
918ca0b76f Web: Editor: Commented useless code. 2022-11-22 11:06:57 +03:00
9faa4299ab Web: Editor: Fixed message display in editor. 2022-11-22 11:05:37 +03:00
4ce1bdaa17 Web: Added restriction on viewing version history. 2022-11-21 16:12:22 +03:00
e6df1f7f36 Web: Fixed the problem of deleting the title when saving the document. 2022-11-21 15:45:20 +03:00
784abbe39e Merge branch 'develop' into feature/catalog-redesign 2022-11-18 17:49:57 +03:00
2a483e6eb3 Fix Cannot read properties of undefined (reading 'rootFolderType') 2022-11-18 13:20:54 +03:00
9da275952c fix nconf 2022-11-17 15:58:13 +03:00
6f5e4d94a8 Web: Files: removed favorites for editor 2022-11-17 12:01:30 +03:00
e50833f7f3 common settings for configure aws cloudwatch credentials 2022-11-16 12:44:53 +03:00
295ea740ad Web: Reduced options in the editor if the file is in an archive. 2022-11-15 16:33:50 +03:00
c65c239021
Merge pull request #1033 from ONLYOFFICE/bugfix/editor-access
Bugfix/editor access
2022-11-15 10:33:51 +03:00
047ddec6ed Web: Editor: Commented useless code. 2022-11-15 09:45:48 +03:00
f4ca4de019 Fix editor connect ECONNREFUSED ::1:8092 2022-11-14 19:57:23 +03:00
df6511e5dd Web: Editor: Commented useless code. 2022-11-14 15:52:35 +03:00
6cc40dc4c4 Web: Editor: Added a check on the rights to add options to the editor. 2022-11-14 15:29:35 +03:00
47e243136a Web: Editor: Hiding the "Save as" item for users. 2022-11-14 15:16:34 +03:00
7856ffef6a Merge branch 'develop' into bugfix/editor-optimization 2022-11-11 17:23:46 +03:00
8e54e59bec Web: Common/Editor: Added a request for requests in advance. 2022-11-11 13:52:10 +03:00
518e10f4ee Added opportunity to start production frontend 2022-11-11 11:28:03 +03:00
19e7742803 Fix ERR_OSSL_EVP_UNSUPPORTED and remove codeceptjs (canvas issue) 2022-11-10 16:46:14 +03:00
46cb22f4d2 Temporary disable sharing (many errors) 2022-10-21 11:38:37 +03:00
bc2e3ba0b1 Removed debugger 2022-10-21 11:38:03 +03:00
9f7f9bfd8a Replaced local onlyoffice-document-editor-react component 2022-10-20 18:47:02 +03:00
48f59cbabf Merge branch 'develop' into feature/document-editor-react 2022-10-20 17:07:39 +03:00
77f3c59b09 Web: Replaced the variable name. 2022-09-29 11:45:53 +03:00
95ce51c6d0 Web: The variable name has been replaced. 2022-09-29 11:42:31 +03:00
0d1445f163 Web: Editor: Switched to DocumentEditor component 2022-09-23 18:36:45 +03:00
6acb6d850e Web: Editor: Added onlyoffice-document-editor-react-0.3.0.tgz 2022-09-21 19:06:29 +03:00
50e45e7289 Web: Editor: Fix SaveAs dialog 2022-09-16 14:38:44 +03:00
8df94b6af1 i18n: Translations: fix project files + sorting 2022-09-09 18:02:39 +03:00
cdb9c7027e Web: Editor: Fix toastr not found issue 2022-09-09 16:08:59 +03:00
1b338da779 Web: Editor: Renamed locale folders 2022-09-06 13:05:27 +03:00
Artem Tarasov
65f1b61998 Web: Login/Editor: fixed showing warnings about request as expression 2022-09-05 13:16:04 +03:00
Artem Tarasov
a3f344712b Web: Login/Editor: added webpack-filter-warnings-plugin 2022-09-05 13:14:32 +03:00
Artem Tarasov
0621fd9c86 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/dialogs/ConnectDialog/index.js
#	packages/login/src/Login.jsx
#	packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	yarn.lock
2022-08-30 18:38:12 +03:00
mushka
5eea7d0f0d Merge branch 'feature/create-room' of github.com:ONLYOFFICE/AppServer into feature/create-room 2022-08-25 15:38:05 +03:00
ad821e8eeb Web: Editor: Fix goBack url 2022-08-25 14:54:31 +03:00
Artem Tarasov
2b915db425 Web: Doceditor: applied nconf, logPath is now taken from appsettings.services.json 2022-08-24 16:30:37 +03:00
Artem Tarasov
ee757db2a8 Web: Doceditor: added nconf 2022-08-24 16:28:10 +03:00
Artem Tarasov
b8efdefbcd Web: Doceditor: fixed variable name for getting path to logs from environment 2022-08-24 13:35:57 +03:00
Artem Tarasov
6f9120ee03 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/store/TargetUserStore.js
#	packages/common/store/AuthStore.js
#	packages/common/store/SettingsStore.js
#	packages/common/utils/index.ts
#	packages/login/src/Login.jsx
#	packages/login/src/RoomsLogin.jsx
2022-08-24 10:17:39 +03:00
Artem Tarasov
907923add1 Web: Editor/Client: added ts support 2022-08-17 10:21:43 +03:00
Artem Tarasov
649a9d5ed5 Web: Editor: fixed duplication of global styles on each request (production) 2022-08-12 11:26:54 +03:00
Artem Tarasov
7673750d41 Web: Editor: fixed duplication of global styles on each request 2022-08-12 10:02:41 +03:00
Artem Tarasov
a520446d69 Web: Packages: localStorage usage changed to cookies when saving language 2022-08-05 17:21:14 +03:00
4af1247136 Web: Integration: Restored after merge develop 2022-08-03 14:48:54 +03:00
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
d093c97b97 Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
fa04e92286 Web: Added TODO: Change url by category 2022-08-01 13:30:26 +03:00
995d07deae Web: Upgrade yarn to v3.2.2 2022-07-29 18:20:57 +03:00
98645969b6 Web: Moved some files from past locations 2022-07-28 19:10:36 +03:00
c1ab8edaaf Merge branch 'develop' into refactoring/client 2022-07-28 18:32:32 +03:00
53737a06e8 Merge branch 'develop' into refactoring/client
# Conflicts:
#	packages/editor/src/client/components/DynamicComponent.js
#	packages/editor/src/client/components/Editor.js
#	packages/editor/src/client/components/SelectFileDialog.js
#	packages/editor/src/client/components/SelectFolderDialog.js
#	packages/editor/src/client/components/SharingDialog.js
#	packages/editor/src/client/helpers/utils.js
#	packages/editor/src/client/helpers/withDialogs.js
#	packages/editor/src/server/lib/helpers/index.js
2022-07-28 10:38:29 +03:00
c5baa8834d Web: Fix 'Accounts' imports, routes and includes 2022-07-26 12:51:52 +03:00
c956d8b696 Web: Merged 'Files' module with 'Client' and fixed paths 2022-07-24 19:57:03 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00