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 main branch #7

Merged
merged 600 commits into from Mar 27, 2018
Merged

Update with the main branch #7

merged 600 commits into from Mar 27, 2018

Conversation

dimb
Copy link
Owner

@dimb dimb commented Mar 27, 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.

alexandar87 and others added 30 commits August 23, 2017 12:26
@alexandar87
[YLI-421]: Make page title same as on blog pages.
747df07
@ddrozdik
Merge pull request #320 from alexandar87/YLI-399
d324d43 
[YLI-399]: Added styles for login and register.
@alexandar87
[YLI-422]: Updated image styles for full and half.
d8711b0
@ddrozdik
Merge pull request #326 from alexandar87/YLI-422
055ac30 
[YLI-422]: Updated image styles for full and half.
@alexandar87
[YLI-419]: Updated media page to add container and title.
a13e73e
@alexandar87
[YLI-419]: Center media.
8027153
@alexandar87
[YLI-419]: Fixed webform button.
2099692
@alexandar87
[YLI-419]: Changed template name.
ad95380
@alexandar87
[YLI-439]: Color of checkbox labels.
bc1be35
@alexandar87
[YLI-439]: Color of checkbox labels.
d98df0d
@fandm
[YLI-371]: Add Step 5.1; Some refactoring for Join step.
eb3a798
[YLI-404]: Membership fixes.
8c9029d
@alexander-danilenko
YLI-436
b8d9405
@alexandar87
[YLI-440]: Updated font on program page.
ee69929
@ddrozdik
Merge pull request #337 from alexandar87/YLI-440
5f08440 
[YLI-440]: Updated font on program page.
@ddrozdik
Merge pull request #331 from alexandar87/YLI-439
8b04458 
[YLI-439]: Color of checkbox labels.
@ddrozdik
Merge pull request #336 from alexandar87/YLI-404
a9eb266 
[YLI-404]: Membership fixes.
@alexander-danilenko
YLI-436
fa18708
@alexander-danilenko
Merge remote-tracking branch 'origin/feature/ccc-migrations' into fea…
332b8fa 
…ture/ccc-migrations

# Conflicts:
#	docroot/modules/custom/ymcali_master/ymcali_master.install
@alexandar87
[YLI-133], [YLI-249], [YLI-371], [YLI-372], [YLI-373], [YLI-442]: Sty…
999304a 
…ling of membership steps.
@alexandar87
[YLI-133]: Updated table styles
e17eb6f
@alexandar87
[YLI-133]: Implementing style fixes for membership pages.
2a57521
@alexandar87
[YLI-134]: Styled renew button and message.
af2935a
@ddrozdik
Merge pull request #363 from alexandar87/YLI-133-styles
2990fb5 
Yli 133 styles
@alexander-danilenko
YLI-446
b5025f0
@ddrozdik
Merge pull request #366 from fat763/feature/YLI-446
072f533 
[YLI-446]: Additional sessions list on class page
@alexandar87
[YLI-456]: Updated templates for classes.
096044b
@alexandar87
[YLI-456]: Reformat code.
0d9a6b4
@ddrozdik
Fix landing page layout. Add conditions to other templates
26c3439
@ddrozdik
Merge pull request #368 from alexandar87/YLI-456
4de8de1 
[YLI-456]: Updated templates for classes.
podarok and others added 29 commits March 2, 2018 11:16
@podarok
Update Contributing.md
3e5c077
@podarok
Merge branch '8.x-1.x' of https://github.com/ymcatwincities/openy int…
9d5030b 
…o develop
@podarok
Merge readmes
e875070
@podarok
Merge pull request #976 from ymcatwincities/merge_try
e402c40 
Merge try
@podarok
Update Contributing.md
bbc566b
@podarok
Create AcceptanceTesting.md
0640cdd
@podarok
Update AcceptanceTesting.md
a77e69c
@podarok
Update and rename README.txt to README.md
227a673
@podarok
Try to fix google_tag dev issue
7692fe4
@Sanchiz
Merge pull request #978 from ymcatwincities/podarok-patch-1
b058092 
Try to fix google_tag dev issue
@kolesnikoff
Merge pull request #42 from ymcatwincities/8.x-1.x
01a3efe 
Merge with master branch
@kolesnikoff
OS-1: OpenY Header. Adjustment according to the latest designs.
04a6b1c
@podarok
Update field.field.paragraph.microsites_menu.field_prgf_ms_menu_hide_…
d983abd 
…menu.yml
@YMCA-GTC
Update AcceptanceTesting.md
9c56ffa 
Making minor copy changes for clarity
@podarok
Merge pull request #977 from ymcatwincities/acceptance_testing_doc
3adebd7 
Create AcceptanceTesting.md
@podarok
Merge pull request #972 from kolesnikoff/bugfixing
4f7f577 
Make “Hide Main Menu” functionality available from any page. Minor bug fixing.
add ActiveNet module
aaef1d2
remove debug comment and fix newlines
87f2e00
@podarok
Merge pull request #984 from mattshoaf/activenet
e7fe19a 
ActiveNet module
@podarok
Create README.md
d3dce7e
@podarok
Update openy.info.yml
e10299e
@kolesnikoff
Merge pull request #43 from ymcatwincities/8.x-1.x
cd14051 
Merge with master branch
@kolesnikoff
Merge pull request #44 from kolesnikoff/master
4abaf15 
Merge with master
@kolesnikoff
OS-1: OpenY Header. Restore the default OpenY colors and white border…
811a024 
… around the dropdown menu.
@kolesnikoff
OS-1: Update header. Commit missed files.
a3f2f71
@podarok
Merge pull request #985 from ymcatwincities/check_version_string
acba064 
Update openy.info.yml
@podarok
Merge pull request #982 from kolesnikoff/feature/header
c51e1b5 
Update OpenY Header according to the new design
@kolesnikoff
Specified the revision of btbutton library instead of master.
9156df1
@podarok
Merge pull request #975 from kolesnikoff/feature/ckeditor_bootstrap_b…
3ef9011 
…uttons

Add CKEditor Bootstrap Buttons module.
@dimb dimb merged commit de4dd26 into dimb:8.x-1.x Mar 27, 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