Commit Graph

6395 Commits

Author SHA1 Message Date
866df98ca9 Web: Components: fixed button warning 2020-08-06 14:47:16 +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
f8b791fa54 Merge branch 'master' into feature/files 2020-08-04 10:33:33 +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
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
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
e4501f3cd6 Web: Files: added edit comment panel to VersionHistory 2020-07-31 17:24:57 +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
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
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
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
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
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
Vladislav Makhov
3728ab1018 Login checkbox: fix console error 2020-07-29 21:32:50 +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