|
5795c6f324
|
Merge branch 'feature/files' into feature/customization
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Components/src/index.js
|
2020-08-13 10:07:14 +03:00 |
|
Ilya Oleshko
|
b005ae7c50
|
Web: Components: Fix missing import
|
2020-08-12 18:22:22 +03:00 |
|
Ilya Oleshko
|
37fe1cab21
|
Merge branch 'master' into feature/files
|
2020-08-12 18:05:29 +03:00 |
|
Alexey
|
a8c0973d42
|
Merge branch 'feature/files' into feature/customization
|
2020-08-12 11:57:32 +03:00 |
|
Alexey
|
f252c91966
|
Web: Components: Moved avatar rotation button
|
2020-08-12 09:03:56 +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 |
|
Alexey
|
4a7933cab6
|
Merge branch 'feature/files' into feature/customization
|
2020-08-10 12:59:53 +03:00 |
|
Artem Tarasov
|
e6dea2c648
|
input-file fixed upload same file
|
2020-08-07 16:57:16 +03:00 |
|
|
866df98ca9
|
Web: Components: fixed button warning
|
2020-08-06 14:47:16 +03:00 |
|
Alexey
|
d514d8399b
|
Web: Client: Settings: Added translate keys, refactoring
|
2020-08-06 10:50:04 +03:00 |
|
Alexey
|
2a0641decb
|
Web: Components: Added SaveCancelButtons component
|
2020-08-06 10:00:41 +03:00 |
|
|
2805c4e31c
|
Web: Components: added tabIndex to scroll
|
2020-08-05 15:19:07 +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 |
|
Ilya Oleshko
|
fa8a0b92d8
|
Merge branch 'master' into feature/files
|
2020-07-31 15:05:58 +03:00 |
|
Artem Tarasov
|
d8f25319a1
|
fixed redirect drom login page
|
2020-07-31 14:31:46 +03:00 |
|
|
8ce8aed45d
|
Web: Files: fixed items select
|
2020-07-31 12:14:44 +03:00 |
|
|
08ba989ab5
|
Web: Components: fixed row warning
|
2020-07-31 11:30:55 +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
|
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 |
|
|
ceaead8ee6
|
Web: Components: added new class names to row
|
2020-07-30 11:09:50 +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 |
|
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
|
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
|
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 |
|
Alexey
|
dffe73d470
|
Merge branch 'feature/files' into feature/customization
|
2020-07-29 08:54:00 +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
|
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 |
|
Alexey
|
c2ad40995e
|
Web: Client: Settings: Added custom-titles page, updated customization page
|
2020-07-27 09:38:02 +03:00 |
|
Vladislav Makhov
|
05ade13438
|
Add UnionIcon
|
2020-07-24 15:02:34 +03:00 |
|
Vladislav Makhov
|
20b67c8261
|
Fix Box export
|
2020-07-24 14:18:03 +03:00 |
|
|
779c81037f
|
Web: Components: hid the drop-down in the progress bar
|
2020-07-24 13:51:10 +03:00 |
|
Artem Tarasov
|
f6d0e5aab7
|
fix style
|
2020-07-24 12:14:41 +03:00 |
|
Artem Tarasov
|
64d488a550
|
Merge branch 'master' into feature/Wizard
|
2020-07-24 08:49:38 +03:00 |
|
Artem Tarasov
|
499451892e
|
Merge branch 'master' into feature/input-password-wizard
|
2020-07-23 19:05:56 +03:00 |
|
Artem Tarasov
|
cfd0cf7bb6
|
fix tests
|
2020-07-23 18:45:00 +03:00 |
|
Artem Tarasov
|
08f5b5e0f8
|
fixed outline, fixed error when file upload refused, export fix
|
2020-07-23 16:42:49 +03:00 |
|
Artem Tarasov
|
5bf6f7de50
|
added onInputFileHandler
|
2020-07-23 16:26:32 +03:00 |
|
Artem Tarasov
|
8fd658ced9
|
added FileInput
|
2020-07-23 15:52:20 +03:00 |
|
Artem Tarasov
|
92a09334a4
|
Merge branch 'master' into feature/Wizard
|
2020-07-23 13:42:21 +03:00 |
|
Artem Tarasov
|
64083849ff
|
Merge branch 'master' into feature/input-password-wizard
|
2020-07-23 13:38:52 +03:00 |
|