Commit Graph

3164 Commits

Author SHA1 Message Date
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
0b706db9ff Web: Common: Article: add margin 2022-07-25 16:47:04 +03:00
Artem Tarasov
e701def2d7 Web: Common/Doceditor: fixed portal settings request 2022-07-25 16:24:10 +03:00
Artem Tarasov
ba40abd43e Web: Common/Doceditor: fixed user request when initializing auth state 2022-07-25 16:14:24 +03:00
ee5a326bc8 Web: Common: Article: fix scroll position 2022-07-25 15:53:04 +03:00
ea79763079 Web: Common: Article: fix style 2022-07-25 11:42:40 +03:00
f9640a400c Web: Moved 'People' images and translations to 'Client' 2022-07-25 10:29:16 +03:00
mushka
f0c30dbc5c fixes on drop-down component 2022-07-24 23:42:10 +03:00
mushka
4866fb8070 added interaction with height and heightTablet props for DropDown 2022-07-24 21:06:18 +03:00
mushka
5575789062 new props for DropdownItem: hight and heightTablet 2022-07-24 21:05:14 +03:00
7684fe7632 Web: Added 'Accounts' routing 2022-07-24 20:38:41 +03:00
c83811576c Web: Fix files-settings routing 2022-07-24 20:17:45 +03:00
7db4dcd407 Web: Client: Added missing code 2022-07-24 20:03:48 +03:00
c956d8b696 Web: Merged 'Files' module with 'Client' and fixed paths 2022-07-24 19:57:03 +03:00
mushka
42a2ce2292 Merge branch 'develop' into feature/create-room 2022-07-24 19:03:23 +03:00
mushka
2b119c35b7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-07-24 19:00:28 +03:00
mushka
93390a86ef fixes on dropdown component 2022-07-24 18:55:07 +03:00
mushka
11713f5b82 added ability to lock scroll on modal 2022-07-23 02:05:17 +03:00
2e5f2cb7a6 Web: Components: Themes: fix padding 2022-07-23 01:39:54 +03:00
a0f3e18b91 Web: Common: Article: fix style 2022-07-23 01:27:22 +03:00
79296c742f Web: Common: Article: fix header jump 2022-07-23 01:23:25 +03:00
6786fd40b0 Web: Common: Article: fix desktop width 2022-07-23 01:20:19 +03:00
3735ca16b3 Web: Common: Article: fix jumping 2022-07-23 00:53:40 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
1d10263162
Merge branch 'develop' into feature/remove-header 2022-07-22 18:59:13 +03:00
bf1ce10736 Web: Common: Article: fix styles 2022-07-22 16:20:01 +03:00
mushka
003dc33ba8 Merge branch 'develop' into feature/create-room 2022-07-22 14:35:47 +03:00
5479b3452b Web: Common: Article: fix style 2022-07-22 13:50:57 +03:00
b8e7eb9752 Web: Common: Article: fix area click 2022-07-22 13:43:27 +03:00
93d7221388 Web: Components: IconButton: add height 2022-07-22 13:43:11 +03:00
mushka
dba0fa32c7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-07-22 13:40:56 +03:00
23d6cb773e Web: Common: Article: fix styles 2022-07-22 13:29:22 +03:00
20d83a0059 Web: Common: Article: fix username 2022-07-22 12:53:02 +03:00
mushka
07e6ccbcf7 overall fixes and Image editor tryouts 2022-07-22 12:31:26 +03:00
mushka
bf4f2d5bad add ThirpartyComboBox 2022-07-22 12:30:53 +03:00
af85268ff1 Web: Common: Article: fix styles 2022-07-22 10:55:26 +03:00
180aa03d95 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-22 10:22:52 +03:00
TimofeyBoyko
9e3eb3c008 Web:Common:FilterInput: fix multy line of selected items 2022-07-22 05:37:17 +03:00
c15ca79dcb Web: Common: Article: fix styles 2022-07-21 18:40:45 +03:00
Artem Tarasov
284f0ef58d Web: Common/Client: deleted unnecessary comment, fix import tryRedirectTo 2022-07-21 18:05:23 +03:00
a288d72db2 Web: Common: Article: increase area click 2022-07-21 17:45:46 +03:00
afdd1b7908 Web: Components: ContextMenuButton: add iconClassName prop 2022-07-21 17:44:13 +03:00
459cc8d92e Web: Common: Article: truncate long text 2022-07-21 17:10:30 +03:00
bdb3860b54 Web: Common: Article: add redirect to home page 2022-07-21 16:51:19 +03:00
07d8339b6a Web: Common: Article: fix styles 2022-07-21 16:41:12 +03:00
Artem Tarasov
345dad709c Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 16:02:48 +03:00
mushka
682b256cbe Merge branch 'develop' into feature/create-room 2022-07-21 15:49:10 +03:00
ff04dcf1f4 Web: Common: Article: hide header on mobile 2022-07-21 14:45:28 +03:00
2fe786769f Web: Common: SettingsStore: fix logo url 2022-07-21 14:43:22 +03:00
831bdc578f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	packages/asc-web-common/components/Article/styled-article.js
#	products/ASC.Files/Client/src/Files.jsx
2022-07-21 14:22:28 +03:00
mushka
7e9290f3bc Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-07-21 14:19:25 +03:00
TimofeyBoyko
d742e5529c Web:Components:ContextMenu: delete useless code 2022-07-21 13:00:43 +03:00
TimofeyBoyko
77f8eecf78 Web:Files: fix header of context menu for rooms 2022-07-21 12:01:38 +03:00
77d311b636
Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 11:41:42 +03:00
TimofeyBoyko
1633d0782a Web:Files:TableView: fix view at room folder when info panel is open 2022-07-21 11:24:24 +03:00
TimofeyBoyko
59fb67d3d2 Web:Files:Filter: fix clear filter 2022-07-20 19:10:27 +03:00
TimofeyBoyko
9ca843c26e Web:Common:FilterInput: fix spread operator for changeFilterValue method 2022-07-20 18:51:24 +03:00
TimofeyBoyko
5f7fd97f46 Web:Common:Loaders: remove search block from filter block loader 2022-07-20 18:44:18 +03:00
TimofeyBoyko
1f918c7ee8 Web:Components:MainButtonMobile: fix display for rooms 2022-07-20 17:03:14 +03:00