Commit Graph

4595 Commits

Author SHA1 Message Date
Artem Tarasov
3b8796ca93 refactoring 2020-08-07 13:39:53 +03:00
9362a05d57 web: components: bump version 2020-08-06 14:48:27 +03:00
866df98ca9 Web: Components: fixed button warning 2020-08-06 14:47:16 +03:00
Alexey
d514d8399b Web: Client: Settings: Added translate keys, refactoring 2020-08-06 10:50:04 +03:00
Alexey
2a0641decb Web: Components: Added SaveCancelButtons component 2020-08-06 10:00:41 +03:00
Artem Tarasov
3838c5ae39 fix 2020-08-06 09:44:52 +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
Alexey
5a93916314 Web: Client: Settings: Refactoring 2020-08-05 18:08:49 +03:00
Artem Tarasov
5c8efbd7c5 upload license 2020-08-05 15:27:28 +03:00
a8576da190 web: components: bump version 2020-08-05 15:19:53 +03:00
Alexey
2dd3f6e3fa Web: Client: Settings: Fixed save custom title 2020-08-05 15:19:51 +03:00
2805c4e31c Web: Components: added tabIndex to scroll 2020-08-05 15:19:07 +03:00
Alexey
dba555e2b7 Web: Client: Settings: Updated customization and custom-titles pages, small actions fix 2020-08-04 17:53:32 +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
Alexey
5148c7d54e Web: Client: Settings: Added SaveSettingsButtons component to custom-tiles page 2020-08-04 10:46:36 +03:00
58a0b5dd7a Settings: remove check password settings 2020-08-04 10:32:40 +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
1dd404187b Settings: fix 2020-08-03 18:34:53 +03:00
178bf82c28 Settings: fix 2020-08-03 17:06:37 +03:00
39b984debd Settings: added license/required and license upload 2020-08-03 16:42:59 +03:00
Artem Tarasov
afc8803ff4 added timezone transfer 2020-08-03 16:14:05 +03:00
f6d71ad1f6 Wizard: Complete. Timezone 2020-08-03 15:01:02 +03:00
a6b11e84c5 Settings: Added create timezones 2020-08-03 14:22:22 +03:00
Artem Tarasov
588c043046 Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard 2020-08-03 11:06:18 +03:00
Artem Tarasov
90cda6ef62 fixed redirect to /login 2020-08-03 10:57:58 +03:00
0a8bf7f830 Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard 2020-08-02 21:04:27 +03:00
4b6c0a0261 Merge branch 'master' into feature/Wizard 2020-08-02 21:03:56 +03:00
Alexey
c5a99950d5 Web: Client: Settings: Fixed save button event 2020-08-02 11:03:08 +03:00
Alexey
547e95f8e9 Web: Client: Settings: Show a reminder only after re-visiting the page with unsaved changes 2020-08-02 10:36:15 +03:00
Alexey
d588567ac6 Web: Client: Settings: SaveSettingsButtons mobile style fix 2020-08-02 09:38:59 +03:00
Alexey
1d1740e7e4 Web: Client: Settings: Added a handler for the cancel button 2020-08-02 07:54:44 +03:00
Artem Tarasov
f988fa5573 refactoring layout 2020-08-01 19:10:21 +03:00
Artem Tarasov
d13383f507 refactoring styles 2020-08-01 02:00:40 +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
Artem Tarasov
652371a42c fixed layout 2020-07-31 16:02:59 +03:00
Artem Tarasov
f95d788516 fixed modal 2020-07-31 15:20:12 +03:00
Ilya Oleshko
b11f0b4700 web: common: bump version 2020-07-31 15:11:09 +03:00
Ilya Oleshko
df44923e5a web: components: bump version 2020-07-31 15:10:53 +03:00
Ilya Oleshko
fa8a0b92d8 Merge branch 'master' into feature/files 2020-07-31 15:05:58 +03:00
Artem Tarasov
b40a6d91bc added ErrorContainer if wizard not init 2020-07-31 15:05:28 +03:00
Artem Tarasov
d8f25319a1 fixed redirect drom login page 2020-07-31 14:31:46 +03:00
Vladislav Makhov
6463e30762 Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page 2020-07-31 13:24:08 +03:00
Vladislav Makhov
1f93279d13 Code format 2020-07-31 13:23:53 +03:00
07649e2dac web: components: bump version 2020-07-31 12:15:19 +03:00
8ce8aed45d Web: Files: fixed items select 2020-07-31 12:14:44 +03:00
Alexey
c014cdff3b Merge branch 'feature/customization' of github.com:ONLYOFFICE/AppServer into feature/customization 2020-07-31 11:35:29 +03:00
Alexey
f497aa5ba2 Web: Client: Settings: Added saveSettingButtons component, added system for saving temporary settings without applying 2020-07-31 11:35:14 +03:00
5da656e41d web: components: bump version 2020-07-31 11:31:30 +03:00
08ba989ab5 Web: Components: fixed row warning 2020-07-31 11:30:55 +03:00
ffed684c3b web: components: bump version 2020-07-31 11:15:25 +03:00
2c83d4a6f1 Web: Components: added support for right-clicking on a row and click a context-menu-button 2020-07-31 11:08:33 +03:00
Artem Tarasov
a1d2c2c4f0 Merge branch 'master' into feature/Wizard 2020-07-30 16:04:11 +03:00
Ilya Oleshko
d575bc610d Merge branch 'master' into feature/new-login-page 2020-07-30 16:03:02 +03:00
Artem Tarasov
0cb324682a web: components: bump version 2020-07-30 14:17:51 +03:00
Artem Tarasov
3674d56373 added display setting for texttooltip 2020-07-30 14:16:44 +03:00
Artem Tarasov
84773e6c13 Merge branch 'master' into feature/input-password-wizard 2020-07-30 13:51:51 +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
Artem Tarasov
d09b512126 web: components: bump version 2020-07-30 13:08:28 +03:00
Artem Tarasov
2a049f8d78 before merge 2020-07-30 13:07:05 +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
e1a16e54c9 web: components: bump version 2020-07-30 11:10:46 +03:00
ceaead8ee6 Web: Components: added new class names to row 2020-07-30 11:09:50 +03:00
Artem Tarasov
70b95179f0 refactoring 2020-07-29 23:27:56 +03:00
Vladislav Makhov
3728ab1018 Login checkbox: fix console error 2020-07-29 21:32:50 +03:00
Artem Tarasov
0bafcc7b1d refactoring 2020-07-29 19:01:57 +03:00
Artem Tarasov
baf77c3979 fix styles, refactoring 2020-07-29 18:16:16 +03:00
Vladislav Makhov
871b03a4cf Recover modal: fix console errors 2020-07-29 17:44:42 +03:00
Vladislav Makhov
13a4bae881 Fix toastr 2020-07-29 17:13:40 +03:00
Artem Tarasov
f09a959e84 fix 2020-07-29 14:01:29 +03:00
Artem Tarasov
232351af6c fix 2020-07-29 14:00:59 +03:00
Artem Tarasov
2bdac8f586 fix 2020-07-29 13:50:59 +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
Artem Tarasov
53e8550621 fixed style, added props minWidth 2020-07-29 11:32:57 +03:00
Artem Tarasov
8015f5bf90 web: components: bump version 2020-07-29 09:59:58 +03:00
Artem Tarasov
c4ce07bec7 fix layout 2020-07-29 09:59:39 +03:00
Artem Tarasov
c14d2a47dc Merge branch 'master' into feature/input-password-wizard
# Conflicts:
#	web/ASC.Web.Components/package.json
2020-07-29 09:39:01 +03:00
Alexey
dffe73d470 Merge branch 'feature/files' into feature/customization 2020-07-29 08:54:00 +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
2371953954 Settings: fix greetingsettings 2020-07-28 14:41:51 +03:00
Vladislav Makhov
4aed1a7a09 Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page 2020-07-28 13:32:36 +03:00
Vladislav Makhov
c54129bf33 Recover: fix translation 2020-07-28 13:25:09 +03:00
c325cb139d Settings: added authproviders and login.ashx 2020-07-28 11:13:49 +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
Alexey
e7d3b6000b Web: Client: Settings: Fix mobile styles on customization page 2020-07-28 10:17:32 +03:00
Alexey
7982194f5a Web: Client: Settings: Fix language-and-time-zone and customization pages, refactoring 2020-07-27 18:13:01 +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
Alexey
3ec06cab83 Web: Client: Settings: Fix custom-tiles page, refactoring 2020-07-27 17:24:41 +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
Alexey
27055fb58a Web: Client: Settings: Refactoring customization page 2020-07-27 14:39:28 +03:00
Vladislav Makhov
1b6d1b24c1 Add api post data 2020-07-27 14:37:21 +03:00
Alexey
c2ad40995e Web: Client: Settings: Added custom-titles page, updated customization page 2020-07-27 09:38:02 +03:00
f9dc19526c Added sendjoininvite, sendadmmail 2020-07-24 17:01:20 +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
Artem Tarasov
aca4ce9c32 added checking, refacktoring 2020-07-24 15:30:11 +03:00
Vladislav Makhov
68f3139c46 Add translations 2020-07-24 15:12:31 +03:00
Vladislav Makhov
05ade13438 Add UnionIcon 2020-07-24 15:02:34 +03:00
Vladislav Makhov
01341cf4ba web: components: bump version 2020-07-24 15:02:15 +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
Vladislav Makhov
20b67c8261 Fix Box export 2020-07-24 14:18:03 +03:00
Vladislav Makhov
aa1f8959ab web: components: bump version 2020-07-24 14:17:37 +03:00
3d449d4863 web: components: bump version 2020-07-24 13:53:03 +03:00
779c81037f Web: Components: hid the drop-down in the progress bar 2020-07-24 13:51:10 +03:00
Artem Tarasov
f6d0e5aab7 fix style 2020-07-24 12:14:41 +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
Artem Tarasov
cbda5efd21 refactoring styles of settings-box 2020-07-24 09:39:11 +03:00
Artem Tarasov
64d488a550 Merge branch 'master' into feature/Wizard 2020-07-24 08:49:38 +03:00
Artem Tarasov
fb61263fde web: components: bump version 2020-07-23 19:12:42 +03:00
Artem Tarasov
499451892e Merge branch 'master' into feature/input-password-wizard 2020-07-23 19:05:56 +03:00
Alexey
b35af29ec8 Web: Client: Settings: Updated section header, refactoring 2020-07-23 18:56:57 +03:00
Artem Tarasov
cfd0cf7bb6 fix tests 2020-07-23 18:45:00 +03:00
Artem Tarasov
da546fbb86 web: components: bump version 2020-07-23 16:43:51 +03:00
Artem Tarasov
08f5b5e0f8 fixed outline, fixed error when file upload refused, export fix 2020-07-23 16:42:49 +03:00
Alexey
e067346d2c Web: Client: Settings: Routing, updated tree 2020-07-23 16:37:18 +03:00
Vladislav Makhov
14867e5af2 Fix view 2020-07-23 16:35:04 +03:00
Artem Tarasov
5bf6f7de50 added onInputFileHandler 2020-07-23 16:26:32 +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
Artem Tarasov
8fd658ced9 added FileInput 2020-07-23 15:52:20 +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
Artem Tarasov
92a09334a4 Merge branch 'master' into feature/Wizard 2020-07-23 13:42:21 +03:00
Artem Tarasov
ad65f3eb1b web: components: bump version 2020-07-23 13:39:15 +03:00
Artem Tarasov
64083849ff Merge branch 'master' into feature/input-password-wizard 2020-07-23 13:38:52 +03:00
Artem Tarasov
a0b99cc097 refactoring 2020-07-23 12:35:42 +03:00
Artem Tarasov
6a3922accc added functionality to change email 2020-07-23 11:16:55 +03:00
Artem Tarasov
dcee7b97b8 layout fix, added new view 2020-07-23 11:03:30 +03:00
Vladislav Makhov
a92dec4449 Add register visibility 2020-07-23 09:50:42 +03:00
Artem Tarasov
037bed591f styles fix 2020-07-22 18:47:37 +03:00