Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update with the latest changes from the main branch. #9

Merged
merged 34 commits into from
Apr 24, 2018
Merged

Update with the latest changes from the main branch. #9

merged 34 commits into from
Apr 24, 2018

Commits on Mar 22, 2018

  1. OS-8 301 Redirect from Content Editing Flow

    @rotator
    rotator committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    75fd07d View commit details
    Browse the repository at this point in the history

  2. OS-8 Enable OpenY Redirect module

    @rotator
    rotator committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    b27f01d View commit details
    Browse the repository at this point in the history

  3. OS-8 Add dependency from Redirect module

    @rotator
    rotator committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    b49ff3f View commit details
    Browse the repository at this point in the history

  4. OS-8 Add custom module to profile openy.info

    @rotator
    rotator committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    5af50de View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2018

  1. Merge branch 'master' into dev-os8

    @rotator
    rotator committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    41fffdc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dev-os8

    @rotator
    rotator committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    15827c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2018

  1. Merge branch '8.x-1.x' into dev-os8

    @podarok
    podarok committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    790f0a4 View commit details
    Browse the repository at this point in the history

  2. Create Themind_and_Design.md

    @podarok
    podarok committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    6358662 View commit details
    Browse the repository at this point in the history

  3. Rename Themind_and_Design.md to Theming_and_Design.md

    @podarok
    podarok committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    34cd6e5 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. Merge branch 'master' into dev-os8

    @kolesnikoff
    kolesnikoff committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    58cd1ba View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2018

  1. Merge pull request #50 from ymcatwincities/8.x-1.x 

    Merge with master branch
    @kolesnikoff
    kolesnikoff committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    851a723 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2018

  1. Merge pull request #51 from ymcatwincities/8.x-1.x 

    Merge with master branch
    @kolesnikoff
    kolesnikoff committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    d968898 View commit details
    Browse the repository at this point in the history

  2. Add CSS Editor module. Cleanup composer.json file.

    @kolesnikoff
    kolesnikoff committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    9b0ddea View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2018

  1. Revert "Merge branch 'drupal8_5_1' into 8.x-1.x" 

    This reverts commit 36e2634, reversing
changes made to 13a3dcc.
    @podarok
    podarok committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    39c730c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1007 from ymcatwincities/revert_core2 

    Revert "Merge branch 'drupal8_5_1' into 8.x-1.x"
    @podarok
    podarok committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    cb343ef View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2018

  1. Merge pull request #52 from ymcatwincities/8.x-1.x 

    Merge with master
    @kolesnikoff
    kolesnikoff committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    bfb0a0c View commit details
    Browse the repository at this point in the history

  2. Add description how to use CSS Editor on the theme configuration page.

    @kolesnikoff
    kolesnikoff committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    25a0541 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/css_editor 

    Revert Drupal to v 8.4.6.

# Conflicts:
#	composer.json
    @kolesnikoff
    kolesnikoff committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    bdb390f View commit details
    Browse the repository at this point in the history

  4. Revert Migration functionality.

    @kolesnikoff
    kolesnikoff committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    8d4fa29 View commit details
    Browse the repository at this point in the history

  5. Revert drupal-org.make file.

    @kolesnikoff
    kolesnikoff committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    311dc3b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #53 from ymcatwincities/advanced_css 

    Advanced css
    @kolesnikoff
    kolesnikoff committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    9f6b14e View commit details
    Browse the repository at this point in the history

  7. Add manual how to use CSS Editor functionality.

    @kolesnikoff
    kolesnikoff committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    129d716 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2018

  1. setDisplayOptions form type to string_textfield

    @dbuzinov-yx
    dbuzinov-yx committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    719e139 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2018

  1. fix redirect uri to entity internal url

    @dbuzinov
    dbuzinov committed Apr 20, 2018
    Configuration menu
    Copy the full SHA
    a7bb086 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dbuzinov/redirect_fixes' into dev-os8

    @dbuzinov
    dbuzinov committed Apr 20, 2018
    Configuration menu
    Copy the full SHA
    5a04b89 View commit details
    Browse the repository at this point in the history

  3. change user language to node active language

    @dbuzinov
    dbuzinov committed Apr 20, 2018
    Configuration menu
    Copy the full SHA
    39df320 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into dbuzinov/redirect_fixes

    @dbuzinov
    dbuzinov committed Apr 20, 2018
    Configuration menu
    Copy the full SHA
    1da6a4c View commit details
    Browse the repository at this point in the history

  5. Merge branch master and 'dbuzinov/redirect_fixes' into dev-os8 with a… 

    …ctive node language
    @dbuzinov
    dbuzinov committed Apr 20, 2018
    Configuration menu
    Copy the full SHA
    a9155f4 View commit details
    Browse the repository at this point in the history

  6. fix getting lang if not node

    @dbuzinov
    dbuzinov committed Apr 20, 2018
    Configuration menu
    Copy the full SHA
    4dec90d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dbuzinov/redirect_fixes' into dev-os8

    @dbuzinov
    dbuzinov committed Apr 20, 2018
    Configuration menu
    Copy the full SHA
    62b70c6 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2018

  1. fix issues with node creation with url redirects

    @dbuzinov
    dbuzinov committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    e8757ac View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dbuzinov/redirect_fixes' into dev-os8

    @dbuzinov
    dbuzinov committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    75f1afa View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2018

  1. Merge pull request #990 from kolesnikoff/dev-os8 

    Easy 301 Redirects from Content Editing Flow
    @podarok
    podarok committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    50e81d2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1008 from kolesnikoff/feature/css_editor 

    Enable the ability to change the CSS for branch locations and camp locations independently
    @podarok
    podarok committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    ef62164 View commit details
    Browse the repository at this point in the history