|
|
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 |
|
|
|
72bc996a1a
|
Web: Files: added file operations to contextMenu, refactoring
|
2020-07-31 11:14:37 +03:00 |
|
|
|
547852e678
|
Web: Files: added new translations
|
2020-07-31 11:10:16 +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 |
|
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 |
|
|
|
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 |
|
|
|
e85c125900
|
Web: Files: refactoring VersionHistory page, fixed page crash when following a direct url
|
2020-07-30 10:52:19 +03:00 |
|
|
|
7fb40014dd
|
Web: Files: fixed VersionHitory header styles
|
2020-07-30 10:45:59 +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 |
|
Artem Tarasov
|
2bdac8f586
|
fix
|
2020-07-29 13:50:59 +03:00 |
|
