Commit Graph

18 Commits

Author SHA1 Message Date
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
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
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