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

Conversation

dimb
Copy link
Owner

@dimb dimb commented Apr 24, 2018

Make sure these boxes are checked before asking for review of your pull request - thank you!

General checks

  • All coding styles are fulfilled and there are no any issues reported by CodeSniffer CI.
    CI code sniffer errors
  • All tests are running and there are no failed tests reported by CI.
    Behat test results
  • Documentation has been updated according to PR changes.
  • Steps for review have been provided according to PR changes.
    Steps for review
  • Make sure you've provided all necessary hook_update_N to support upgrade path.
  • Make sure your git email is associated with account on drupal.org, otherwise you won't get commits there.
    drupal.org email
  • If you would like to get credits on drupal.org, check documentation.

Thank you for your contribution!

Steps for review

  • Please provide steps for review here.

rotator and others added 30 commits March 22, 2018 15:42
@rotator
OS-8 301 Redirect from Content Editing Flow
75fd07d
@rotator
OS-8 Enable OpenY Redirect module
b27f01d
@rotator
OS-8 Add dependency from Redirect module
b49ff3f
@rotator
OS-8 Add custom module to profile openy.info
5af50de
@rotator
Merge branch 'master' into dev-os8
41fffdc
@rotator
Merge branch 'master' into dev-os8
15827c4
@podarok
Merge branch '8.x-1.x' into dev-os8
790f0a4
@podarok
Create Themind_and_Design.md
6358662
@podarok
Rename Themind_and_Design.md to Theming_and_Design.md
34cd6e5
@kolesnikoff
Merge branch 'master' into dev-os8
58cd1ba
@kolesnikoff
Merge pull request #50 from ymcatwincities/8.x-1.x
851a723 
Merge with master branch
@kolesnikoff
Merge pull request #51 from ymcatwincities/8.x-1.x
d968898 
Merge with master branch
@kolesnikoff
Add CSS Editor module. Cleanup composer.json file.
9b0ddea
@podarok
Revert "Merge branch 'drupal8_5_1' into 8.x-1.x"
39c730c 
This reverts commit 36e2634, reversing
changes made to 13a3dcc.
@podarok
Merge pull request #1007 from ymcatwincities/revert_core2
cb343ef 
Revert "Merge branch 'drupal8_5_1' into 8.x-1.x"
@kolesnikoff
Merge pull request #52 from ymcatwincities/8.x-1.x
bfb0a0c 
Merge with master
@kolesnikoff
Add description how to use CSS Editor on the theme configuration page.
25a0541
@kolesnikoff
Merge branch 'master' into feature/css_editor
bdb390f 
Revert Drupal to v 8.4.6.

# Conflicts:
#	composer.json
@kolesnikoff
Revert Migration functionality.
8d4fa29
@kolesnikoff
Revert drupal-org.make file.
311dc3b
@kolesnikoff
Merge pull request #53 from ymcatwincities/advanced_css
9f6b14e 
Advanced css
@kolesnikoff
Add manual how to use CSS Editor functionality.
129d716
@dbuzinov-yx
setDisplayOptions form type to string_textfield
719e139
@dbuzinov
fix redirect uri to entity internal url
a7bb086
@dbuzinov
Merge branch 'dbuzinov/redirect_fixes' into dev-os8
5a04b89
@dbuzinov
change user language to node active language
39df320
@dbuzinov
Merge branch 'master' into dbuzinov/redirect_fixes
1da6a4c
@dbuzinov
Merge branch master and 'dbuzinov/redirect_fixes' into dev-os8 with a…
a9155f4 
…ctive node language
@dbuzinov
fix getting lang if not node
4dec90d
@dbuzinov
Merge branch 'dbuzinov/redirect_fixes' into dev-os8
62b70c6
dbuzinov and others added 4 commits April 23, 2018 14:36
@dimb dimb merged commit bb796d5 into dimb:8.x-1.x Apr 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@dimb @rotator @podarok @kolesnikoff @dbuzinov-yx @dbuzinov