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 |
|
|
a9e8c89240
|
Files: fix add tag
|
2020-08-04 10:30:09 +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 |
|
|
1701db1a91
|
Files: fix CompleteVersion
|
2020-08-03 18:28:34 +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 |
|
|
6253b151e1
|
fix ChangeHistory, UpdateFile, added UpdateComment
|
2020-08-02 21:48: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 |
|
Artem Tarasov
|
b40a6d91bc
|
added ErrorContainer if wizard not init
|
2020-07-31 15:05:28 +03:00 |
|
Ilya Oleshko
|
cfc40a6487
|
Merge pull request #63 from ONLYOFFICE/feature/new-login-page
Feature/new login page
|
2020-07-31 14:49:18 +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 |
|
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 |
|
Ilya Oleshko
|
9515f755f4
|
Merge pull request #59 from ONLYOFFICE/feature/input-password-wizard
Feature/input password wizard
|
2020-07-30 16:00:37 +03:00 |
|
Artem Tarasov
|
9d4874cd1a
|
Merge branch 'feature/input-password-wizard' of github.com:ONLYOFFICE/AppServer into feature/input-password-wizard
|
2020-07-30 14:19:26 +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 |
|
Ilya Oleshko
|
cb585ac360
|
Merge branch 'master' into feature/input-password-wizard
|
2020-07-30 13:42:19 +03:00 |
|
Ilya Oleshko
|
ed9d92340a
|
Merge pull request #62 from ONLYOFFICE/hotfix/button
Hotfix/button
|
2020-07-30 13:41:06 +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 |
|
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 |
|
|
18b2935c12
|
fix merge
|
2020-07-29 14:52:37 +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 |
|