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.

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

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

Merged
merged 34 commits into from
Apr 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
75fd07d
OS-8 301 Redirect from Content Editing Flow
rotator Mar 22, 2018
b27f01d
OS-8 Enable OpenY Redirect module
rotator Mar 22, 2018
b49ff3f
OS-8 Add dependency from Redirect module
rotator Mar 22, 2018
5af50de
OS-8 Add custom module to profile openy.info
rotator Mar 22, 2018
41fffdc
Merge branch 'master' into dev-os8
rotator Mar 29, 2018
15827c4
Merge branch 'master' into dev-os8
rotator Mar 29, 2018
790f0a4
Merge branch '8.x-1.x' into dev-os8
podarok Apr 5, 2018
6358662
Create Themind_and_Design.md
podarok Apr 5, 2018
34cd6e5
Rename Themind_and_Design.md to Theming_and_Design.md
podarok Apr 5, 2018
58cd1ba
Merge branch 'master' into dev-os8
kolesnikoff Apr 6, 2018
851a723
Merge pull request #50 from ymcatwincities/8.x-1.x
kolesnikoff Apr 11, 2018
d968898
Merge pull request #51 from ymcatwincities/8.x-1.x
kolesnikoff Apr 16, 2018
9b0ddea
Add CSS Editor module. Cleanup composer.json file.
kolesnikoff Apr 16, 2018
39c730c
Revert "Merge branch 'drupal8_5_1' into 8.x-1.x"
podarok Apr 17, 2018
cb343ef
Merge pull request #1007 from ymcatwincities/revert_core2
podarok Apr 17, 2018
bfb0a0c
Merge pull request #52 from ymcatwincities/8.x-1.x
kolesnikoff Apr 18, 2018
25a0541
Add description how to use CSS Editor on the theme configuration page.
kolesnikoff Apr 18, 2018
bdb390f
Merge branch 'master' into feature/css_editor
kolesnikoff Apr 18, 2018
8d4fa29
Revert Migration functionality.
kolesnikoff Apr 18, 2018
311dc3b
Revert drupal-org.make file.
kolesnikoff Apr 18, 2018
9f6b14e
Merge pull request #53 from ymcatwincities/advanced_css
kolesnikoff Apr 18, 2018
129d716
Add manual how to use CSS Editor functionality.
kolesnikoff Apr 18, 2018
719e139
setDisplayOptions form type to string_textfield
dbuzinov-yx Apr 19, 2018
a7bb086
fix redirect uri to entity internal url
dbuzinov Apr 20, 2018
5a04b89
Merge branch 'dbuzinov/redirect_fixes' into dev-os8
dbuzinov Apr 20, 2018
39df320
change user language to node active language
dbuzinov Apr 20, 2018
1da6a4c
Merge branch 'master' into dbuzinov/redirect_fixes
dbuzinov Apr 20, 2018
a9155f4
Merge branch master and 'dbuzinov/redirect_fixes' into dev-os8 with a…
dbuzinov Apr 20, 2018
4dec90d
fix getting lang if not node
dbuzinov Apr 20, 2018
62b70c6
Merge branch 'dbuzinov/redirect_fixes' into dev-os8
dbuzinov Apr 20, 2018
e8757ac
fix issues with node creation with url redirects
dbuzinov Apr 23, 2018
75f1afa
Merge branch 'dbuzinov/redirect_fixes' into dev-os8
dbuzinov Apr 23, 2018
50e81d2
Merge pull request #990 from kolesnikoff/dev-os8
podarok Apr 24, 2018
ef62164
Merge pull request #1008 from kolesnikoff/feature/css_editor
podarok Apr 24, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 33 additions & 32 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,42 +170,42 @@
}
},
"require": {
"php": ">=5.6 <=7.2",
"php": ">=5.6",
"cweagans/composer-patches": "^1.5.0",
"composer/installers": "^1.0",
"drupal-composer/drupal-scaffold": "^2.0.0",
"drupal/core": "8.5.1",
"drupal/features": "3.7",
"drupal/core": "8.4.6",
"drupal/features": "3.5",
"drupal/confi": "1.4",
"drupal/config_update": "1.5",
"drupal/entity": "1.0-beta3",
"drupal/entity": "1.0-beta1",
"drupal/media_entity": "1.x-dev",
"drupal/media_entity_image": "1.x-dev",
"drupal/media_entity_document": "1.x-dev",
"drupal/address": "1.3",
"drupal/address": "1.2",
"drupal/paragraphs": "1.2",
"drupal/entity_reference_revisions": "1.4",
"drupal/pathauto": "1.1",
"drupal/entity_reference_revisions": "1.3",
"drupal/pathauto": "1.0",
"drupal/ctools": "3.0",
"drupal/token": "1.1",
"drupal/field_group": "3.0-beta1",
"drupal/token": "1.0",
"drupal/field_group": "1.0",
"drupal/video_embed_field": "1.5",
"drupal/jquery_colorpicker": "1.3",
"drupal/entity_browser": "1.4",
"drupal/entity_browser": "1.3",
"drupal/dropzonejs": "1.0-alpha8",
"drupal/inline_entity_form": "1.0-beta1",
"drupal/embed": "1.0",
"drupal/entity_embed": "1.0-beta2",
"drupal/views_block_filter_block": "1.x-dev#29f6523ac806afadc48d9a6ab0c5eb13f6256a1a",
"drupal/views_block_filter_block": "1.x-dev",
"drupal/plugin": "2.5",
"drupal/migrate_plus": "3.0-rc1",
"drupal/migrate_tools": "3.0-rc1",
"drupal/migrate_source_csv": "2.1",
"drupal/migrate_plus": "3.0-beta1",
"drupal/migrate_tools": "3.0-beta1",
"drupal/migrate_source_csv": "2.0",
"drupal/verf": "1.0-beta6",
"drupal/simple_menu_icons": "2.1",
"drupal/simple_menu_icons": "1.x-dev",
"drupal/views_infinite_scroll": "1.5",
"drupal/slick": "1.0",
"drupal/blazy": "1.0-rc2",
"drupal/blazy": "1.0-rc1",
"drupal/geolocation": "1.11",
"library-jaypan/jquery_colorpicker": "1.0.1",
"library-enyo/dropzone": "4.3.0",
Expand All @@ -216,34 +216,35 @@
"library-ckeditor/colorbutton": "4.7.0",
"library-smonetti/btbutton": "1.0.1",
"drupal/slick_views": "1.0-rc2",
"drupal/libraries": "3.0-alpha1",
"drupal/datalayer": "1.0-beta1",
"drupal/libraries": "3.x-dev",
"drupal/datalayer": "1.x-dev",
"drupal/optimizely": "3.0",
"drupal/google_tag": "1.0",
"drupal/google_analytics": "2.2",
"drupal/simple_sitemap": "2.11",
"drupal/redirect": "1.1",
"drupal/metatag": "1.5",
"drupal/simple_sitemap": "2.9",
"drupal/redirect": "1.0-beta1",
"drupal/metatag": "1.3",
"drupal/scheduler": "1.0",
"drupal/webform": "5.0-rc7",
"drupal/webform": "5.0-beta24",
"drupal/captcha": "1.0-beta1",
"drupal/recaptcha": "2.3",
"drupal/rabbit_hole": "1.0-beta4",
"drupal/admin_toolbar": "1.23",
"drupal/recaptcha": "2.2",
"drupal/rabbit_hole": "1.0-beta3",
"drupal/admin_toolbar": "1.20",
"drupal/panelbutton": "1.1",
"drupal/colorbutton": "1.1",
"drupal/better_exposed_filters": "3.0-alpha3",
"drupal/better_exposed_filters": "3.0-alpha2",
"drupal/custom_formatters": "3.0-alpha1",
"drupal/token_filter": "1.0-beta2",
"drupal/views_field_formatter": "1.7",
"drupal/lndr": "1.15",
"drupal/token_filter": "1.0-beta1",
"drupal/views_field_formatter": "1.5",
"drupal/lndr": "1.11",
"doctrine/inflector": "1.1.*",
"drupal/crop": "1.5",
"drupal/focal_point": "1.0-beta6",
"drupal/crop": "1.3",
"drupal/focal_point": "1.0-beta5",
"drupal/media_entity_video": "1.0-beta2",
"drupal/video": "1.2",
"drupal/easy_breadcrumb": "^1.6",
"drupal/ckeditor_bootstrap_buttons": "^1.1",
"drupal/fontyourface": "^3.2"
"drupal/fontyourface": "^3.2",
"drupal/css_editor": "^1.2"
}
}