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

Upgrade #19

Merged
merged 46 commits into from
Feb 24, 2017
Merged

Upgrade #19

merged 46 commits into from
Feb 24, 2017

Conversation

chriserwin
Copy link
Collaborator

Upgrading from the upstream source repo

ohheyjosh and others added 30 commits February 25, 2016 15:23
@ohheyjosh
Add deploy configuration with a port set option
b84d76c 
Addressing slatedocs#463
@lord
Note the need for an upgraded Ruby
f380e4c
@Jameskmonger
Add JavaScript examples
cec5d66
@lord
Merge pull request #464 from BaButtons/patch-1
1e54d1d 
Address #463
@lord
Merge pull request #511 from Jameskmonger/patch-1
ed6578c 
Add JavaScript examples
@lord
Update rouge languages link in README
ad752cd
@lord
Add PR template
31e021a
@lord
Add issue template
e9384ed
@lord
Update readme
8d3eb0a
@lord
Remove CONTRIBUTING
a68507a
@lord
Bump CHANGELOG
6dd96e1
@alliedsteel @lord
Word missing on Readme.md (#592)
483f5f8
@lord
Add Ruby 2.2.0 to Travis testing matrix
adfd408
@lord
Add some company links to readme
a2b6119
@lord
Remove unused gem middleman-gh-pages
f5b3a20
@lord
Update middleman-syntax
e47cbe5
@lord
Upgrade sprockets
5712ebe
@wodka @lord
make scss variables changeable
d1c3989 
all variables should only provide a default

this would allow us to include the screen.scss and simply set the variables we want to change before that.
@Lovelcp @lord
fix -margin
a8e3737
@lord
Fix another bug where disabling language tabs didn't properly hide HTML
20ed753
@lord
Update ruby version requirements in Travis and README
6831223
@lord
Fix bug where -margin wasn't properly respected even if search was off
08cf3dc
@lord
Fix build, update middleman
62fb143
@lord
Update language list link and count in README
521969b
@lukehoersten @lord
Exec middleman server fails with invalid flags --force-polling and -l…
7d2ab1b 
…. Removed the flags to remedy.
@lord
Add back in middleman flags to Vagrant with new flag syntax
3351506
@lord
Fix incorrect documentation in deploy.sh
e8e2e5e
@lord
Update pull requset template
7857d86
@lord
Cut version 1.4.0
8d75089
@lord
Fix Woocommerce link in readme
4c2574e
rickyrauch and others added 16 commits February 19, 2017 15:58
@rickyrauch @lord
Adding Scale to the list of companies. (#694)
dd2df45
@lord
Add Ruby 2.3.3 to tested rubies
4352bd9
@lord
Add multiple-tabs-per-language test
1fd867c
@koresar @lord
Latest middleman - fixing startup arguments (#653)
cc0f605 
As per middleman/middleman#1866 (comment)
Tested. It works.
@halfcrazy @lord
Update redcarpet gem to 3.4.0 which will solve the unicode error with…
d117207 
… (#660)

h1/h2.
See vmg/redcarpet#538
@paulocoghi @lord
Updated Mozilla localForage link (#665)
37ea3fb 
Old link was broken
@lord
Add Ruby 2.4.0 to .travis.yml
64e4726
@lord
Update middleman and middleman-sprokets, run bundle update
8ed8f51
@lord
Update code highlighting theme from Base16::Monokai to just Monokai
0d6c996
@lord
Switch theme from Monokai to the less neon MonokaiSublime
b3c1a92
@lord
Allow Ruby 2.4.0 to fail for now
7ae2192
@kjg @lord
Update to middleman 4.2.1 for ruby 2.4 fix
577e7e7
@lord
Typo Fix (#693)
e1e4a77 
* Fix Woocommerce link in readme

* Fixed _errors.md typo
@lord
Remove multiple language example from readme, users should just check…
53b6fe1 
… wiki for instructions
@lord
Add version 1.5.0 changelog notes
d3f7825
@chriserwin
Fixing merge conflicts with upstream
ae44d59
@chriserwin chriserwin merged commit 043377f into master Feb 24, 2017
chriserwin added a commit that referenced this pull request Feb 24, 2017
@chriserwin
publish: Upgrade (#19)
d6ae506 
generated from commit 043377f
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
Development

Successfully merging this pull request may close these issues.