Merge branch 'develop' into deploy
Showing
- composer.json 3 additions, 0 deletionscomposer.json
- resources/patch/ihavetoshipsorry.patch 31 additions, 0 deletionsresources/patch/ihavetoshipsorry.patch
- tests/features/asset_distribution/track_download.feature 2 additions, 0 deletionstests/features/asset_distribution/track_download.feature
- web/modules/custom/asset_distribution/src/Form/AnonymousDownloadForm.php 15 additions, 9 deletions...tom/asset_distribution/src/Form/AnonymousDownloadForm.php
- web/modules/custom/asset_release/config/install/core.entity_view_display.rdf_entity.asset_release.default.yml 18 additions, 16 deletions....entity_view_display.rdf_entity.asset_release.default.yml
- web/modules/custom/joinup_communities/osor/static_pages/description.html 169 additions, 168 deletions...tom/joinup_communities/osor/static_pages/description.html
- web/modules/custom/joinup_communities/osor/static_pages/eu-solutions.html 36 additions, 34 deletions...om/joinup_communities/osor/static_pages/eu-solutions.html
- web/modules/custom/joinup_communities/osor/static_pages/implementation.html 44 additions, 42 deletions.../joinup_communities/osor/static_pages/implementation.html
- web/modules/custom/joinup_communities/osor/static_pages/innovation-champions.html 166 additions, 164 deletions...p_communities/osor/static_pages/innovation-champions.html
- web/modules/custom/joinup_communities/osor/static_pages/share-reuse.html 44 additions, 42 deletions...tom/joinup_communities/osor/static_pages/share-reuse.html
- web/modules/custom/joinup_communities/osor/static_pages/style.css 10 additions, 2 deletions...les/custom/joinup_communities/osor/static_pages/style.css
- web/modules/custom/joinup_communities/osor/static_pages/worldwide.html 36 additions, 34 deletions...ustom/joinup_communities/osor/static_pages/worldwide.html
- web/themes/joinup/joinup_theme.theme 12 additions, 0 deletionsweb/themes/joinup/joinup_theme.theme
- web/themes/joinup/prototype/sass/_drupal-hacks.sass 26 additions, 2 deletionsweb/themes/joinup/prototype/sass/_drupal-hacks.sass
- web/themes/joinup/prototype/sass/_mdl-hacks.sass 3 additions, 1 deletionweb/themes/joinup/prototype/sass/_mdl-hacks.sass
- web/themes/joinup/prototype/sass/_mixins.sass 11 additions, 0 deletionsweb/themes/joinup/prototype/sass/_mixins.sass
- web/themes/joinup/prototype/sass/base/_checkbox.sass 4 additions, 0 deletionsweb/themes/joinup/prototype/sass/base/_checkbox.sass
- web/themes/joinup/prototype/sass/components/_button.sass 1 addition, 0 deletionsweb/themes/joinup/prototype/sass/components/_button.sass
- web/themes/joinup/prototype/sass/components/_listing.sass 59 additions, 6 deletionsweb/themes/joinup/prototype/sass/components/_listing.sass
- web/themes/joinup/templates/content/node--custom-page--full.html.twig 3 additions, 1 deletion...oinup/templates/content/node--custom-page--full.html.twig
Loading
Please register or sign in to comment