Commit Graph

4545 Commits

Author SHA1 Message Date
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
bcda6bf69f Api: refresh license 2020-08-11 11:52:39 +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
Ilya Oleshko
dd73e1ca7f web: components: bump version 2020-08-11 11:05:21 +03:00
Ilya Oleshko
0a17c876a6 Web: Components: Fixed test warning for ProgressBar 2020-08-11 11:04:08 +03:00
Ilya Oleshko
38b781f5fc Web: Components: Moved fix for GroupButtonsMenu, now click action used data-api, fixed test 2020-08-11 11:03:29 +03:00
Ilya Oleshko
a5fdb4a5a9 Web: Components: Moved fix for GroupButton, now click action used data-api, fixed test 2020-08-11 11:03:09 +03:00
Artem Tarasov
325d497cc0 fixed accept file 2020-08-10 18:40:46 +03:00
Artem Tarasov
d463a4ab25 fixed bugs upload incorrect file license after upload current 2020-08-10 18:25:04 +03:00
Artem Tarasov
70f3098fb2 fixed modal message and accept files 2020-08-10 18:06:20 +03:00
Artem Tarasov
d338f546e0 Added message about successful upload 2020-08-10 13:29:32 +03:00
Artem Tarasov
ef9b4d52e9 added input highlighting 2020-08-10 11:22:49 +03:00
Artem Tarasov
56bd4e8411 fixed upload license 2020-08-10 10:27:58 +03:00
Artem Tarasov
b8d42d53ed fixed language 2020-08-07 22:02:55 +03:00
Ilya Oleshko
0bae66814f Fix: Fixed file upload from form 2020-08-07 17:32:55 +03:00
Artem Tarasov
e6dea2c648 input-file fixed upload same file 2020-08-07 16:57:16 +03:00
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
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
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
2805c4e31c Web: Components: added tabIndex to scroll 2020-08-05 15:19:07 +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
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
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
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
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
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
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