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

Hotfix/add babel #205 #211

Merged
merged 5 commits into from
Oct 21, 2016
Merged

Hotfix/add babel #205 #211

merged 5 commits into from
Oct 21, 2016

Conversation

gregrickaby
Copy link
Contributor

No description provided.

@gregrickaby gregrickaby merged commit 6894592 into WebDevStudios:master Oct 21, 2016
@gregrickaby gregrickaby deleted the hotfix/add-babel-#205 branch October 21, 2016 17:08
KostasNi added a commit to KostasNi/kn_wd_s that referenced this pull request Nov 26, 2016
* wd_s_track_original: (1040 commits)
  Run through Sass Linter. Fixes WebDevStudios#216
  PHPCS Cleanup of Theme (minus template-tags.php) (WebDevStudios#219)
  Lint Template Tags (WebDevStudios#218)
  New commit message
  Enhancement/screen reader text white space (WebDevStudios#217)
  don’t lint minified files
  package.json bump to latest
  bower.json bump to latest
  New commit message
  improve svg template tag. fixes WebDevStudios#207. props @samikeijonen (WebDevStudios#212)
  Hotfix/add babel WebDevStudios#205 (WebDevStudios#211)
  Hotfix/update readme WebDevStudios#208 (WebDevStudios#210)
  remove grunt. fixes WebDevStudios#206. (WebDevStudios#209)
  update Sass Lint configuration to be less in-your-face (WebDevStudios#202)
  add .editorconfig with WDS/WP standards in mind (WebDevStudios#204)
  add gulp js:lint task to readme
  gulp scripts
  run eslint —fix
  add eslint wordpress package
  swap deprecated .eslintrc with .eslintrc.js
  ...

# Conflicts:
#	404.php
#	Gulpfile.js
#	archive.php
#	assets/images/svg-icons/_IcoMoon.json
#	assets/images/svg-icons/bars.svg
#	assets/images/svg-icons/close.svg
#	assets/images/svg-icons/facebook-square.svg
#	assets/images/svg-icons/googleplus-square.svg
#	assets/images/svg-icons/instagram-square.svg
#	assets/sass/style.scss
#	buddypress.php
#	comments.php
#	footer.php
#	functions.php
#	header.php
#	inc/custom-header.php
#	inc/customizer.php
#	inc/extras.php
#	inc/jetpack.php
#	inc/scripts.php
#	inc/template-tags.php
#	index.php
#	page.php
#	rtl.css
#	search.php
#	searchform.php
#	sidebar.php
#	single.php
#	style.css
#	template-parts/content-buddypress.php
#	template-parts/content-none.php
#	template-parts/content-page.php
#	template-parts/content-search.php
#	template-parts/content.php
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant