Commit Graph

1084 Commits

Author SHA1 Message Date
72ebd235ec Merge branch 'feature/files' into feature/payments-enterprise 2020-09-07 18:42:57 +03:00
9778b258d7 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-07 18:41:51 +03:00
3729d92a5a web: common: bump version 2020-09-07 18:35:03 +03:00
1dff214c06 Web: Common: Remove error routing on 500 error 2020-09-07 18:34:47 +03:00
Artem Tarasov
797dd6c249 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-07 18:27:39 +03:00
Artem Tarasov
6d68dfd0c6 added redirect from / to homepage(settings in state.auth.settings.homepage) 2020-09-07 18:26:44 +03:00
9899880bff web: common: bump version 2020-09-07 17:32:02 +03:00
d9783ecf26 Web: Common: fixed sort-combobox styles, added isMobile prop 2020-09-07 17:31:36 +03:00
52104fafd6 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Common/src/api/client.js
2020-09-04 21:36:25 +03:00
a2f050590b Update yarn.lock files 2020-09-04 21:04:05 +03:00
cf53c32ff4 web: common: bump version 2020-09-04 20:54:50 +03:00
de41a366f6 Web: Client: Fixed layout in Wizard and removed useless constant 2020-09-04 20:34:00 +03:00
8907f8b315 Web: Common: API client: Added support of 402 and +500 statuses 2020-09-04 20:32:34 +03:00
ac8fa40c01 Web: Common: Added body text to Error520 2020-09-04 20:30:34 +03:00
22b7b8ff52 web: common: bump version 2020-09-04 15:57:06 +03:00
4fd7cffa63 Web: Common: fixed sort button 2020-09-04 15:56:49 +03:00
Ilya Oleshko
728b00ab93 web: common: bump version 2020-09-04 13:56:49 +03:00
Ilya Oleshko
4794084ef1 Web: Common: FilterInput : Fix default height for items 2020-09-04 13:56:37 +03:00
4686122183 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-04 10:15:48 +03:00
TatianaLopaeva
9b240a3539 Changed appsettings added window.location.href for 402 2020-09-03 17:01:59 +03:00
0eb3b2b4d3 Update yarn.lock files 2020-09-02 12:30:53 +03:00
0b208d2fa2 web: common: bump version 2020-09-02 12:19:46 +03:00
da50146545 Web: Clients: Added useEffect for changeLanguage call if functional components (issue: Warning: Cannot update a component https://fb.me/setstate-in-render) 2020-09-02 12:19:21 +03:00
4babaa5e67 Web: People: Fixed work with customNames 2020-09-02 11:59:36 +03:00
Artem Tarasov
f28406832b web: common: bump version 2020-09-01 18:33:54 +03:00
Artem Tarasov
dfb32288e8 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-01 18:32:48 +03:00
Ilya Oleshko
a2a2e6cda2 web: common: bump version 2020-09-01 16:07:15 +03:00
Ilya Oleshko
8edef50722 Web: Common: PageLayout : Fix ReactResizeDetector options for fast resize 2020-09-01 16:07:07 +03:00
Ilya Oleshko
8e04466542 web: common: bump version 2020-09-01 15:26:59 +03:00
Ilya Oleshko
4e663b9514 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-01 15:25:43 +03:00
Ilya Oleshko
f1902e1ec6 Web: Common: PageLayout : Added size calculating on first mount for ReactResizeDetector 2020-09-01 15:22:49 +03:00
Artem Tarasov
f61799f1b4 added export Error520 2020-09-01 14:56:23 +03:00
TatianaLopaeva
6ee4cbc5b4 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-01 11:05:58 +03:00
Artem Tarasov
ba42cdcb71 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-01 10:16:53 +03:00
Artem Tarasov
d560610396 web: common: bump version 2020-09-01 10:15:27 +03:00
Artem Tarasov
461cb53b4e added getFilesSettings 2020-09-01 01:05:28 +03:00
062a3a793f Update yarn.lock files 2020-08-31 17:45:37 +03:00
fa6144919e web: common: bump version 2020-08-31 17:36:05 +03:00
d16652f051 Web: Common: fixed login page for new PageLayout body 2020-08-31 17:35:39 +03:00
36e283fc5c web: common: bump version 2020-08-31 16:34:56 +03:00
2db018dcf6 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-31 13:52:34 +03:00
44aaf5267e Web: Common: fixed section styles 2020-08-31 13:31:39 +03:00
d9f70df70a Update yarn.lock files 2020-08-31 12:42:36 +03:00
1fb90663ee Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-31 10:04:45 +03:00
927d7619a7 web: common: bump version 2020-08-31 10:04:24 +03:00
a4a9234328 Web: Common: added react-resize-detector package, fixed styles 2020-08-31 10:03:19 +03:00
Artem Tarasov
b859f35e5e implemented access to admin settings by checking the value of the isAdmin property in state.auth.user.isAdmin. Added api methods 2020-08-28 12:13:53 +03:00
TatianaLopaeva
2022bd4ac1 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-28 10:57:59 +03:00
TatianaLopaeva
4fb43397d7 Added translation for payments in StudioLayoute 2020-08-28 10:48:45 +03:00
TatianaLopaeva
8bea385182 Added a link and icon for payments in StudioLayout 2020-08-28 10:46:37 +03:00
Artem Tarasov
00337a45ed web: common: bump version 2020-08-27 13:36:21 +03:00
Artem Tarasov
2b36634f96 added Error403 2020-08-27 13:33:06 +03:00
Artem Tarasov
84d4446b23 added api methods for settings, refactoring 2020-08-27 10:38:46 +03:00
0c518770d9 web: common: bump version 2020-08-26 11:35:50 +03:00
82af63f80d Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-26 11:35:19 +03:00
28dc9efd16 Web: Common: moved DragAndDrop component 2020-08-26 11:30:46 +03:00
b91d86340c web: common: bump version 2020-08-25 16:28:35 +03:00
667b3f0032 web: common: Fixed Cannot update a component from inside the function body of a different component (issue: call of i18n.changeLanguage without useEffect) 2020-08-25 16:28:14 +03:00
9f3413841e web: common: bump version 2020-08-25 14:09:32 +03:00
366821d868 Web: Common: fixed filter 2020-08-25 14:03:49 +03:00
Ilya Oleshko
46425cd159 web: common: bump version 2020-08-25 13:07:38 +03:00
Ilya Oleshko
a003d65f66 Web: People: FilterBlock : Fixed showItem condition for simple selector 2020-08-25 13:07:22 +03:00
e9b0775605 web: common: bump version 2020-08-21 17:38:38 +03:00
42927df84d Web: Common: fixed selector selected group 2020-08-21 17:38:11 +03:00
f29fad894f web: common: bump version 2020-08-21 16:20:01 +03:00
76d48fabdd Web: Common: fixed the display and closing of the filter 2020-08-21 16:18:17 +03:00
28b6f56aee web: common: bump version 2020-08-20 17:41:50 +03:00
d58cdc3cc5 Web: Common: fixed selector styles 2020-08-20 17:39:57 +03:00
49f77646a5 web: common: bump version 2020-08-20 12:46:31 +03:00
14abe9c3f4 Web: Common: fixed profile menu 2020-08-20 12:45:59 +03:00
8d11e1b0c8 Web: Clients: Changed interaction with serviceWorker 2020-08-19 20:00:41 +03:00
eb19b4ee38 web: common: bump version 2020-08-19 14:58:46 +03:00
d7b5444385 Web: Common: fixed selector styles 2020-08-19 14:58:23 +03:00
140c79ad16 web: common: bump version 2020-08-19 10:39:21 +03:00
9b491cf1d8 Web: Common: added aside panel to context-menu-button 2020-08-19 10:37:52 +03:00
49ead142d0 web: common: bump version 2020-08-18 17:05:11 +03:00
32f335ba50 Web: Common: added new styles 2020-08-18 17:02:20 +03:00
6fc134f16b web: common: bump version 2020-08-18 10:48:34 +03:00
ef34adb788 Web: Common: fixed Selector 2020-08-18 10:47:33 +03:00
59f54e0cd5 web: common: bump version 2020-08-17 16:49:58 +03:00
9fb1a37af3 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-17 16:49:05 +03:00
eb9592abd5 Web: Common: fixed selector styles, fixed filter styles 2020-08-17 16:45:14 +03:00
5d5083f40b web: common: bump version 2020-08-17 15:38:59 +03:00
d7920176e0 Web: Common: i18nBaseSettings: restored interpolation.format + turned on useSuspense 2020-08-17 15:38:53 +03:00
df96f4cd0a web: common: bump version 2020-08-17 15:37:30 +03:00
08e27857d8 web: common: bump version 2020-08-17 14:44:08 +03:00
c16c9b280a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-17 14:19:19 +03:00
fb44538e69 web: common: bump version 2020-08-14 22:35:30 +03:00
105ac1a577 Web Common: simplified configuration of i18n 2020-08-14 22:32:21 +03:00
c398eb8229 Web Client: simplified configuration of i18n (+ removed useless requests) 2020-08-14 22:14:42 +03:00
91e3db56cb web: common: bump version 2020-08-14 17:08:08 +03:00
129160c35e Web: Common: fixed filter styles 2020-08-14 17:06:08 +03:00
34696bfc37 web: common: bump version 2020-08-14 13:02:56 +03:00
7bd1e7abe1 Web: Files: added version api 2020-08-14 13:02:23 +03:00
18e3ff6bc6 web: common: bump version 2020-08-13 14:42:57 +03:00
0626d82fa8 Web: Files: added unblock/check-in api 2020-08-13 14:42:29 +03:00
Ilya Oleshko
37fe1cab21 Merge branch 'master' into feature/files 2020-08-12 18:05:29 +03:00
Artem Tarasov
c6d1198ae0 deleted console.log, simple condition 2020-08-12 16:38:34 +03:00
Alexey
512de9658e web: common: bump version 2020-08-12 16:11:37 +03:00
Alexey
73d1cf269b Web: Common: Added keyboard events to MediaViewer 2020-08-12 16:11:30 +03:00
Artem Tarasov
171ae1b147 web: common: bump version 2020-08-12 14:57:41 +03:00
Artem Tarasov
1503bc105b fix link 2020-08-12 11:54:08 +03:00
57cd398457 web: common: bump version 2020-08-12 11:08:42 +03:00
181c1e52f4 Web: Files: added version history api 2020-08-12 11:08:04 +03:00
d529fcd69c web: common: bump version 2020-08-11 17:49:46 +03:00
408de4246f Web: Common: fixed files selection 2020-08-11 17:49:20 +03:00
5c67e42a74 web: common: bump version 2020-08-11 17:36:59 +03:00
5f32a94db0 Web: Common: fixed file selection 2020-08-11 17:36:22 +03:00
Ilya Oleshko
7e8fb518ce web: common: bump version 2020-08-11 16:00:25 +03:00
Ilya Oleshko
fdbdf6a8b6 Web: Common: PageLayout: Fixed selection on draging 2020-08-11 15:53:39 +03:00
Ilya Oleshko
211b20499f Web: Common: Login: Fixed Login container 2020-08-11 15:40:34 +03:00
Ilya Oleshko
3de0e34389 Web: Common: PageLayout: Fixed StudioLayout container 2020-08-11 15:39:17 +03:00
Ilya Oleshko
47889d384f Web: Common: PageLayout: Fixed PrivateRoute container 2020-08-11 15:37:34 +03:00
Ilya Oleshko
89bfd913e6 Web: Common: PageLayout: Fixed ExternalRedirect container 2020-08-11 15:36:36 +03:00
Ilya Oleshko
66adcdcefe Web: Common: PageLayout: Fixed PageLayout sub components to class components 2020-08-11 15:35:24 +03:00
Ilya Oleshko
d02afe646a Web: Common: PageLayout: Fixed PageLayout for children logic 2020-08-11 15:34:00 +03:00
Ilya Oleshko
fdb4f43028 Web: Common: PageLayout: Removed function (new) layout 2020-08-11 15:31:45 +03:00
Ilya Oleshko
4684c6ec84 Web: Common: PageLayout: Added SectionBodyContent container 2020-08-11 15:30:14 +03:00
Ilya Oleshko
8a2de16b91 web: common: bump version 2020-08-11 11:23:08 +03:00
Ilya Oleshko
a2dface5ac Web: Common: Filter: Moved function initialization out of render 2020-08-11 11:11:48 +03:00
Artem Tarasov
c4ba6adee2 fixed an error related to requesting the state.wizard.wizardCompleted key in PublicRoute. Fixed translation and layout 2020-08-06 00:01:41 +03:00
Artem Tarasov
5c8efbd7c5 upload license 2020-08-05 15:27:28 +03:00
Artem Tarasov
8257c957cb fix upload license 2020-08-04 16:39:05 +03:00
Artem Tarasov
5ccc0fc21c upload fix 2020-08-04 11:48:43 +03:00
Artem Tarasov
bdeedbbb42 added seLicense() 2020-08-03 22:36:13 +03:00
Artem Tarasov
555eac84b8 add method getIsRequiredLicense 2020-08-03 22:04:49 +03:00
Artem Tarasov
afc8803ff4 added timezone transfer 2020-08-03 16:14:05 +03:00
Artem Tarasov
90cda6ef62 fixed redirect to /login 2020-08-03 10:57:58 +03:00
72ae1f5e9b Merge branch 'master' into feature/Wizard
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Common/src/api/settings/index.js
2020-07-31 16:49:54 +03:00
Ilya Oleshko
b11f0b4700 web: common: bump version 2020-07-31 15:11:09 +03:00
Ilya Oleshko
fa8a0b92d8 Merge branch 'master' into feature/files 2020-07-31 15:05:58 +03:00
Artem Tarasov
d8f25319a1 fixed redirect drom login page 2020-07-31 14:31:46 +03:00
Vladislav Makhov
1f93279d13 Code format 2020-07-31 13:23:53 +03:00
Artem Tarasov
2e42c813b8 fixed actions 2020-07-30 13:50:13 +03:00
Vladislav Makhov
175b0f7bda fix styles 2020-07-30 13:25:40 +03:00
6fabf36bbf web: common: bump version 2020-07-30 11:56:20 +03:00
5cd4a1aaa8 Web: Common: fixed SelectedFrame select target 2020-07-30 11:55:36 +03:00
Vladislav Makhov
13a4bae881 Fix toastr 2020-07-29 17:13:40 +03:00
Artem Tarasov
e949ff75ba added Layout 2020-07-29 13:05:23 +03:00
Artem Tarasov
4c9a7dadfd Merge branch 'master' into feature/Wizard
# Conflicts:
#	web/ASC.Web.Common/src/api/settings/index.js
2020-07-29 11:52:18 +03:00
0231e60cc7 Merge branch 'master' into feature/files
# Conflicts:
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
#	web/ASC.Web.Components/src/index.js
2020-07-28 17:34:46 +03:00
Vladislav Makhov
c54129bf33 Recover: fix translation 2020-07-28 13:25:09 +03:00
Vladislav Makhov
8d41d2dbc2 Register: add translations 2020-07-28 11:07:34 +03:00
Vladislav Makhov
5ef9d20f64 Register: add working with api 2020-07-28 11:07:12 +03:00
Vladislav Makhov
1f1a6891b2 Style fixes 2020-07-28 10:29:55 +03:00
Vladislav Makhov
ddf497bac4 Merge differences from master after header fix 2020-07-28 10:24:53 +03:00
Vladislav Makhov
39150efb4f Merge branch 'master' into feature/new-login-page
# Conflicts:
#	web/ASC.Web.Common/src/components/Layout/i18n.js
#	web/ASC.Web.Common/src/components/Layout/index.js
#	web/ASC.Web.Common/src/components/Layout/locales/en/translation.json
#	web/ASC.Web.Common/src/components/Layout/locales/ru/translation.json
2020-07-27 17:28:28 +03:00
Vladislav Makhov
cfdf71157f Fix 2020-07-27 16:41:15 +03:00
Vladislav Makhov
86170f2923 Fix styles 2020-07-27 16:36:02 +03:00
Vladislav Makhov
3fdfb6211d Fix translation 2020-07-27 15:51:04 +03:00
Vladislav Makhov
1b6d1b24c1 Add api post data 2020-07-27 14:37:21 +03:00
Vladislav Makhov
64e0a940e1 PropTypes 2020-07-24 16:20:35 +03:00
Vladislav Makhov
c07f4cf713 Set mock 2020-07-24 16:04:54 +03:00
Vladislav Makhov
7a3ff1c401 Fix validate 2020-07-24 15:50:54 +03:00
Vladislav Makhov
5315eb3bfc Fix styles 2020-07-24 15:47:08 +03:00
Vladislav Makhov
362f1cca02 Fix render 2020-07-24 15:35:24 +03:00
Vladislav Makhov
b3abfa05cc Add recover access 2020-07-24 15:31:23 +03:00
Vladislav Makhov
68f3139c46 Add translations 2020-07-24 15:12:31 +03:00
Vladislav Makhov
749702248d Refactor 2020-07-24 14:49:01 +03:00
Vladislav Makhov
53cb292fa9 Fix styles 2020-07-24 14:48:54 +03:00
Vladislav Makhov
e751296adb Unauth header init 2020-07-24 14:21:13 +03:00
8683983ae0 web: common: bump version 2020-07-24 10:37:03 +03:00
226dfc79df Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-24 10:35:05 +03:00
f8345f18ce Web: Common: fixed SelectedFrame, added scrolling, fixed selection in tile display 2020-07-24 10:34:53 +03:00
Vladislav Makhov
14867e5af2 Fix view 2020-07-23 16:35:04 +03:00
Vladislav Makhov
54117509ff Fix styles 2020-07-23 16:07:35 +03:00
Vladislav Makhov
2d5c92b628 Move props to a separate file 2020-07-23 15:54:55 +03:00
Vladislav Makhov
c146edbc3a Refactoring 2020-07-23 15:39:19 +03:00
Vladislav Makhov
7d3d79eb5d Fix styles 2020-07-23 15:37:35 +03:00
Vladislav Makhov
3adb650e12 Add translations 2020-07-23 15:22:24 +03:00
Vladislav Makhov
ae59b91a85 Add register modal dialog 2020-07-23 15:22:09 +03:00
Vladislav Makhov
0c905a3e7a Rename modal-dialog.js to forgot-password-modal-dialog.js 2020-07-23 15:20:59 +03:00
Vladislav Makhov
a92dec4449 Add register visibility 2020-07-23 09:50:42 +03:00
Vladislav Makhov
967757b348 Fix styles 2020-07-22 13:47:56 +03:00
Artem Tarasov
1a8aacebdc Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Resource.Manager/Startup.cs
#	web/ASC.Web.Components/src/components/password-input/index.js
2020-07-21 13:13:47 +03:00
Vladislav Makhov
a4d1481faf tabIndex fix 2020-07-20 17:41:17 +03:00
Vladislav Makhov
19355a9a58 Fix autofocus 2020-07-20 17:23:47 +03:00
Vladislav Makhov
bda1b1c6a8 Fix console errors 2020-07-20 16:07:36 +03:00
Vladislav Makhov
36fc8875fb Fix console errors 2020-07-20 16:01:59 +03:00
Vladislav Makhov
6b39d62e0b Delete unused code 2020-07-20 16:01:11 +03:00
Vladislav Makhov
dabba4514e Fix styles 2020-07-20 15:39:33 +03:00
Vladislav Makhov
12bc78f3a9 Fix console error 2020-07-20 10:17:21 +03:00
Vladislav Makhov
30631f0ce5 Fix validate 2020-07-18 08:37:25 +03:00
Vladislav Makhov
e769ff55c2 Fix styles 2020-07-18 08:35:28 +03:00
be81ca291d Update yarn.lock files + bump versions 2020-07-17 18:03:08 +03:00
d094546147 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
2020-07-17 17:48:50 +03:00
ea318c3b05 Merge branch 'master' into feature/new-login-page 2020-07-17 17:44:28 +03:00
ec20c66c5d Update yarn.lock files 2020-07-17 17:43:39 +03:00
Vladislav Makhov
787b3c2a80 Merge branch 'master' into feature/new-login-page
# Conflicts:
#	web/ASC.Web.Components/src/components/password-input/index.js
#	web/ASC.Web.Components/src/components/password-input/password-input.stories.js
2020-07-17 10:34:33 +03:00
679e77a3ea Update yarn.lock files 2020-07-16 16:09:09 +03:00
098e872a38 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
2020-07-16 15:58:43 +03:00
f0b50f7185 web: common: bump version 2020-07-16 15:54:24 +03:00
ec8c6a5ddb Fixed security vulnerability in lodash 2020-07-16 15:54:04 +03:00
78b10ab893 Update yarn.lock files 2020-07-16 14:55:40 +03:00
Alexey
3fd30e7a83 web: common: bump version 2020-07-15 19:06:14 +03:00
Alexey
965b2e97d3 Web: Common: Tile view temporarily hidden 2020-07-15 19:05:40 +03:00
Vladislav Makhov
a7b0968252 Add social buttons mock 2020-07-15 16:18:09 +03:00
Alexey
dd000d197d Web: Common: Removed viewSelector from people module 2020-07-15 16:12:10 +03:00
Vladislav Makhov
55a0c01183 Fix styles 2020-07-15 10:12:49 +03:00
Alexey
62ed90e9a0 web: common: bump version 2020-07-15 07:59:56 +03:00