Commit Graph

3122 Commits

Author SHA1 Message Date
mushka
4272c1f661 small stranslation fix 2022-08-03 16:34:14 +03:00
mushka
57e76d78e1 secondaryInfoButton fix position 2022-08-03 14:56:43 +03:00
mushka
b1b5b87871 implemented new translation keys 2022-08-03 14:56:26 +03:00
mushka
507979d9cc added translation keys for storageLocation and MakePrivate secondary infos 2022-08-03 14:55:59 +03:00
mushka
50c6a82c8c added translation keys for room types 2022-08-03 14:47:30 +03:00
mushka
766082b505 removed unused styles 2022-08-03 14:47:06 +03:00
mushka
29160a6cbc impemented new SecondaryInfoButtonComponent 2022-08-03 14:46:55 +03:00
mushka
a373d0dcc8 created own component for help button 2022-08-03 14:42:49 +03:00
mushka
1e10e329d9 added ability to pass props directly to tooltip through help-button 2022-08-03 14:28:00 +03:00
mushka
1d8d7e9a6e appserver to docspace import fix 2022-08-02 14:55:51 +03:00
mushka
03f1f0c8cc fix dialog exporting after merge 2022-08-02 14:54:59 +03:00
mushka
449c848445 fixes after develop merge 2022-08-02 14:12:16 +03:00
mushka
ea8aa736c4 merge with develop 2022-08-02 14:11:41 +03:00
mushka
a418d7d42d Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-08-02 12:18:06 +03:00
27fa822017 Web: Commented useless code 2022-08-01 19:47:29 +03:00
72878d5ca8 Web: Fix open NavMenu on Mobile 2022-08-01 18:47:11 +03:00
ac3683d7ab Web: Fix i18n ns name for Files.json 2022-08-01 18:12:15 +03:00
af5cfe6553 Web: Rename translation file on 'en' 2022-08-01 18:03:27 +03:00
ebc6ce1d67 Web: Commented console logs 2022-08-01 17:53:26 +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
fd21ad788c Web: Portal-Settings: Hide security/admins 2022-08-01 14:53:26 +03:00
3ed5ca8706 Web: Fix old url to /filter 2022-08-01 14:52:18 +03:00
fa04e92286 Web: Added TODO: Change url by category 2022-08-01 13:30:26 +03:00
ec70758d79 Web: Fix some old urls to /filter 2022-08-01 13:29:27 +03:00
mushka
f2112365b8 Merge branch 'develop' into feature/create-room 2022-08-01 09:59:21 +03:00
mushka
6823957d47 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-08-01 09:57:22 +03:00
mushka
8ae3d46e24 modal dialog tweaks and fixes 2022-08-01 09:52:48 +03:00
mushka
97c83a1d30 added api calls for room editing 2022-08-01 09:51:55 +03:00
d0289756ec Web: Changed routing by new categoryType 2022-07-31 20:14:28 +03:00
359c160ac1 Web: Refactoring routes urls 2022-07-31 13:52:35 +03:00
d0637936cb Web: Fix translation getDefaultFileName() 2022-07-31 13:13:16 +03:00
e0856c1503 Web: bootstrap: Commented registerSW 2022-07-31 12:53:20 +03:00
9890724990 Web: Accounts: Fix loaders 2022-07-31 12:52:53 +03:00
995d07deae Web: Upgrade yarn to v3.2.2 2022-07-29 18:20:57 +03:00
4c097607f9 Web: Fix position of MainButton with logo and display logo 2022-07-29 10:17:41 +03:00
211ac2666f Web: Fix error on user equals null 2022-07-28 19:11:48 +03:00
027b23ba92 Web: Added toast 2022-07-28 19:10:58 +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
a87497a385 Web: Moved src/components/pages/* to src/pages + Added new aliases SRD_DIR, PACKAGE and fix paths + Renamed /settings to /portal-settings 2022-07-28 17:34:27 +03:00
256c2de843 Web: Removed modules dependencies and People and Files mobx providers 2022-07-28 16:11:55 +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
Artem Tarasov
045c00b4ff Web: Common/Doceditor: fixed name of init state of editor 2022-07-26 10:56:25 +03:00
0ebd28f299 Web: Merged 'People' module with 'Client' and fixed paths 2022-07-25 22:19:47 +03:00
280f702cf9 Merge branch 'develop' into refactoring/client
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/components/NavMenu/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	yarn.lock
2022-07-25 21:29:04 +03:00
mushka
30d2b47fb0 added createTag and addTagsToRoom api calls 2022-07-25 18:14:16 +03:00
Artem Tarasov
42c42f19eb Merge branch 'develop' into bugfix/doceditor-fix 2022-07-25 18:05:08 +03:00
Artem Tarasov
64305a3c2c Web: Common/Doceditor: fixed request of build version and custom scheme 2022-07-25 17:10:38 +03:00