|
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 |
|
|
6c69ece258
|
Web: Files: added close events by keys, fixed focus in aside
|
2020-08-05 15:17:21 +03:00 |
|
|
518648cb19
|
Fix parse license
|
2020-08-04 17:29:43 +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 |
|
|
f8b791fa54
|
Merge branch 'master' into feature/files
|
2020-08-04 10:33:33 +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 |
|
|
7055672075
|
Web: Files: fixed document edit
|
2020-08-04 09:44:22 +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 |
|
|
483906fed8
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-08-03 18:29:41 +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 |
|
|
34c2252b25
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-08-02 22:31:52 +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 |
|
|
e4501f3cd6
|
Web: Files: added edit comment panel to VersionHistory
|
2020-07-31 17:24:57 +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 |
|
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 |
|
|
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 |
|
|
018298e921
|
Web: Files: fixed row warning
|
2020-07-31 11:31:11 +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 |
|