|
4dfbdde28e
|
EF: Feed
|
2019-12-10 11:54:53 +03:00 |
|
|
581c32e672
|
Merge remote-tracking branch 'remotes/origin/master' into feature/grid-component
|
2019-12-10 11:51:07 +03:00 |
|
|
ed7fb5bc70
|
web: Components: Added test for Aside mode in HelpButton
|
2019-12-10 11:50:36 +03:00 |
|
|
077d1c4196
|
web: components: bump version
|
2019-12-10 11:19:09 +03:00 |
|
|
125aa6040e
|
Web: Components: fixed avatar-editor modal-dialog size
|
2019-12-10 11:18:52 +03:00 |
|
|
2901617d12
|
web: Common: Fixed setup size prop
|
2019-12-10 10:42:16 +03:00 |
|
|
414bcb21d8
|
web: common: bump version
|
2019-12-10 10:42:02 +03:00 |
|
|
ec99a13f76
|
web: components: bump version
|
2019-12-10 10:41:54 +03:00 |
|
NikolayRechkin
|
4bb2b08d2e
|
Merge branch 'master' into feature/pwa
|
2019-12-10 10:37:41 +03:00 |
|
|
0b52301591
|
web: Common: Changed default prop size
|
2019-12-10 10:36:09 +03:00 |
|
|
78a722f516
|
web: Common: Fixed call cancel of undefined
|
2019-12-10 10:34:20 +03:00 |
|
|
aeac729e52
|
web: Moved AdvancedSelector2 from asc-web-components to asc-web-common
|
2019-12-10 10:32:26 +03:00 |
|
|
26d3e3d29d
|
Merge pull request #13 from ONLYOFFICE/Refactoring/remove-react-bootstrap
Refactoring/remove react bootstrap
|
2019-12-10 10:26:08 +03:00 |
|
|
3ead54b4e4
|
web: Components: Removed AdvancedSelector v1
|
2019-12-10 09:59:27 +03:00 |
|
Daniil Senkiv
|
4f1dbc6352
|
web.common, web.components: sorted props in readme alphabetically
|
2019-12-10 09:44:18 +03:00 |
|
|
d6e8dc7026
|
web: Common: Fixed PropType definition
|
2019-12-10 09:38:15 +03:00 |
|
Daniil Senkiv
|
6b6c4569cf
|
Merge branch 'master' into refactoring/text-heading
|
2019-12-10 09:36:05 +03:00 |
|
Daniil Senkiv
|
b34b653c5f
|
web: components: bump version
|
2019-12-10 09:28:51 +03:00 |
|
Daniil Senkiv
|
b0b1b45127
|
Web.components: RadioButtonGroup: added new props: width, orientation, changed proptype spacing from number to string, applied changes to other components
|
2019-12-10 09:28:45 +03:00 |
|
NikolayRechkin
|
d9d50ee364
|
web: components: bump version
|
2019-12-10 09:17:07 +03:00 |
|
NikolayRechkin
|
e13b1e461b
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-12-10 09:16:37 +03:00 |
|
|
5f6d63f941
|
Web: Components: fixed badge fontSize props number to string
|
2019-12-10 09:16:26 +03:00 |
|
NikolayRechkin
|
f6f12dea46
|
web: people: small fix
|
2019-12-10 09:16:21 +03:00 |
|
|
33c35b1177
|
Merge branch 'master' into feature/ef
|
2019-12-09 21:46:43 +03:00 |
|
Daniil Senkiv
|
864e6d6ca3
|
web.components: removed unuseless wrappers above Heading component
|
2019-12-09 19:42:00 +03:00 |
|
Daniil Senkiv
|
9cf94d8817
|
Merge branch 'master' into refactoring/text-heading
|
2019-12-09 19:09:10 +03:00 |
|
Daniil Senkiv
|
30626d46fa
|
web.components: deleted heading.css
|
2019-12-09 19:08:20 +03:00 |
|
Daniil Senkiv
|
e9449f6a70
|
web.components: Text: prop size can be string or number
|
2019-12-09 18:33:05 +03:00 |
|
Daniil Senkiv
|
d3483a2e6b
|
web: components: bump version
|
2019-12-09 18:31:43 +03:00 |
|
|
8c0fc47251
|
web: Client: Changed AdvancedSelector to PeopleSelector
|
2019-12-09 17:20:42 +03:00 |
|
Daniil Senkiv
|
4aa17bc90c
|
Merge branch 'master' into refactoring/text-heading
|
2019-12-09 16:55:31 +03:00 |
|
Daniil Senkiv
|
449589f971
|
web.common: Headline: fixed readme
|
2019-12-09 16:54:10 +03:00 |
|
NikolayRechkin
|
a739f1ee8a
|
revert appsettings.json
|
2019-12-09 16:10:48 +03:00 |
|
NikolayRechkin
|
ca5e501e2b
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-12-09 16:08:48 +03:00 |
|
NikolayRechkin
|
29433b0232
|
web: people: changed the use of the avatar editor
|
2019-12-09 16:07:04 +03:00 |
|
NikolayRechkin
|
8db8e25fa7
|
web: components: fixed avatar editor
|
2019-12-09 16:00:45 +03:00 |
|
NikolayRechkin
|
94581bdd39
|
People: deleted unused code
|
2019-12-09 15:59:34 +03:00 |
|
|
d187c8c82b
|
UserPhotoManager: fixed SearchInCache
|
2019-12-09 15:49:36 +03:00 |
|
|
1d475151c1
|
Web: Client: remove bootstrap peer dependency jquery
|
2019-12-09 15:37:07 +03:00 |
|
|
f0ce75cf7d
|
Web: People: remove bootstrap peer dependency jquery
|
2019-12-09 15:36:30 +03:00 |
|
|
a77aef1970
|
Merge branch 'master' into Refactoring/remove-react-bootstrap
# Conflicts:
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
|
2019-12-09 15:29:04 +03:00 |
|
Daniil Senkiv
|
d3f06c8d3e
|
Merge branch 'master' into refactoring/text-heading
|
2019-12-09 15:24:23 +03:00 |
|
|
fdfaae8abe
|
Docker: .net core up to 3.1
|
2019-12-09 15:19:18 +03:00 |
|
Daniil Senkiv
|
13ea03fd54
|
web.components: applied truncate prop to components
|
2019-12-09 15:18:51 +03:00 |
|
Daniil Senkiv
|
f275c5b258
|
web.common: renamed Heading component to Headline
|
2019-12-09 15:12:25 +03:00 |
|
|
452a3ebc4a
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
|
2019-12-09 15:10:01 +03:00 |
|
|
23838c0401
|
EF: files, Feed
|
2019-12-09 14:59:22 +03:00 |
|
Daniil Senkiv
|
03fdebd4af
|
web.components: Heading: fixed readme
|
2019-12-09 14:51:31 +03:00 |
|
Daniil Senkiv
|
275b307c72
|
web.components: deleted Header component
|
2019-12-09 14:49:31 +03:00 |
|
Daniil Senkiv
|
5dd25bcaca
|
web.components: replaced Header component to Heading component
|
2019-12-09 14:47:36 +03:00 |
|