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 |
|
|
|
2371953954
|
Settings: fix greetingsettings
|
2020-07-28 14:41:51 +03:00 |
|
Vladislav Makhov
|
4aed1a7a09
|
Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page
|
2020-07-28 13:32:36 +03:00 |
|
Vladislav Makhov
|
c54129bf33
|
Recover: fix translation
|
2020-07-28 13:25:09 +03:00 |
|
|
|
c325cb139d
|
Settings: added authproviders and login.ashx
|
2020-07-28 11:13:49 +03:00 |
|
Vladislav Makhov
|
8d41d2dbc2
|
Register: add translations
|
2020-07-28 11:07:34 +03:00 |
|
Vladislav Makhov
|
5ef9d20f64
|
Register: add working with api
|
2020-07-28 11:07:12 +03:00 |
|
Vladislav Makhov
|
1f1a6891b2
|
Style fixes
|
2020-07-28 10:29:55 +03:00 |
|
Vladislav Makhov
|
ddf497bac4
|
Merge differences from master after header fix
|
2020-07-28 10:24:53 +03:00 |
|
Alexey
|
e7d3b6000b
|
Web: Client: Settings: Fix mobile styles on customization page
|
2020-07-28 10:17:32 +03:00 |
|
Alexey
|
7982194f5a
|
Web: Client: Settings: Fix language-and-time-zone and customization pages, refactoring
|
2020-07-27 18:13:01 +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
|
3ec06cab83
|
Web: Client: Settings: Fix custom-tiles page, refactoring
|
2020-07-27 17:24:41 +03:00 |
|
Vladislav Makhov
|
cfdf71157f
|
Fix
|
2020-07-27 16:41:15 +03:00 |
|
Vladislav Makhov
|
86170f2923
|
Fix styles
|
2020-07-27 16:36:02 +03:00 |
|
Vladislav Makhov
|
3fdfb6211d
|
Fix translation
|
2020-07-27 15:51:04 +03:00 |
|
Alexey
|
27055fb58a
|
Web: Client: Settings: Refactoring customization page
|
2020-07-27 14:39:28 +03:00 |
|
Vladislav Makhov
|
1b6d1b24c1
|
Add api post data
|
2020-07-27 14:37:21 +03:00 |
|
Alexey
|
c2ad40995e
|
Web: Client: Settings: Added custom-titles page, updated customization page
|
2020-07-27 09:38:02 +03:00 |
|
|
|
f9dc19526c
|
Added sendjoininvite, sendadmmail
|
2020-07-24 17:01:20 +03:00 |
|
Vladislav Makhov
|
64e0a940e1
|
PropTypes
|
2020-07-24 16:20:35 +03:00 |
|
Vladislav Makhov
|
c07f4cf713
|
Set mock
|
2020-07-24 16:04:54 +03:00 |
|
Vladislav Makhov
|
7a3ff1c401
|
Fix validate
|
2020-07-24 15:50:54 +03:00 |
|
Vladislav Makhov
|
5315eb3bfc
|
Fix styles
|
2020-07-24 15:47:08 +03:00 |
|
Vladislav Makhov
|
362f1cca02
|
Fix render
|
2020-07-24 15:35:24 +03:00 |
|
Vladislav Makhov
|
b3abfa05cc
|
Add recover access
|
2020-07-24 15:31:23 +03:00 |
|
Artem Tarasov
|
aca4ce9c32
|
added checking, refacktoring
|
2020-07-24 15:30:11 +03:00 |
|
Vladislav Makhov
|
68f3139c46
|
Add translations
|
2020-07-24 15:12:31 +03:00 |
|
Vladislav Makhov
|
05ade13438
|
Add UnionIcon
|
2020-07-24 15:02:34 +03:00 |
|
Vladislav Makhov
|
01341cf4ba
|
web: components: bump version
|
2020-07-24 15:02:15 +03:00 |
|
Vladislav Makhov
|
749702248d
|
Refactor
|
2020-07-24 14:49:01 +03:00 |
|
Vladislav Makhov
|
53cb292fa9
|
Fix styles
|
2020-07-24 14:48:54 +03:00 |
|
Vladislav Makhov
|
e751296adb
|
Unauth header init
|
2020-07-24 14:21:13 +03:00 |
|
Vladislav Makhov
|
20b67c8261
|
Fix Box export
|
2020-07-24 14:18:03 +03:00 |
|
Vladislav Makhov
|
aa1f8959ab
|
web: components: bump version
|
2020-07-24 14:17:37 +03:00 |
|
|
|
3d449d4863
|
web: components: bump version
|
2020-07-24 13:53: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 |
|
|
|
8683983ae0
|
web: common: bump version
|
2020-07-24 10:37:03 +03:00 |
|
|
|
226dfc79df
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-07-24 10:35:05 +03:00 |
|
|
|
f8345f18ce
|
Web: Common: fixed SelectedFrame, added scrolling, fixed selection in tile display
|
2020-07-24 10:34:53 +03:00 |
|
Artem Tarasov
|
cbda5efd21
|
refactoring styles of settings-box
|
2020-07-24 09:39:11 +03:00 |
|
Artem Tarasov
|
64d488a550
|
Merge branch 'master' into feature/Wizard
|
2020-07-24 08:49:38 +03:00 |
|
Artem Tarasov
|
fb61263fde
|
web: components: bump version
|
2020-07-23 19:12:42 +03:00 |
|
Artem Tarasov
|
499451892e
|
Merge branch 'master' into feature/input-password-wizard
|
2020-07-23 19:05:56 +03:00 |
|
Alexey
|
b35af29ec8
|
Web: Client: Settings: Updated section header, refactoring
|
2020-07-23 18:56:57 +03:00 |
|
Artem Tarasov
|
cfd0cf7bb6
|
fix tests
|
2020-07-23 18:45:00 +03:00 |
|
Artem Tarasov
|
da546fbb86
|
web: components: bump version
|
2020-07-23 16:43:51 +03:00 |
|
Artem Tarasov
|
08f5b5e0f8
|
fixed outline, fixed error when file upload refused, export fix
|
2020-07-23 16:42:49 +03:00 |
|
Alexey
|
e067346d2c
|
Web: Client: Settings: Routing, updated tree
|
2020-07-23 16:37:18 +03:00 |
|
Vladislav Makhov
|
14867e5af2
|
Fix view
|
2020-07-23 16:35:04 +03:00 |
|
Artem Tarasov
|
5bf6f7de50
|
added onInputFileHandler
|
2020-07-23 16:26:32 +03:00 |
|
Vladislav Makhov
|
54117509ff
|
Fix styles
|
2020-07-23 16:07:35 +03:00 |
|
Vladislav Makhov
|
2d5c92b628
|
Move props to a separate file
|
2020-07-23 15:54:55 +03:00 |
|
Artem Tarasov
|
8fd658ced9
|
added FileInput
|
2020-07-23 15:52:20 +03:00 |
|
Vladislav Makhov
|
c146edbc3a
|
Refactoring
|
2020-07-23 15:39:19 +03:00 |
|
Vladislav Makhov
|
7d3d79eb5d
|
Fix styles
|
2020-07-23 15:37:35 +03:00 |
|
Vladislav Makhov
|
3adb650e12
|
Add translations
|
2020-07-23 15:22:24 +03:00 |
|
Vladislav Makhov
|
ae59b91a85
|
Add register modal dialog
|
2020-07-23 15:22:09 +03:00 |
|
Vladislav Makhov
|
0c905a3e7a
|
Rename modal-dialog.js to forgot-password-modal-dialog.js
|
2020-07-23 15:20:59 +03:00 |
|
Artem Tarasov
|
92a09334a4
|
Merge branch 'master' into feature/Wizard
|
2020-07-23 13:42:21 +03:00 |
|
Artem Tarasov
|
ad65f3eb1b
|
web: components: bump version
|
2020-07-23 13:39:15 +03:00 |
|
Artem Tarasov
|
64083849ff
|
Merge branch 'master' into feature/input-password-wizard
|
2020-07-23 13:38:52 +03:00 |
|
Artem Tarasov
|
a0b99cc097
|
refactoring
|
2020-07-23 12:35:42 +03:00 |
|
Artem Tarasov
|
6a3922accc
|
added functionality to change email
|
2020-07-23 11:16:55 +03:00 |
|
Artem Tarasov
|
dcee7b97b8
|
layout fix, added new view
|
2020-07-23 11:03:30 +03:00 |
|
Vladislav Makhov
|
a92dec4449
|
Add register visibility
|
2020-07-23 09:50:42 +03:00 |
|
Artem Tarasov
|
037bed591f
|
styles fix
|
2020-07-22 18:47:37 +03:00 |
|
Vladislav Makhov
|
ee21cb1a8b
|
Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page
|
2020-07-22 17:00:45 +03:00 |
|
Vladislav Makhov
|
d192f50953
|
Merge branch 'master' into feature/new-login-page
# Conflicts:
# web/ASC.Web.Components/src/components/input-block/index.js
# web/ASC.Web.Components/src/components/password-input/index.js
|
2020-07-22 15:51:48 +03:00 |
|
Artem Tarasov
|
109b39153b
|
added link for generate pass
|
2020-07-22 15:14:50 +03:00 |
|
Artem Tarasov
|
96b07eaf81
|
layout fix
|
2020-07-22 14:48:19 +03:00 |
|
|
|
820117cb04
|
Api: added SaveMailDomainSettings, EnableAdminMessageSettings
|
2020-07-22 14:03:38 +03:00 |
|
Vladislav Makhov
|
967757b348
|
Fix styles
|
2020-07-22 13:47:56 +03:00 |
|
Artem Tarasov
|
8c5688387b
|
web: components: bump version
|
2020-07-22 13:24:15 +03:00 |
|
Artem Tarasov
|
11fb04e75d
|
added tests
|
2020-07-22 13:23:28 +03:00 |
|
Artem Tarasov
|
1a0de3fe01
|
update readme
|
2020-07-22 13:16:50 +03:00 |
|
Artem Tarasov
|
65c7381eba
|
layout fix
|
2020-07-22 11:34:31 +03:00 |
|
Artem Tarasov
|
d42cffb0ce
|
added prop to show TextTooltip
|
2020-07-22 11:26:42 +03:00 |
|
Artem Tarasov
|
ab2ee3f26f
|
added prop to hide Tooltip
|
2020-07-22 10:10:21 +03:00 |
|
Artem Tarasov
|
626fcda87d
|
added prop to hide newPasswordButton
|
2020-07-22 09:20:20 +03:00 |
|
Artem Tarasov
|
9414fad3d1
|
fix
|
2020-07-22 08:52:59 +03:00 |
|
Artem Tarasov
|
5e3b3228d6
|
web: components: bump version
|
2020-07-21 17:30:21 +03:00 |
|
Artem Tarasov
|
41daa4e157
|
Merge branch 'master' into feature/input-file
|
2020-07-21 17:29:58 +03:00 |
|
Artem Tarasov
|
b0585d4ec0
|
fix layout
|
2020-07-21 17:00:12 +03:00 |
|
Artem Tarasov
|
baaa29172d
|
fix bug
|
2020-07-21 16:30:22 +03:00 |
|
Artem Tarasov
|
923c1bf0fa
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# web/ASC.Web.Components/src/components/password-input/index.js
|
2020-07-21 15:14:10 +03:00 |
|
Artem Tarasov
|
ee86ce8140
|
added settings pass
|
2020-07-21 15:10:09 +03:00 |
|
|
|
d085530b8d
|
web: components: bump version
|
2020-07-21 15:02:46 +03:00 |
|
|
|
d4bf98d932
|
Web: Components: Added large size to propTypes
|
2020-07-21 15:02:32 +03:00 |
|
Artem Tarasov
|
3865909d9a
|
fixed margin settings
|
2020-07-21 14:44:17 +03:00 |
|
Artem Tarasov
|
55c19bbd43
|
fixed Button
|
2020-07-21 14:01:54 +03:00 |
|
Artem Tarasov
|
098fa8dd3a
|
fixed EmailInput
|
2020-07-21 13:55:54 +03:00 |
|
Artem Tarasov
|
d1561a1954
|
delete translation for tooltip pasword input
|
2020-07-21 13:50:14 +03:00 |
|
Artem Tarasov
|
228edd119d
|
fixe PasswordInput
|
2020-07-21 13:49:16 +03:00 |
|
Artem Tarasov
|
1a8aacebdc
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Resource.Manager/Startup.cs
# web/ASC.Web.Components/src/components/password-input/index.js
|
2020-07-21 13:13:47 +03:00 |
|
Vladislav Makhov
|
a4d1481faf
|
tabIndex fix
|
2020-07-20 17:41:17 +03:00 |
|
Vladislav Makhov
|
19355a9a58
|
Fix autofocus
|
2020-07-20 17:23:47 +03:00 |
|
Alexey
|
cb0a734a78
|
Web: Components: Updated tree-menu in settings section
|
2020-07-20 16:22:52 +03:00 |
|
Vladislav Makhov
|
bda1b1c6a8
|
Fix console errors
|
2020-07-20 16:07:36 +03:00 |
|
Vladislav Makhov
|
36fc8875fb
|
Fix console errors
|
2020-07-20 16:01:59 +03:00 |
|
Vladislav Makhov
|
6b39d62e0b
|
Delete unused code
|
2020-07-20 16:01:11 +03:00 |
|
Vladislav Makhov
|
16b12e210a
|
Fix console errors
|
2020-07-20 15:39:46 +03:00 |
|
Vladislav Makhov
|
dabba4514e
|
Fix styles
|
2020-07-20 15:39:33 +03:00 |
|
Artem Tarasov
|
2051989917
|
web: components: bump version
|
2020-07-20 14:12:45 +03:00 |
|
Artem Tarasov
|
9bef9d112d
|
removed unsed class
|
2020-07-20 13:57:33 +03:00 |
|
Artem Tarasov
|
a7b23fd127
|
fix icon color and cursor
|
2020-07-20 13:55:14 +03:00 |
|
Artem Tarasov
|
b39f0a7a0b
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer into feature/input-file
|
2020-07-20 12:06:40 +03:00 |
|
Vladislav Makhov
|
df3f01a18c
|
Merge branch 'master' into feature/new-login-page
|
2020-07-20 11:54:06 +03:00 |
|
Vladislav Makhov
|
cb635607e6
|
web: components: bump version
|
2020-07-20 10:39:41 +03:00 |
|
Vladislav Makhov
|
f0d8c8e6ce
|
Update README.md
|
2020-07-20 10:37:35 +03:00 |
|
Vladislav Makhov
|
02794bacc9
|
Add body padding prop
|
2020-07-20 10:37:23 +03:00 |
|
Artem Tarasov
|
e6fe415043
|
added in email-input.stories.js value large for prop size
|
2020-07-20 10:22:14 +03:00 |
|
Artem Tarasov
|
5901f9956e
|
fix render
|
2020-07-20 10:21:20 +03:00 |
|
Vladislav Makhov
|
12bc78f3a9
|
Fix console error
|
2020-07-20 10:17:21 +03:00 |
|
Vladislav Makhov
|
30631f0ce5
|
Fix validate
|
2020-07-18 08:37:25 +03:00 |
|
Vladislav Makhov
|
e769ff55c2
|
Fix styles
|
2020-07-18 08:35:28 +03:00 |
|
|
|
be81ca291d
|
Update yarn.lock files + bump versions
|
2020-07-17 18:03:08 +03:00 |
|
|
|
d094546147
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2020-07-17 17:48:50 +03:00 |
|
|
|
ea318c3b05
|
Merge branch 'master' into feature/new-login-page
|
2020-07-17 17:44:28 +03:00 |
|
|
|
ec20c66c5d
|
Update yarn.lock files
|
2020-07-17 17:43:39 +03:00 |
|
|
|
c4f3ef8003
|
Fixed ReferenceError: babelHelpers is not defined (Changed package version to fixed)
|
2020-07-17 17:43:24 +03:00 |
|
Artem Tarasov
|
305edd419c
|
isDisabled fix
|
2020-07-17 15:58:28 +03:00 |
|
Artem Tarasov
|
e524adc21a
|
added tests
|
2020-07-17 15:28:58 +03:00 |
|
Artem Tarasov
|
aae292ca41
|
added PropTypes
|
2020-07-17 15:16:14 +03:00 |
|
Artem Tarasov
|
121a00f330
|
added readme
|
2020-07-17 14:33:59 +03:00 |
|
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
Artem Tarasov
|
8ab56cbb18
|
Merge branch 'master' into feature/input-file
|
2020-07-17 12:49:25 +03:00 |
|
Artem Tarasov
|
397b12973f
|
added text-overflow
|
2020-07-17 12:16:53 +03:00 |
|
Artem Tarasov
|
d782575f42
|
fix onInput
|
2020-07-17 11:49:54 +03:00 |
|
Artem Tarasov
|
1232398789
|
added input accept props
|
2020-07-17 11:34:52 +03:00 |
|
Artem Tarasov
|
1919277107
|
added onInputFile handler
|
2020-07-17 11:31:23 +03:00 |
|
Vladislav Makhov
|
787b3c2a80
|
Merge branch 'master' into feature/new-login-page
# Conflicts:
# web/ASC.Web.Components/src/components/password-input/index.js
# web/ASC.Web.Components/src/components/password-input/password-input.stories.js
|
2020-07-17 10:34:33 +03:00 |
|
Artem Tarasov
|
3d6e2c667f
|
fixed hover style
|
2020-07-17 10:15:58 +03:00 |
|
Artem Tarasov
|
496457c427
|
warning, error, active, hover style
|
2020-07-16 23:32:18 +03:00 |
|
Artem Tarasov
|
7be7073908
|
added styles for border
|
2020-07-16 17:40:45 +03:00 |
|
Artem Tarasov
|
8e817c7c91
|
Merge branch 'master' into feature/input-file
|
2020-07-16 16:42:50 +03:00 |
|
Artem Tarasov
|
b599d5f163
|
added styles for property size
|
2020-07-16 16:38:34 +03:00 |
|
|
|
679e77a3ea
|
Update yarn.lock files
|
2020-07-16 16:09:09 +03:00 |
|
Vladislav Makhov
|
20fcb5dab7
|
Merge branch 'master' into feature/field-container-label-view
|
2020-07-16 16:07:48 +03:00 |
|
|
|
098e872a38
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
|
2020-07-16 15:58:43 +03:00 |
|
|
|
42b0275f5c
|
web: components: bump version
|
2020-07-16 15:54:52 +03:00 |
|
|
|
f0b50f7185
|
web: common: bump version
|
2020-07-16 15:54:24 +03:00 |
|
|
|
ec8c6a5ddb
|
Fixed security vulnerability in lodash
|
2020-07-16 15:54:04 +03:00 |
|
Vladislav Makhov
|
95f96d9a7c
|
web: components: bump version
|
2020-07-16 15:44:46 +03:00 |
|
Vladislav Makhov
|
01867762f0
|
Update README.md
|
2020-07-16 15:44:28 +03:00 |
|
Vladislav Makhov
|
587058c4c1
|
Add visibility of field label section
|
2020-07-16 15:44:15 +03:00 |
|
|
|
78b10ab893
|
Update yarn.lock files
|
2020-07-16 14:55:40 +03:00 |
|
|
|
0e351b88d7
|
web: components: bump version
|
2020-07-16 14:41:56 +03:00 |
|
|
|
8d0d5fd908
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# web/ASC.Web.Components/package.json
|
2020-07-16 14:41:32 +03:00 |
|
Vladislav Makhov
|
85dcdb5689
|
Merge branch 'master' into feature/password-input-simple-view
|
2020-07-16 14:32:11 +03:00 |
|
Vladislav Makhov
|
8a907a0df7
|
Fix hover color
|
2020-07-16 14:27:42 +03:00 |
|
Artem Tarasov
|
045688390b
|
Merge branch 'master' into feature/input-file
|
2020-07-16 13:09:37 +03:00 |
|
Artem Tarasov
|
4fb3b16fd2
|
add scale
|
2020-07-16 13:08:09 +03:00 |
|
Artem Tarasov
|
e42d5d2c3f
|
icon position fix
|
2020-07-16 12:37:22 +03:00 |
|
Artem Tarasov
|
b5c066c957
|
fixed Loader size and position
|
2020-07-16 12:31:18 +03:00 |
|
Artem Tarasov
|
5a5ebe651e
|
fixed Loader in Button and propTypes
|
2020-07-16 12:10:50 +03:00 |
|
Vladislav Makhov
|
d258a640c0
|
web: components: bump version
|
2020-07-16 11:59:31 +03:00 |
|
Vladislav Makhov
|
fd6d90a797
|
Fix styles
|
2020-07-16 11:59:17 +03:00 |
|
Vladislav Makhov
|
423f148cfb
|
Update icon pic
|
2020-07-16 11:58:58 +03:00 |
|
Artem Tarasov
|
eb97b2f212
|
created Component FileInput
|
2020-07-16 11:42:10 +03:00 |
|
Alexey
|
b4304d8526
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-16 11:33:17 +03:00 |
|
Vladislav Makhov
|
2ffb65eec8
|
Fix icon
|
2020-07-16 10:53:12 +03:00 |
|
Vladislav Makhov
|
545a5d0431
|
Update README.md
|
2020-07-16 10:38:13 +03:00 |
|
Vladislav Makhov
|
2a4df5fd55
|
Add simple view option
|
2020-07-16 10:30:30 +03:00 |
|
|
|
576e8a6de0
|
Files: revert
|
2020-07-16 00:49:25 +03:00 |
|
|
|
f18f14fa34
|
DocumentService: fix
|
2020-07-16 00:36:48 +03:00 |
|
|
|
cb1bf99393
|
Files: fix
|
2020-07-16 00:25:19 +03:00 |
|
|
|
f03ab16127
|
Converter: fix
|
2020-07-16 00:08:28 +03:00 |
|
|
|
d99f6ff0a5
|
Files: additional logging
|
2020-07-15 23:39:43 +03:00 |
|
Artem Tarasov
|
cdf487bc74
|
Merge branch 'master' into feature/Button-large
|
2020-07-15 22:17:48 +03:00 |
|
Artem Tarasov
|
e2b9789e6f
|
added test for large prop
|
2020-07-15 19:14:00 +03:00 |
|
Alexey
|
3fd30e7a83
|
web: common: bump version
|
2020-07-15 19:06:14 +03:00 |
|
Alexey
|
965b2e97d3
|
Web: Common: Tile view temporarily hidden
|
2020-07-15 19:05:40 +03:00 |
|
Artem Tarasov
|
c6b81a3aac
|
added description property size="large" in readme
|
2020-07-15 19:00:36 +03:00 |
|
Artem Tarasov
|
550da8cbe7
|
fix padding
|
2020-07-15 18:49:12 +03:00 |
|
|
|
9ee887d270
|
DocumentService log error
|
2020-07-15 18:06:35 +03:00 |
|
Artem Tarasov
|
3004890d98
|
fixed paddings
|
2020-07-15 17:58:33 +03:00 |
|
|
|
9d0df35a17
|
DocumentService log error
|
2020-07-15 17:58:12 +03:00 |
|
|
|
414e17ac1f
|
DocumentService log error
|
2020-07-15 17:40:58 +03:00 |
|
Artem Tarasov
|
4b942c6964
|
added min-width
|
2020-07-15 17:34:01 +03:00 |
|
Vladislav Makhov
|
e5bdfe32d7
|
Merge branch 'master' into feature/text-input-large
|
2020-07-15 17:24:33 +03:00 |
|
Artem Tarasov
|
db7669eccd
|
added button size large in all.button.stories.js
|
2020-07-15 17:20:11 +03:00 |
|
Artem Tarasov
|
4ee0cee88d
|
added large button size
|
2020-07-15 17:17:37 +03:00 |
|
Vladislav Makhov
|
5393bec4af
|
web: components: bump version
|
2020-07-15 17:17:18 +03:00 |
|
Vladislav Makhov
|
1c0db2edfd
|
Update README.md
|
2020-07-15 17:09:29 +03:00 |
|
Vladislav Makhov
|
eac05e5750
|
Add large prop
|
2020-07-15 17:07:58 +03:00 |
|
|
|
a54be3b64c
|
Merge branch 'master' into feature/files
|
2020-07-15 16:57:14 +03:00 |
|
Vladislav Makhov
|
a7b0968252
|
Add social buttons mock
|
2020-07-15 16:18:09 +03:00 |
|
Alexey
|
dd000d197d
|
Web: Common: Removed viewSelector from people module
|
2020-07-15 16:12:10 +03:00 |
|
|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +03:00 |
|
|
|
7f095f03d1
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
|
2020-07-15 15:23:28 +03:00 |
|
Artem Tarasov
|
2469126f7a
|
hidden input license file
|
2020-07-15 14:26:49 +03:00 |
|
Artem Tarasov
|
7e3ba192b1
|
fixed file name in input type=file
|
2020-07-15 14:01:29 +03:00 |
|
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +03:00 |
|
|
|
533935906f
|
Resource: fix
|
2020-07-15 12:55:31 +03:00 |
|
Artem Tarasov
|
6d2deca3c6
|
layout fix
|
2020-07-15 11:47:21 +03:00 |
|
Vladislav Makhov
|
55a0c01183
|
Fix styles
|
2020-07-15 10:12:49 +03:00 |
|
Alexey
|
b573555024
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-15 08:00:04 +03:00 |
|
Alexey
|
62ed90e9a0
|
web: common: bump version
|
2020-07-15 07:59:56 +03:00 |
|
Alexey
|
e886437d83
|
Web: Files: Fix tile styles
|
2020-07-15 07:30:59 +03:00 |
|
Artem Tarasov
|
84ca1146a0
|
layout fix
|
2020-07-14 17:46:00 +03:00 |
|
Vladislav Makhov
|
5af854226a
|
Fix styles
|
2020-07-14 13:40:56 +03:00 |
|
Vladislav Makhov
|
806f64abae
|
Fix styles and responsive layout
|
2020-07-14 12:55:09 +03:00 |
|
Vladislav Makhov
|
505e98b1a1
|
Add textAlign prop (left as default)
|
2020-07-14 12:54:11 +03:00 |
|
|
|
88e932a0a7
|
Merge branch 'master' into feature/files
|
2020-07-13 16:46:42 +03:00 |
|
Vladislav Makhov
|
3b8c2f0e69
|
Fix responsive layout for start login page
Move header logo to a separate component
|
2020-07-13 16:20:02 +03:00 |
|
Alexey
|
41f59c9130
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-13 16:00:51 +03:00 |
|
Alexey
|
e5b71cff4f
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-07-13 16:00:32 +03:00 |
|
Ilya Oleshko
|
c9eb590f1e
|
web: common: bump version
|
2020-07-13 15:56:36 +03:00 |
|
Ilya Oleshko
|
2d8b694374
|
Web: Common: Fixed order of returning filter props, add new
|
2020-07-13 15:56:24 +03:00 |
|
Alexey
|
8612f32ae5
|
web: common: bump version
|
2020-07-13 15:54:43 +03:00 |
|
Alexey
|
665915804e
|
Web: Common: Fixed mobile view selector
|
2020-07-13 15:53:29 +03:00 |
|
Vladislav Makhov
|
001c8c2620
|
Fix responsive layout for textarea
|
2020-07-13 14:16:36 +03:00 |
|
Vladislav Makhov
|
7dd8308069
|
Fix height scale
|
2020-07-13 14:15:44 +03:00 |
|
Vladislav Makhov
|
c085d3c00d
|
Fix styles
|
2020-07-13 12:28:13 +03:00 |
|
Alexey
|
3ca42459a1
|
Web: Files: Separated the logic of the Filter and ViewSelector
|
2020-07-13 12:10:40 +03:00 |
|
|
|
589eaa17f1
|
web: components: bump version
|
2020-07-12 20:48:49 +03:00 |
|
|
|
4efe98ff9e
|
Revert "Fix Re-rendered because of props changes: props.onClick"
This reverts commit 7c8f84ab8b.
|
2020-07-12 20:48:15 +03:00 |
|
Artem Tarasov
|
80a5e224e8
|
added PropTypes and deleted console.log
|
2020-07-12 12:34:42 +03:00 |
|
Artem Tarasov
|
0e2da28101
|
added getPortalSettings after wizard completed
|
2020-07-10 19:00:21 +03:00 |
|
Artem Tarasov
|
491a3d32da
|
added routing after completed Wizard
|
2020-07-10 18:08:22 +03:00 |
|
Vladislav Makhov
|
52dde654b8
|
Fix validate
|
2020-07-10 15:15:38 +03:00 |
|
Vladislav Makhov
|
22029e6468
|
Fix styles
|
2020-07-10 15:13:08 +03:00 |
|
|
|
58a9fc188c
|
web: components: bump version
|
2020-07-10 14:39:52 +03:00 |
|
|
|
6f316242cb
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-10 14:38:44 +03:00 |
|
Ilya Oleshko
|
87a892ee73
|
web: components: bump version
|
2020-07-10 14:39:59 +03:00 |
|
Ilya Oleshko
|
62bdbf68a3
|
Web: Components: Fixed ContextMenuButton, removed bindings and added event property for onClick
|
2020-07-10 14:39:49 +03:00 |
|
Vladislav Makhov
|
900755fb37
|
Rename translate parameter
|
2020-07-10 14:21:28 +03:00 |
|
|
|
7c8f84ab8b
|
Fix Re-rendered because of props changes: props.onClick
|
2020-07-10 14:15:30 +03:00 |
|
Vladislav Makhov
|
4e37091d9b
|
Add email field validation
|
2020-07-10 14:02:44 +03:00 |
|
Vladislav Makhov
|
b3d2db8d10
|
Add error messages
|
2020-07-10 13:48:54 +03:00 |
|
Artem Tarasov
|
f8e9cfc5f0
|
added onKeyPressHandler
|
2020-07-10 13:10:54 +03:00 |
|
Vladislav Makhov
|
b508ca2cd4
|
Render fixes
|
2020-07-10 13:02:44 +03:00 |
|
Vladislav Makhov
|
229b63e04d
|
Fix button view in aside modal
|
2020-07-10 13:00:59 +03:00 |
|
Artem Tarasov
|
486dbe1fb5
|
layout fix
|
2020-07-10 11:26:16 +03:00 |
|
Vladislav Makhov
|
81f6a041c7
|
return 100% width
|
2020-07-10 10:46:22 +03:00 |
|
Alexey
|
e07cfee5a9
|
web: components: bump version
|
2020-07-10 10:37:53 +03:00 |
|
Alexey
|
132242b06a
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-10 08:54:01 +03:00 |
|
|
|
954551873f
|
web: common: bump version
|
2020-07-09 22:27:27 +03:00 |
|
|
|
d0f66c66e7
|
Web: Files: Implemented CompleteVersion
|
2020-07-09 22:26:43 +03:00 |
|
SuhorukovAnton
|
f8e42cbd08
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 22:06:08 +03:00 |
|
SuhorukovAnton
|
28e70e91f6
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 18:37:36 +03:00 |
|
Artem Tarasov
|
92fdf4c41d
|
added Toast
|
2020-07-09 17:57:53 +03:00 |
|
Artem Tarasov
|
5d1043af13
|
added Loader
|
2020-07-09 15:11:08 +03:00 |
|
Artem Tarasov
|
11be0a1ef3
|
added in PasswordInput NewPasswordButtonVisible from /new-login-page
|
2020-07-09 14:12:53 +03:00 |
|
Artem Tarasov
|
27ddc44211
|
added truncate label timezone
|
2020-07-09 12:47:07 +03:00 |
|
Artem Tarasov
|
8cacf241d5
|
fix
|
2020-07-09 11:42:28 +03:00 |
|
Vladislav Makhov
|
d8a97b0457
|
Add translation for placeholder
|
2020-07-09 11:30:13 +03:00 |
|
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
Vladislav Makhov
|
73e189583e
|
Fix validate
|
2020-07-08 18:28:04 +03:00 |
|
Vladislav Makhov
|
142f4c10fa
|
Update README.md
|
2020-07-08 18:27:50 +03:00 |
|
Artem Tarasov
|
6c01f7392f
|
added method setPortalOwner
|
2020-07-08 18:15:50 +03:00 |
|
Vladislav Makhov
|
2013cf61da
|
Add hasError prop
|
2020-07-08 16:57:34 +03:00 |
|
Artem Tarasov
|
6dd5c338fe
|
fix translation and layout
|
2020-07-08 15:34:29 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
Artem Tarasov
|
86be9d522b
|
render optimization
|
2020-07-08 13:04:23 +03:00 |
|
Alexey
|
6435d8759b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-07-08 13:02:01 +03:00 |
|
Vladislav Makhov
|
8c4f94098a
|
Add fields validate
|
2020-07-08 12:47:05 +03:00 |
|
Alexey
|
1a99461091
|
Web: Files: Added file view as tiles
|
2020-07-08 12:26:25 +03:00 |
|
Artem Tarasov
|
b3fe0f3fbc
|
added .DS_Store in .gitignore
|
2020-07-08 11:44:06 +03:00 |
|
Artem Tarasov
|
07089f2fc7
|
added api methods
|
2020-07-08 11:29:44 +03:00 |
|
Vladislav Makhov
|
d6ae6ae2c0
|
Fix password tooltip
Add translations
|
2020-07-08 09:41:26 +03:00 |
|
Vladislav Makhov
|
ae7bb806df
|
Add adaptive styles, remove unused code
|
2020-07-08 09:11:51 +03:00 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
|
|
6b97af6df3
|
web: common: bump version
|
2020-07-07 17:56:02 +03:00 |
|
|
|
a18212da87
|
Web: Files: added files convert to row, fixed api
|
2020-07-07 17:55:01 +03:00 |
|
Artem Tarasov
|
621d04db58
|
added select language
|
2020-07-07 16:24:57 +03:00 |
|
Artem Tarasov
|
779eb155b5
|
added action getPortalCultures, fix routing
|
2020-07-07 14:50:31 +03:00 |
|
Vladislav Makhov
|
200b027092
|
Add translation, fix styles
|
2020-07-07 14:17:26 +03:00 |
|
SuhorukovAnton
|
a43c14dcb3
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-07 12:38:35 +03:00 |
|
Vladislav Makhov
|
3016af962c
|
Add input handlers
|
2020-07-07 12:27:01 +03:00 |
|
Vladislav Makhov
|
67cc4f5abc
|
Add props validation
|
2020-07-07 10:43:47 +03:00 |
|
Vladislav Makhov
|
d113f17b2b
|
Add pointer cursor, fix "onRecoverClick" callback event.
|
2020-07-07 10:42:31 +03:00 |
|
|
|
b4ac3f3113
|
web: common: bump version
|
2020-07-07 10:35:59 +03:00 |
|
|
|
925654c3f6
|
Web: Common: added convert api
|
2020-07-07 10:27:04 +03:00 |
|
Alexey
|
e7b4727b77
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-07 07:45:32 +03:00 |
|
Alexey
|
50ed35c9e5
|
Web: Files: Added folder view as tiles
|
2020-07-07 07:45:22 +03:00 |
|
Vladislav Makhov
|
44c9c728c3
|
Fix title styles
|
2020-07-06 19:19:55 +03:00 |
|
Vladislav Makhov
|
bc2f1fa670
|
add mock on send recover
|
2020-07-06 18:08:47 +03:00 |
|
Artem Tarasov
|
1a730f0750
|
fix redirect to /wizard
|
2020-07-06 18:08:34 +03:00 |
|
Vladislav Makhov
|
13a1218dd9
|
fix z-index
|
2020-07-06 16:12:19 +03:00 |
|
Vladislav Makhov
|
209262b622
|
Add "Register", fix styles
|
2020-07-06 16:06:37 +03:00 |
|
Vladislav Makhov
|
63dc366083
|
Remove unused component from import
|
2020-07-06 16:04:34 +03:00 |
|
Artem Tarasov
|
7cccd43f22
|
fix
|
2020-07-06 15:14:20 +03:00 |
|
Artem Tarasov
|
c0e5626c1f
|
deleted unnecessary func and action in Wizard
|
2020-07-06 14:26:47 +03:00 |
|
Artem Tarasov
|
75b591ff1e
|
added tooltip and translation Password
|
2020-07-06 13:38:25 +03:00 |
|
Artem Tarasov
|
83fc1b18c6
|
added Loader in Wizard page
|
2020-07-06 12:57:43 +03:00 |
|
Artem Tarasov
|
e1ce565504
|
added condition loading Wizard in PrivateRoute
|
2020-07-06 11:00:56 +03:00 |
|
SuhorukovAnton
|
00558dd95f
|
general-startup: fix
|
2020-07-06 10:56:17 +03:00 |
|
|
|
0e02ee4ec3
|
web: components: bump version
|
2020-07-06 10:29:08 +03:00 |
|
|
|
d3dc618ad9
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-07-06 10:28:44 +03:00 |
|
|
|
02c40ad657
|
Web: Files: moved dragging prop to redux, added onDrop function to TreeFolders
|
2020-07-06 10:28:31 +03:00 |
|
|
|
51a993b2ea
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# web/ASC.Web.Components/package.json
|
2020-07-05 14:35:14 +03:00 |
|
SuhorukovAnton
|
71d90ebfa2
|
general-startup: fix
|
2020-07-03 18:57:59 +03:00 |
|
Vladislav Makhov
|
f170ce525d
|
Add translation for recover access
|
2020-07-03 16:28:20 +03:00 |
|
SuhorukovAnton
|
2f5491f1ba
|
general-startup: first version
|
2020-07-03 14:47:27 +03:00 |
|
Artem Tarasov
|
6f456eaa4e
|
cleanup
|
2020-07-03 12:20:07 +03:00 |
|
|
|
b534cb1d1f
|
web: components: bump version
|
2020-07-03 11:43:06 +03:00 |
|
