From f3591651f12446244a977b2389e2f681af316116 Mon Sep 17 00:00:00 2001
From: John Ferlito
Date: Sat, 27 Jun 2015 16:33:07 +1000
Subject: [PATCH 001/225] Fix Changelog date
Version 1.2 was released in 2015 not 2014
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59ee6a441e5..ee496db6c9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
## Version 1.2
-*June 20, 2014*
+*June 20, 2015*
**Fixes:**
From ae3d50277ee81e837fd8f89726a213465cd43537 Mon Sep 17 00:00:00 2001
From: Robert Lord
Date: Sun, 28 Jun 2015 12:44:12 -0700
Subject: [PATCH 002/225] Update RedCarpet gem
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 3a2a2e01a82..0933b9d6839 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'middleman-gh-pages', '~> 0.0.3'
gem 'middleman-syntax', '~> 2.0.0'
gem 'middleman-autoprefixer', '~> 2.4.4'
gem 'rouge', '~> 1.9.0'
-gem 'redcarpet', '~> 3.3.1'
+gem 'redcarpet', '~> 3.3.2'
gem 'rake', '~> 10.4.2'
gem 'therubyracer', '~> 0.12.1', platforms: :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index f9978492816..fff5ee10cb3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
rb-fsevent (0.9.5)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
- redcarpet (3.3.1)
+ redcarpet (3.3.2)
ref (1.0.5)
rouge (1.9.0)
sass (3.4.14)
@@ -135,6 +135,6 @@ DEPENDENCIES
middleman-gh-pages (~> 0.0.3)
middleman-syntax (~> 2.0.0)
rake (~> 10.4.2)
- redcarpet (~> 3.3.1)
+ redcarpet (~> 3.3.2)
rouge (~> 1.9.0)
therubyracer (~> 0.12.1)
From ad3b2769fe8e3be645314a09f32a169ff1dfbcbe Mon Sep 17 00:00:00 2001
From: Robert Lord
Date: Mon, 6 Jul 2015 18:54:45 -0700
Subject: [PATCH 003/225] Update tocify to recache headers on image load, fixes
#293
---
source/javascripts/app/_toc.js | 13 +++++++++----
source/javascripts/lib/_imagesloaded.min.js | 7 +++++++
2 files changed, 16 insertions(+), 4 deletions(-)
create mode 100644 source/javascripts/lib/_imagesloaded.min.js
diff --git a/source/javascripts/app/_toc.js b/source/javascripts/app/_toc.js
index d84bf8e197a..bc2aa3e1f11 100644
--- a/source/javascripts/app/_toc.js
+++ b/source/javascripts/app/_toc.js
@@ -1,5 +1,6 @@
//= require ../lib/_jquery_ui
//= require ../lib/_jquery.tocify
+//= require ../lib/_imagesloaded.min
(function (global) {
'use strict';
@@ -37,14 +38,18 @@
// Hack to make already open sections to start opened,
// instead of displaying an ugly animation
- function animate () {
+ function animate() {
setTimeout(function() {
toc.setOption('showEffectSpeed', 180);
}, 50);
}
- $(makeToc);
- $(animate);
-
+ $(function() {
+ makeToc();
+ animate();
+ $('.content').imagesLoaded( function() {
+ global.toc.calculateHeights();
+ });
+ });
})(window);
diff --git a/source/javascripts/lib/_imagesloaded.min.js b/source/javascripts/lib/_imagesloaded.min.js
new file mode 100644
index 00000000000..d66f658937d
--- /dev/null
+++ b/source/javascripts/lib/_imagesloaded.min.js
@@ -0,0 +1,7 @@
+/*!
+ * imagesLoaded PACKAGED v3.1.8
+ * JavaScript is all like "You images are done yet or what?"
+ * MIT License
+ */
+
+(function(){function e(){}function t(e,t){for(var n=e.length;n--;)if(e[n].listener===t)return n;return-1}function n(e){return function(){return this[e].apply(this,arguments)}}var i=e.prototype,r=this,o=r.EventEmitter;i.getListeners=function(e){var t,n,i=this._getEvents();if("object"==typeof e){t={};for(n in i)i.hasOwnProperty(n)&&e.test(n)&&(t[n]=i[n])}else t=i[e]||(i[e]=[]);return t},i.flattenListeners=function(e){var t,n=[];for(t=0;e.length>t;t+=1)n.push(e[t].listener);return n},i.getListenersAsObject=function(e){var t,n=this.getListeners(e);return n instanceof Array&&(t={},t[e]=n),t||n},i.addListener=function(e,n){var i,r=this.getListenersAsObject(e),o="object"==typeof n;for(i in r)r.hasOwnProperty(i)&&-1===t(r[i],n)&&r[i].push(o?n:{listener:n,once:!1});return this},i.on=n("addListener"),i.addOnceListener=function(e,t){return this.addListener(e,{listener:t,once:!0})},i.once=n("addOnceListener"),i.defineEvent=function(e){return this.getListeners(e),this},i.defineEvents=function(e){for(var t=0;e.length>t;t+=1)this.defineEvent(e[t]);return this},i.removeListener=function(e,n){var i,r,o=this.getListenersAsObject(e);for(r in o)o.hasOwnProperty(r)&&(i=t(o[r],n),-1!==i&&o[r].splice(i,1));return this},i.off=n("removeListener"),i.addListeners=function(e,t){return this.manipulateListeners(!1,e,t)},i.removeListeners=function(e,t){return this.manipulateListeners(!0,e,t)},i.manipulateListeners=function(e,t,n){var i,r,o=e?this.removeListener:this.addListener,s=e?this.removeListeners:this.addListeners;if("object"!=typeof t||t instanceof RegExp)for(i=n.length;i--;)o.call(this,t,n[i]);else for(i in t)t.hasOwnProperty(i)&&(r=t[i])&&("function"==typeof r?o.call(this,i,r):s.call(this,i,r));return this},i.removeEvent=function(e){var t,n=typeof e,i=this._getEvents();if("string"===n)delete i[e];else if("object"===n)for(t in i)i.hasOwnProperty(t)&&e.test(t)&&delete i[t];else delete this._events;return this},i.removeAllListeners=n("removeEvent"),i.emitEvent=function(e,t){var n,i,r,o,s=this.getListenersAsObject(e);for(r in s)if(s.hasOwnProperty(r))for(i=s[r].length;i--;)n=s[r][i],n.once===!0&&this.removeListener(e,n.listener),o=n.listener.apply(this,t||[]),o===this._getOnceReturnValue()&&this.removeListener(e,n.listener);return this},i.trigger=n("emitEvent"),i.emit=function(e){var t=Array.prototype.slice.call(arguments,1);return this.emitEvent(e,t)},i.setOnceReturnValue=function(e){return this._onceReturnValue=e,this},i._getOnceReturnValue=function(){return this.hasOwnProperty("_onceReturnValue")?this._onceReturnValue:!0},i._getEvents=function(){return this._events||(this._events={})},e.noConflict=function(){return r.EventEmitter=o,e},"function"==typeof define&&define.amd?define("eventEmitter/EventEmitter",[],function(){return e}):"object"==typeof module&&module.exports?module.exports=e:this.EventEmitter=e}).call(this),function(e){function t(t){var n=e.event;return n.target=n.target||n.srcElement||t,n}var n=document.documentElement,i=function(){};n.addEventListener?i=function(e,t,n){e.addEventListener(t,n,!1)}:n.attachEvent&&(i=function(e,n,i){e[n+i]=i.handleEvent?function(){var n=t(e);i.handleEvent.call(i,n)}:function(){var n=t(e);i.call(e,n)},e.attachEvent("on"+n,e[n+i])});var r=function(){};n.removeEventListener?r=function(e,t,n){e.removeEventListener(t,n,!1)}:n.detachEvent&&(r=function(e,t,n){e.detachEvent("on"+t,e[t+n]);try{delete e[t+n]}catch(i){e[t+n]=void 0}});var o={bind:i,unbind:r};"function"==typeof define&&define.amd?define("eventie/eventie",o):e.eventie=o}(this),function(e,t){"function"==typeof define&&define.amd?define(["eventEmitter/EventEmitter","eventie/eventie"],function(n,i){return t(e,n,i)}):"object"==typeof exports?module.exports=t(e,require("wolfy87-eventemitter"),require("eventie")):e.imagesLoaded=t(e,e.EventEmitter,e.eventie)}(window,function(e,t,n){function i(e,t){for(var n in t)e[n]=t[n];return e}function r(e){return"[object Array]"===d.call(e)}function o(e){var t=[];if(r(e))t=e;else if("number"==typeof e.length)for(var n=0,i=e.length;i>n;n++)t.push(e[n]);else t.push(e);return t}function s(e,t,n){if(!(this instanceof s))return new s(e,t);"string"==typeof e&&(e=document.querySelectorAll(e)),this.elements=o(e),this.options=i({},this.options),"function"==typeof t?n=t:i(this.options,t),n&&this.on("always",n),this.getImages(),a&&(this.jqDeferred=new a.Deferred);var r=this;setTimeout(function(){r.check()})}function f(e){this.img=e}function c(e){this.src=e,v[e]=this}var a=e.jQuery,u=e.console,h=u!==void 0,d=Object.prototype.toString;s.prototype=new t,s.prototype.options={},s.prototype.getImages=function(){this.images=[];for(var e=0,t=this.elements.length;t>e;e++){var n=this.elements[e];"IMG"===n.nodeName&&this.addImage(n);var i=n.nodeType;if(i&&(1===i||9===i||11===i))for(var r=n.querySelectorAll("img"),o=0,s=r.length;s>o;o++){var f=r[o];this.addImage(f)}}},s.prototype.addImage=function(e){var t=new f(e);this.images.push(t)},s.prototype.check=function(){function e(e,r){return t.options.debug&&h&&u.log("confirm",e,r),t.progress(e),n++,n===i&&t.complete(),!0}var t=this,n=0,i=this.images.length;if(this.hasAnyBroken=!1,!i)return this.complete(),void 0;for(var r=0;i>r;r++){var o=this.images[r];o.on("confirm",e),o.check()}},s.prototype.progress=function(e){this.hasAnyBroken=this.hasAnyBroken||!e.isLoaded;var t=this;setTimeout(function(){t.emit("progress",t,e),t.jqDeferred&&t.jqDeferred.notify&&t.jqDeferred.notify(t,e)})},s.prototype.complete=function(){var e=this.hasAnyBroken?"fail":"done";this.isComplete=!0;var t=this;setTimeout(function(){if(t.emit(e,t),t.emit("always",t),t.jqDeferred){var n=t.hasAnyBroken?"reject":"resolve";t.jqDeferred[n](t)}})},a&&(a.fn.imagesLoaded=function(e,t){var n=new s(this,e,t);return n.jqDeferred.promise(a(this))}),f.prototype=new t,f.prototype.check=function(){var e=v[this.img.src]||new c(this.img.src);if(e.isConfirmed)return this.confirm(e.isLoaded,"cached was confirmed"),void 0;if(this.img.complete&&void 0!==this.img.naturalWidth)return this.confirm(0!==this.img.naturalWidth,"naturalWidth"),void 0;var t=this;e.on("confirm",function(e,n){return t.confirm(e.isLoaded,n),!0}),e.check()},f.prototype.confirm=function(e,t){this.isLoaded=e,this.emit("confirm",this,t)};var v={};return c.prototype=new t,c.prototype.check=function(){if(!this.isChecked){var e=new Image;n.bind(e,"load",this),n.bind(e,"error",this),e.src=this.src,this.isChecked=!0}},c.prototype.handleEvent=function(e){var t="on"+e.type;this[t]&&this[t](e)},c.prototype.onload=function(e){this.confirm(!0,"onload"),this.unbindProxyEvents(e)},c.prototype.onerror=function(e){this.confirm(!1,"onerror"),this.unbindProxyEvents(e)},c.prototype.confirm=function(e,t){this.isConfirmed=!0,this.isLoaded=e,this.emit("confirm",this,t)},c.prototype.unbindProxyEvents=function(e){n.unbind(e.target,"load",this),n.unbind(e.target,"error",this)},s});
\ No newline at end of file
From 0c37f0dfc4985fc8a9aad43a91bc5bd870d423c2 Mon Sep 17 00:00:00 2001
From: Rezan Achmad
Date: Thu, 16 Jul 2015 15:09:59 +0800
Subject: [PATCH 004/225] Add OAuth.io to README
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index efb7e1eb8cd..0d89f86f1f5 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,7 @@ Examples of Slate in the Wild
* [viagogo API Documentation](http://developer.viagogo.net/)
* [Fidor Bank API Documentation](http://docs.fidor.de/)
* [Market Prophit API Documentation](http://developer.marketprophit.com/)
+* [OAuth.io API Documentation](http://docs.oauth.io/)
(Feel free to add your site to this list in a pull request!)
From 5cfcbc7f7b786cc8fa0a2e643dfbdc34298c4eb8 Mon Sep 17 00:00:00 2001
From: Ivan Matyunin
Date: Wed, 29 Jul 2015 16:50:28 -0400
Subject: [PATCH 005/225] Improved the appearance of code blocks when printing.
---
source/stylesheets/print.css.scss | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/source/stylesheets/print.css.scss b/source/stylesheets/print.css.scss
index 4bda057f019..b328d05bac1 100644
--- a/source/stylesheets/print.css.scss
+++ b/source/stylesheets/print.css.scss
@@ -48,6 +48,12 @@ body {
font-size: 0.8em;
}
+ pre {
+ code {
+ border: 0;
+ }
+ }
+
pre {
padding: 1.3em;
}
From 5e605079eb0f761fdb68d35605bc73bd074f5f3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Baptiste=20B=C3=A9chu?=
Date: Tue, 4 Aug 2015 02:42:21 -0700
Subject: [PATCH 006/225] Add Aircall.io to README
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 0d89f86f1f5..541665b8810 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ Examples of Slate in the Wild
* [Fidor Bank API Documentation](http://docs.fidor.de/)
* [Market Prophit API Documentation](http://developer.marketprophit.com/)
* [OAuth.io API Documentation](http://docs.oauth.io/)
+* [Aircall for Developers](http://developer.aircall.io/)
(Feel free to add your site to this list in a pull request!)
From 87a2950adebca54352a6dac49e22bd764a45e93e Mon Sep 17 00:00:00 2001
From: Dhiren Audich
Date: Wed, 5 Aug 2015 11:04:29 -0400
Subject: [PATCH 007/225] adding supporkit docs as an example of the slate docs
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 541665b8810..7f7e71f6b19 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,7 @@ Examples of Slate in the Wild
* [Market Prophit API Documentation](http://developer.marketprophit.com/)
* [OAuth.io API Documentation](http://docs.oauth.io/)
* [Aircall for Developers](http://developer.aircall.io/)
+* [SupportKit API Docs](http://docs.supportkit.io/)
(Feel free to add your site to this list in a pull request!)
From befb8d6fac23a4db99746173e00ea637ecc6536f Mon Sep 17 00:00:00 2001
From: Richard Lee
Date: Wed, 5 Aug 2015 22:14:16 +0800
Subject: [PATCH 008/225] Remove therubyracer
---
Gemfile | 1 -
Gemfile.lock | 9 +++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Gemfile b/Gemfile
index 0933b9d6839..ef9d21c44bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,4 +9,3 @@ gem 'rouge', '~> 1.9.0'
gem 'redcarpet', '~> 3.3.2'
gem 'rake', '~> 10.4.2'
-gem 'therubyracer', '~> 0.12.1', platforms: :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index fff5ee10cb3..d0250db6016 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,7 +41,6 @@ GEM
i18n (0.7.0)
json (1.8.3)
kramdown (1.7.0)
- libv8 (3.16.14.7)
listen (2.10.1)
celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3)
@@ -98,7 +97,6 @@ GEM
rb-inotify (0.9.5)
ffi (>= 0.5.0)
redcarpet (3.3.2)
- ref (1.0.5)
rouge (1.9.0)
sass (3.4.14)
sprockets (2.12.3)
@@ -111,9 +109,6 @@ GEM
sprockets-sass (1.3.1)
sprockets (~> 2.0)
tilt (~> 1.1)
- therubyracer (0.12.2)
- libv8 (~> 3.16.14.0)
- ref
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
@@ -137,4 +132,6 @@ DEPENDENCIES
rake (~> 10.4.2)
redcarpet (~> 3.3.2)
rouge (~> 1.9.0)
- therubyracer (~> 0.12.1)
+
+BUNDLED WITH
+ 1.10.5
From 83d655b55e55753da00ae0b67c7cb0501eaa6731 Mon Sep 17 00:00:00 2001
From: Richard Lee
Date: Thu, 6 Aug 2015 16:58:57 +0800
Subject: [PATCH 009/225] Update rouge and middleman-autoprefixer
---
Gemfile | 4 ++--
Gemfile.lock | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Gemfile b/Gemfile
index ef9d21c44bb..9a9931a5fab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,8 +4,8 @@ source 'https://rubygems.org'
gem 'middleman', '~>3.3.10'
gem 'middleman-gh-pages', '~> 0.0.3'
gem 'middleman-syntax', '~> 2.0.0'
-gem 'middleman-autoprefixer', '~> 2.4.4'
-gem 'rouge', '~> 1.9.0'
+gem 'middleman-autoprefixer', '~> 2.5.0'
+gem 'rouge', '~> 1.9.1'
gem 'redcarpet', '~> 3.3.2'
gem 'rake', '~> 10.4.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index d0250db6016..32cb6411fae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,13 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (4.1.11)
+ activesupport (4.1.12)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
- autoprefixer-rails (5.2.0.1)
+ autoprefixer-rails (5.2.1.1)
execjs
json
celluloid (0.16.0)
@@ -31,7 +31,7 @@ GEM
sass (>= 3.2, < 3.5)
erubis (2.7.0)
execjs (2.5.2)
- ffi (1.9.8)
+ ffi (1.9.10)
haml (4.0.6)
tilt
hike (1.2.3)
@@ -56,7 +56,7 @@ GEM
middleman-sprockets (>= 3.1.2)
sass (>= 3.4.0, < 4.0)
uglifier (~> 2.5)
- middleman-autoprefixer (2.4.4)
+ middleman-autoprefixer (2.5.0)
autoprefixer-rails (~> 5.2.0)
middleman-core (>= 3.3.3)
middleman-core (3.3.12)
@@ -97,7 +97,7 @@ GEM
rb-inotify (0.9.5)
ffi (>= 0.5.0)
redcarpet (3.3.2)
- rouge (1.9.0)
+ rouge (1.9.1)
sass (3.4.14)
sprockets (2.12.3)
hike (~> 1.2)
@@ -126,12 +126,12 @@ PLATFORMS
DEPENDENCIES
middleman (~> 3.3.10)
- middleman-autoprefixer (~> 2.4.4)
+ middleman-autoprefixer (~> 2.5.0)
middleman-gh-pages (~> 0.0.3)
middleman-syntax (~> 2.0.0)
rake (~> 10.4.2)
redcarpet (~> 3.3.2)
- rouge (~> 1.9.0)
+ rouge (~> 1.9.1)
BUNDLED WITH
1.10.5
From 47e18611f2ab66eaaa97c3fbc6b127226d25b795 Mon Sep 17 00:00:00 2001
From: Richard Lee
Date: Thu, 6 Aug 2015 18:40:17 +0800
Subject: [PATCH 010/225] Update other dependencies
---
Gemfile.lock | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 32cb6411fae..f9400056dad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
uber (~> 0.0.4)
i18n (0.7.0)
json (1.8.3)
- kramdown (1.7.0)
+ kramdown (1.8.0)
listen (2.10.1)
celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3)
@@ -82,7 +82,7 @@ GEM
middleman-core (~> 3.2)
rouge (~> 1.0)
minitest (5.7.0)
- multi_json (1.11.1)
+ multi_json (1.11.2)
padrino-helpers (0.12.5)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.5)
@@ -98,8 +98,8 @@ GEM
ffi (>= 0.5.0)
redcarpet (3.3.2)
rouge (1.9.1)
- sass (3.4.14)
- sprockets (2.12.3)
+ sass (3.4.16)
+ sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
From 5d27eaf9cf31b439b0733907e5a86cde08fcaee2 Mon Sep 17 00:00:00 2001
From: Gabriel Falkenberg
Date: Sat, 8 Aug 2015 17:23:29 +0200
Subject: [PATCH 011/225] Use HTTPS for github urls.
---
source/index.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/index.md b/source/index.md
index 4c1fa8c9f7d..9ce6c96b606 100644
--- a/source/index.md
+++ b/source/index.md
@@ -8,7 +8,7 @@ language_tabs:
toc_footers:
- Sign Up for a Developer Key
- - Documentation Powered by Slate
+ - Documentation Powered by Slate
includes:
- errors
@@ -22,7 +22,7 @@ Welcome to the Kittn API! You can use our API to access Kittn API endpoints, whi
We have language bindings in Shell, Ruby, and Python! You can view code examples in the dark area to the right, and you can switch the programming language of the examples with the tabs in the top right.
-This example API documentation page was created with [Slate](http://github.com/tripit/slate). Feel free to edit it and use it as a base for your own API's documentation.
+This example API documentation page was created with [Slate](https://github.com/tripit/slate). Feel free to edit it and use it as a base for your own API's documentation.
# Authentication
From ed9e958df75c0f1f6da4d9f1461a24f6ea31cf73 Mon Sep 17 00:00:00 2001
From: Victor Quinn
Date: Thu, 13 Aug 2015 15:54:18 -0400
Subject: [PATCH 012/225] Add SocialRadar to the list of docs sites using Slate
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 7f7e71f6b19..535960d1682 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,7 @@ Examples of Slate in the Wild
* [OAuth.io API Documentation](http://docs.oauth.io/)
* [Aircall for Developers](http://developer.aircall.io/)
* [SupportKit API Docs](http://docs.supportkit.io/)
+* [SocialRadar's LocationKit Docs](https://docs.locationkit.io/ios)
(Feel free to add your site to this list in a pull request!)
From 977f2568d75f0b4026e91e3c711294ecf7a07df1 Mon Sep 17 00:00:00 2001
From: Victor Quinn
Date: Thu, 13 Aug 2015 16:44:05 -0400
Subject: [PATCH 013/225] Fix path to iOS docs
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 535960d1682..e7a9fa72747 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ Examples of Slate in the Wild
* [OAuth.io API Documentation](http://docs.oauth.io/)
* [Aircall for Developers](http://developer.aircall.io/)
* [SupportKit API Docs](http://docs.supportkit.io/)
-* [SocialRadar's LocationKit Docs](https://docs.locationkit.io/ios)
+* [SocialRadar's LocationKit Docs](https://docs.locationkit.io/)
(Feel free to add your site to this list in a pull request!)
From 92d732f8a4e7d374ada4d778345d3fc403460a91 Mon Sep 17 00:00:00 2001
From: Romain Pomier
Date: Thu, 27 Aug 2015 11:09:28 +0200
Subject: [PATCH 014/225] Install nodejs in Dockerfile to replace therubyracer
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 8183c7a8b04..bb826dbf202 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
FROM ubuntu:trusty
RUN apt-get update
-RUN apt-get install -yq ruby ruby-dev build-essential git
+RUN apt-get install -yq ruby ruby-dev build-essential git nodejs
RUN gem install --no-ri --no-rdoc bundler
ADD Gemfile /app/Gemfile
ADD Gemfile.lock /app/Gemfile.lock
From 1c508a738f0ce51305a3c9148d519dcb0d3d516b Mon Sep 17 00:00:00 2001
From: Brett Porter
Date: Wed, 23 Sep 2015 15:09:13 +1000
Subject: [PATCH 015/225] Add SafetyCulture API to the list
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index e7a9fa72747..98c03e4a6b1 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,7 @@ Examples of Slate in the Wild
* [Aircall for Developers](http://developer.aircall.io/)
* [SupportKit API Docs](http://docs.supportkit.io/)
* [SocialRadar's LocationKit Docs](https://docs.locationkit.io/)
+* [SafetyCulture API Documentation](https://developer.safetyculture.io/)
(Feel free to add your site to this list in a pull request!)
From fcea9014d2710255ec4419d30f177abb94db6c29 Mon Sep 17 00:00:00 2001
From: Andreas Madsack
Date: Mon, 28 Sep 2015 17:03:48 +0200
Subject: [PATCH 016/225] mount volume for live changes to Dockerfile
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 98c03e4a6b1..4351fdec6d5 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Or use the included Dockerfile! (must install Docker first)
```shell
docker build -t slate .
-docker run -d -p 4567:4567 slate
+docker run -d -p 4567:4567 --name slate -v $(pwd)/source:/app/source slate
```
You can now see the docs at . Whoa! That was fast!
From e0cdc7339e51826d1bc35196a6530e6a05bac31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rouven=20We=C3=9Fling?=
Date: Wed, 30 Sep 2015 17:56:34 +0200
Subject: [PATCH 017/225] Add hosting.de API docs to the list
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 4351fdec6d5..2f042e7f2c2 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,7 @@ Examples of Slate in the Wild
* [SupportKit API Docs](http://docs.supportkit.io/)
* [SocialRadar's LocationKit Docs](https://docs.locationkit.io/)
* [SafetyCulture API Documentation](https://developer.safetyculture.io/)
+* [hosting.de API Documentation](https://www.hosting.de/docs/api/)
(Feel free to add your site to this list in a pull request!)
From 57aa27c0eb0474733bb115b63991ba2509d2bedc Mon Sep 17 00:00:00 2001
From: Marc Guyer
Date: Tue, 6 Oct 2015 10:51:23 -0400
Subject: [PATCH 018/225] Basic support for Vagrant
---
.gitignore | 3 ++-
README.md | 31 ++++++++++++++++++-------------
Vagrantfile | 37 +++++++++++++++++++++++++++++++++++++
3 files changed, 57 insertions(+), 14 deletions(-)
create mode 100644 Vagrantfile
diff --git a/.gitignore b/.gitignore
index f6fc8c00b25..f1953e3a979 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,9 +14,10 @@ tmp
*.DS_STORE
build/
.cache
+.vagrant
# YARD artifacts
.yardoc
_yardoc
doc/
-.idea/
\ No newline at end of file
+.idea/
diff --git a/README.md b/README.md
index 2f042e7f2c2..b2e4105aeb9 100644
--- a/README.md
+++ b/README.md
@@ -43,23 +43,27 @@ You're going to need:
### Getting Set Up
- 1. Fork this repository on Github.
- 2. Clone *your forked repository* (not our original one) to your hard drive with `git clone https://github.com/YOURUSERNAME/slate.git`
- 3. `cd slate`
- 4. Install all dependencies: `bundle install`
- 5. Start the test server: `bundle exec middleman server`
-
-Or use the included Dockerfile! (must install Docker first)
-
+1. Fork this repository on Github.
+2. Clone *your forked repository* (not our original one) to your hard drive with `git clone https://github.com/YOURUSERNAME/slate.git`
+3. `cd slate`
+4. Initialize and start
+ * Manually:
+```shell
+bundle install
+bundle exec middleman server
+```
+ * Or via Docker (must install Docker first)
```shell
docker build -t slate .
docker run -d -p 4567:4567 --name slate -v $(pwd)/source:/app/source slate
+```
+ You can now see the docs at http://localhost:4567. Whoa! That was fast! Note: if you're using the Docker setup on OSX, the docs will be
+ availalable at the output of `boot2docker ip` instead of `localhost:4567`.
+ * Or via Vagrant
+```shell
+vagrant up
```
-
-You can now see the docs at . Whoa! That was fast!
-
-*Note: if you're using the Docker setup on OSX, the docs will be
-availalable at the output of `boot2docker ip` instead of `localhost:4567`.*
+ You can now see the docs at http://localhost:4567.
Now that Slate is all set up your machine, you'll probably want to learn more about [editing Slate markdown](https://github.com/tripit/slate/wiki/Markdown-Syntax), or [how to publish your docs](https://github.com/tripit/slate/wiki/Deploying-Slate).
@@ -97,6 +101,7 @@ Examples of Slate in the Wild
* [SocialRadar's LocationKit Docs](https://docs.locationkit.io/)
* [SafetyCulture API Documentation](https://developer.safetyculture.io/)
* [hosting.de API Documentation](https://www.hosting.de/docs/api/)
+* [CheddarGetter API Documentation](http://docs.cheddargetter.com)
(Feel free to add your site to this list in a pull request!)
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 00000000000..f00c7d1b60d
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,37 @@
+Vagrant.configure(2) do |config|
+ config.vm.box = "ubuntu/trusty64"
+ config.vm.network :forwarded_port, guest: 4567, host: 4567
+ config.vm.provider "virtualbox" do |vb|
+ vb.memory = "384"
+ end
+
+ config.vm.provision "bootstrap",
+ type: "shell",
+ inline: <<-SHELL
+ sudo apt-get update
+ sudo apt-get install -yq ruby ruby-dev build-essential nodejs
+ sudo apt-get autoremove -yq
+ gem install --no-ri --no-rdoc bundler
+ SHELL
+
+ config.vm.provision "install",
+ type: "shell",
+ privileged: false,
+ inline: <<-SHELL
+ echo "=============================================="
+ echo "Installing app dependencies"
+ cd /vagrant
+ bundle install
+ SHELL
+
+ config.vm.provision "run",
+ type: "shell",
+ privileged: false,
+ inline: <<-SHELL
+ echo "=============================================="
+ echo "Starting up middleman at http://localhost:4567"
+ echo "If it does not come up, check the ~/middleman.log file for any error messages"
+ cd /vagrant
+ bundle exec middleman server --force-polling -l 1 &> ~/middleman.log &
+ SHELL
+end
From 4136f7b0f795e091c0e793e3b7d7580e7c7f465d Mon Sep 17 00:00:00 2001
From: Marc Guyer
Date: Tue, 6 Oct 2015 16:48:51 -0400
Subject: [PATCH 019/225] Formatting fixes for README
---
README.md | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index b2e4105aeb9..9384a576976 100644
--- a/README.md
+++ b/README.md
@@ -46,24 +46,31 @@ You're going to need:
1. Fork this repository on Github.
2. Clone *your forked repository* (not our original one) to your hard drive with `git clone https://github.com/YOURUSERNAME/slate.git`
3. `cd slate`
-4. Initialize and start
- * Manually:
+4. Initialize and start (there are a few options for this):
+
+#### Manual/local
+
```shell
bundle install
bundle exec middleman server
```
- * Or via Docker (must install Docker first)
+#### Via Docker (must install Docker first)
+
```shell
docker build -t slate .
docker run -d -p 4567:4567 --name slate -v $(pwd)/source:/app/source slate
```
- You can now see the docs at http://localhost:4567. Whoa! That was fast! Note: if you're using the Docker setup on OSX, the docs will be
- availalable at the output of `boot2docker ip` instead of `localhost:4567`.
- * Or via Vagrant
+
+You can now see the docs at http://localhost:4567. Whoa! That was fast!
+
+*Note: if you're using the Docker setup on OSX, the docs will be availalable at the output of `boot2docker ip` instead of `localhost:4567`.*
+
+#### Via Vagrant
```shell
vagrant up
```
- You can now see the docs at http://localhost:4567.
+
+You can now see the docs at http://localhost:4567.
Now that Slate is all set up your machine, you'll probably want to learn more about [editing Slate markdown](https://github.com/tripit/slate/wiki/Markdown-Syntax), or [how to publish your docs](https://github.com/tripit/slate/wiki/Deploying-Slate).
From ce2f2ae8de02aeab1feaff0d3786d4afe8a2bf88 Mon Sep 17 00:00:00 2001
From: Marc Guyer
Date: Tue, 6 Oct 2015 17:12:55 -0400
Subject: [PATCH 020/225] Update Vagrantfile
Need git for `rake publish`
---
Vagrantfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Vagrantfile b/Vagrantfile
index f00c7d1b60d..713d88447c1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -9,7 +9,7 @@ Vagrant.configure(2) do |config|
type: "shell",
inline: <<-SHELL
sudo apt-get update
- sudo apt-get install -yq ruby ruby-dev build-essential nodejs
+ sudo apt-get install -yq ruby ruby-dev build-essential nodejs git
sudo apt-get autoremove -yq
gem install --no-ri --no-rdoc bundler
SHELL
From 4a3fdfaea2e9f5017d9ed5cffbcbfae0630c5c76 Mon Sep 17 00:00:00 2001
From: Marc Guyer
Date: Tue, 6 Oct 2015 17:21:17 -0400
Subject: [PATCH 021/225] Update Vagrantfile
More memory needed for `rake publish`
---
Vagrantfile | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index 713d88447c1..ba6b620bd7a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,9 +1,6 @@
Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/trusty64"
config.vm.network :forwarded_port, guest: 4567, host: 4567
- config.vm.provider "virtualbox" do |vb|
- vb.memory = "384"
- end
config.vm.provision "bootstrap",
type: "shell",
From 3c1c9c49d54828fe9a7dd73edbbccef54bf52078 Mon Sep 17 00:00:00 2001
From: Marc Guyer
Date: Thu, 8 Oct 2015 14:09:27 +0000
Subject: [PATCH 022/225] Add local git config to guest vm
---
Vagrantfile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Vagrantfile b/Vagrantfile
index ba6b620bd7a..186654e0a3b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -11,6 +11,9 @@ Vagrant.configure(2) do |config|
gem install --no-ri --no-rdoc bundler
SHELL
+ # add the local user git config to the vm
+ config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig"
+
config.vm.provision "install",
type: "shell",
privileged: false,
From 150ff8a8009f32bb1d121daec9a05aa8282e111b Mon Sep 17 00:00:00 2001
From: Rex Posadas
Date: Sun, 11 Oct 2015 14:57:44 -0500
Subject: [PATCH 023/225] upgraded to later ubuntu wily to remove error from
version trusty
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 8183c7a8b04..f5848e6fbd2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:trusty
+FROM ubuntu:wily
RUN apt-get update
RUN apt-get install -yq ruby ruby-dev build-essential git
From f0a8dec91cebe6d7875002e16c28446cedaa94c3 Mon Sep 17 00:00:00 2001
From: Michael Flaxman
Date: Thu, 22 Oct 2015 12:35:29 -0400
Subject: [PATCH 024/225] Add blockcypher to examples
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 2f042e7f2c2..5ce6f864e43 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,7 @@ Examples of Slate in the Wild
* [SocialRadar's LocationKit Docs](https://docs.locationkit.io/)
* [SafetyCulture API Documentation](https://developer.safetyculture.io/)
* [hosting.de API Documentation](https://www.hosting.de/docs/api/)
+* [BlockCypher's API Documentation](https://dev.blockcypher.com)
(Feel free to add your site to this list in a pull request!)
From fb4c2a9ceb9000c1a3b2aad7507f404c2850e479 Mon Sep 17 00:00:00 2001
From: Dave Powers
Date: Wed, 4 Nov 2015 14:15:23 -0500
Subject: [PATCH 025/225] Remove link to ChaiOne Gameplan (broken link)
---
README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/README.md b/README.md
index 5ce6f864e43..b55fa7a62f6 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,6 @@ Examples of Slate in the Wild
* [Travis-CI's API docs](http://docs.travis-ci.com/api/)
* [Mozilla's localForage docs](http://mozilla.github.io/localForage/)
* [Mozilla Recroom](http://mozilla.github.io/recroom/)
-* [ChaiOne Gameplan API docs](http://chaione.github.io/gameplanb2b/#introduction)
* [Drcaban's Build a Quine tutorial](http://drcabana.github.io/build-a-quine/#introduction)
* [PricePlow API docs](https://www.priceplow.com/api/documentation)
* [Emerging Threats API docs](http://apidocs.emergingthreats.net/)
From 01fd02005a6e0d3fccff8bb3eaa2d00646247de8 Mon Sep 17 00:00:00 2001
From: Dave Powers
Date: Wed, 4 Nov 2015 14:16:54 -0500
Subject: [PATCH 026/225] Fix link to IBM Cloudant (page has moved)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b55fa7a62f6..6f086f58a89 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ Examples of Slate in the Wild
* [Whispir.io API](https://whispir.github.io/api)
* [NASA API](https://data.nasa.gov/developer/external/planetary/)
* [CardPay API](https://developers.cardpay.com/)
-* [IBM Cloudant](https://docs-testb.cloudant.com/content-review/_design/couchapp/index.html)
+* [IBM Cloudant](https://docs.cloudant.com/api.html)
* [Bitrix basis components](http://bbc.bitrix.expert/)
* [viagogo API Documentation](http://developer.viagogo.net/)
* [Fidor Bank API Documentation](http://docs.fidor.de/)
From 1e86f824afd7e300239bc41f242e496a13a4d165 Mon Sep 17 00:00:00 2001
From: Dave Powers
Date: Wed, 4 Nov 2015 14:18:08 -0500
Subject: [PATCH 027/225] Fix link to BlockCypher (does not work over HTTPS)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6f086f58a89..5d2e7fe1c31 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ Examples of Slate in the Wild
* [SocialRadar's LocationKit Docs](https://docs.locationkit.io/)
* [SafetyCulture API Documentation](https://developer.safetyculture.io/)
* [hosting.de API Documentation](https://www.hosting.de/docs/api/)
-* [BlockCypher's API Documentation](https://dev.blockcypher.com)
+* [BlockCypher's API Documentation](http://dev.blockcypher.com)
(Feel free to add your site to this list in a pull request!)
From c76359868a489e8706290fe7dbffce651339ceb3 Mon Sep 17 00:00:00 2001
From: Joe Huss
Date: Thu, 12 Nov 2015 01:01:14 -0500
Subject: [PATCH 028/225] Added Links to InterServer Slate Implementation
URL: https://my.interserver.net/apidoc/
Our implementation includes some minor customizations which others mind fight useful including icons for the Language tabs at the top right.
Side Note: The document contents including sample scripts , input/output parameter+descriptions, etc are generated entirely from a script i wrote that parses my SOAP API WSDL file, PHP Source (parsing phpdoc comments), and MySQL Table defintions (parsing field comments) to generate and populate all the neccesary info. At some point (faster if i have any requests for it ) ill make those scripts publicly available after i clean up the source a bit and make it more portable.
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 5d2e7fe1c31..d3de33ba426 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,7 @@ Examples of Slate in the Wild
* [SafetyCulture API Documentation](https://developer.safetyculture.io/)
* [hosting.de API Documentation](https://www.hosting.de/docs/api/)
* [BlockCypher's API Documentation](http://dev.blockcypher.com)
+* [InterServer API Documentation](https://my.interserver.net/apidoc/)
(Feel free to add your site to this list in a pull request!)
From 40443b32fd122fb2041db8689861bd8c03665c92 Mon Sep 17 00:00:00 2001
From: Evan Tahler
Date: Mon, 16 Nov 2015 10:53:18 -0800
Subject: [PATCH 029/225] Update README.md
add actionhero docs
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index d3de33ba426..3e22c3c44f7 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,7 @@ Examples of Slate in the Wild
* [hosting.de API Documentation](https://www.hosting.de/docs/api/)
* [BlockCypher's API Documentation](http://dev.blockcypher.com)
* [InterServer API Documentation](https://my.interserver.net/apidoc/)
+* [ActionHeroJS's API Documentation](http://www.actionherojs.com/docs)
(Feel free to add your site to this list in a pull request!)
From 2618c77db0f46a55a608b5f47dd3815d35828d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lex=20Gonz=C3=A1lez?=
Date: Fri, 13 Nov 2015 17:28:45 +0100
Subject: [PATCH 030/225] Use base ruby image in Dockerfile & fix watcher
It seems that the watcher will not work without the
--force-polling option.
---
Dockerfile | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 294c650d9e9..6938dfd13bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,6 @@
-FROM ubuntu:wily
+FROM ruby:2.2.3-onbuild
+
+RUN ln -s /usr/src/app /app # Deprecated
-RUN apt-get update
-RUN apt-get install -yq ruby ruby-dev build-essential git nodejs
-RUN gem install --no-ri --no-rdoc bundler
-ADD Gemfile /app/Gemfile
-ADD Gemfile.lock /app/Gemfile.lock
-RUN cd /app; bundle install
-ADD . /app
EXPOSE 4567
-WORKDIR /app
-CMD ["bundle", "exec", "middleman", "server"]
+CMD ["bundle", "exec", "middleman", "server", "--force-polling"]
From 82717e043db6743ca30ce8fb5475571d10e8465b Mon Sep 17 00:00:00 2001
From: Jared King
Date: Wed, 18 Nov 2015 11:10:10 -0600
Subject: [PATCH 031/225] Added Invoiced to list of examples on README
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 9384a576976..333ad464447 100644
--- a/README.md
+++ b/README.md
@@ -109,6 +109,7 @@ Examples of Slate in the Wild
* [SafetyCulture API Documentation](https://developer.safetyculture.io/)
* [hosting.de API Documentation](https://www.hosting.de/docs/api/)
* [CheddarGetter API Documentation](http://docs.cheddargetter.com)
+* [Invoiced API](https://invoiced.com/docs/api)
(Feel free to add your site to this list in a pull request!)
From 97a4c89d0cc32c8609237b41acf5fcc043555480 Mon Sep 17 00:00:00 2001
From: ReadmeCritic
Date: Tue, 8 Dec 2015 12:22:18 -0800
Subject: [PATCH 032/225] Update README URLs based on HTTP redirects
---
README.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 333ad464447..acb4a625f6b 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ Now that Slate is all set up your machine, you'll probably want to learn more ab
Examples of Slate in the Wild
---------------------------------
-* [Travis-CI's API docs](http://docs.travis-ci.com/api/)
+* [Travis-CI's API docs](https://docs.travis-ci.com/api/)
* [Mozilla's localForage docs](http://mozilla.github.io/localForage/)
* [Mozilla Recroom](http://mozilla.github.io/recroom/)
* [ChaiOne Gameplan API docs](http://chaione.github.io/gameplanb2b/#introduction)
@@ -104,12 +104,12 @@ Examples of Slate in the Wild
* [Market Prophit API Documentation](http://developer.marketprophit.com/)
* [OAuth.io API Documentation](http://docs.oauth.io/)
* [Aircall for Developers](http://developer.aircall.io/)
-* [SupportKit API Docs](http://docs.supportkit.io/)
+* [SupportKit API Docs](http://docs.smooch.io/)
* [SocialRadar's LocationKit Docs](https://docs.locationkit.io/)
* [SafetyCulture API Documentation](https://developer.safetyculture.io/)
* [hosting.de API Documentation](https://www.hosting.de/docs/api/)
* [CheddarGetter API Documentation](http://docs.cheddargetter.com)
-* [Invoiced API](https://invoiced.com/docs/api)
+* [Invoiced API](http://invoiced.com/docs/api/)
(Feel free to add your site to this list in a pull request!)
@@ -122,7 +122,7 @@ Just [submit a issue](https://github.com/tripit/slate/issues) to the Slate Githu
Contributors
--------------------
-Slate was built by [Robert Lord](https://lord.io) while at [TripIt](http://tripit.com).
+Slate was built by [Robert Lord](https://lord.io) while at [TripIt](https://www.tripit.com/).
Thanks to the following people who have submitted major pull requests:
@@ -137,5 +137,5 @@ Special Thanks
- [Middleman](https://github.com/middleman/middleman)
- [jquery.tocify.js](https://github.com/gfranko/jquery.tocify.js)
- [middleman-syntax](https://github.com/middleman/middleman-syntax)
-- [middleman-gh-pages](https://github.com/neo/middleman-gh-pages)
+- [middleman-gh-pages](https://github.com/edgecase/middleman-gh-pages)
- [Font Awesome](http://fortawesome.github.io/Font-Awesome/)
From 837a7e7873eba3b62fca36e54cd1cacf9c65fe02 Mon Sep 17 00:00:00 2001
From: Zach Panzarino
Date: Fri, 18 Dec 2015 22:51:49 -0500
Subject: [PATCH 033/225] Change cat name
After recent events it is probably better to use a different name for the cat.
---
source/index.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/index.md b/source/index.md
index 4c1fa8c9f7d..69a22ea6edd 100644
--- a/source/index.md
+++ b/source/index.md
@@ -94,7 +94,7 @@ curl "http://example.com/api/kittens"
},
{
"id": 2,
- "name": "Isis",
+ "name": "Max",
"breed": "unknown",
"fluffiness": 5,
"cuteness": 10
@@ -145,7 +145,7 @@ curl "http://example.com/api/kittens/2"
```json
{
"id": 2,
- "name": "Isis",
+ "name": "Max",
"breed": "unknown",
"fluffiness": 5,
"cuteness": 10
From f90e6b076d4147e303d6e6d6f980c37a261569c8 Mon Sep 17 00:00:00 2001
From: Adrian Perez
Date: Fri, 1 Jan 2016 18:12:11 +0100
Subject: [PATCH 034/225] feat(docker): improve docker support
This improves Docker support in the following ways:
* Base image off `ruby:onbuild` to avoid unnecessary custom steps and ease
derived images.
* Adds `.dockerignore` to avoid sending large files to build.
* Adds a `docker-compose.yml` so users can simply type `docker-compose up`
to get it running.
* Explicity sets the volume definition in the `Dockerfile`.
* Volume is automatically mount by `docker-compose` (the `source` directory
relative to the project's dir).
* Workaround watcher failing to pick directory changes probably because of
vboxsf and the `listen` gem failing to register filesystem changes.
* Updates documentation.
---
.dockerignore | 2 ++
Dockerfile | 7 +++----
README.md | 21 +++++++++++++--------
docker-compose.yml | 6 ++++++
4 files changed, 24 insertions(+), 12 deletions(-)
create mode 100644 .dockerignore
create mode 100644 docker-compose.yml
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000000..6ef19c6fa7f
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.git
+source
diff --git a/Dockerfile b/Dockerfile
index 6938dfd13bf..5d1ea3df9f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
-FROM ruby:2.2.3-onbuild
-
-RUN ln -s /usr/src/app /app # Deprecated
-
+FROM ruby:onbuild
+MAINTAINER Adrian Perez
+VOLUME /usr/src/app/source
EXPOSE 4567
CMD ["bundle", "exec", "middleman", "server", "--force-polling"]
diff --git a/README.md b/README.md
index acb4a625f6b..8d20a84e910 100644
--- a/README.md
+++ b/README.md
@@ -47,23 +47,28 @@ You're going to need:
2. Clone *your forked repository* (not our original one) to your hard drive with `git clone https://github.com/YOURUSERNAME/slate.git`
3. `cd slate`
4. Initialize and start (there are a few options for this):
-
+
#### Manual/local
```shell
bundle install
bundle exec middleman server
-```
-#### Via Docker (must install Docker first)
+```
+
+#### Via Docker (must install it first)
```shell
-docker build -t slate .
-docker run -d -p 4567:4567 --name slate -v $(pwd)/source:/app/source slate
-```
+docker-compose up
+```
+
+will spin an environment for you, with the `source` directory mapped to the
+container, so you can see your edits instantly after refreshing your browser.
-You can now see the docs at http://localhost:4567. Whoa! That was fast!
+You can now see the docs at http://localhost:4567. Whoa! That was fast!
-*Note: if you're using the Docker setup on OSX, the docs will be availalable at the output of `boot2docker ip` instead of `localhost:4567`.*
++*Note: if you're not using Docker natively (i.e. on Linux), the docs will be
++available at the IP of your docker host. If you're using docker-machine you can
++retrieve it with `docker-machine ip `*
#### Via Vagrant
```shell
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000000..7eeae41a09d
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,6 @@
+app:
+ build: .
+ ports:
+ - 4567:4567
+ volumes:
+ - ./source:/usr/src/app/source
From 75f61557a281db16dadb8f88c505f538d83ff04f Mon Sep 17 00:00:00 2001
From: Adrian Perez
Date: Sat, 2 Jan 2016 01:51:06 +0100
Subject: [PATCH 035/225] fix(docker): new middleman requires JS runtime
---
Dockerfile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Dockerfile b/Dockerfile
index 5d1ea3df9f0..10150b56da3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,4 +2,8 @@ FROM ruby:onbuild
MAINTAINER Adrian Perez
VOLUME /usr/src/app/source
EXPOSE 4567
+
+RUN apt-get update && apt-get install -y nodejs \
+&& apt-get clean && rm -rf /var/lib/apt/lists/*
+
CMD ["bundle", "exec", "middleman", "server", "--force-polling"]
From 65c3dbd5442b5abc856738a85220b9c1e03ad8b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?=
Date: Fri, 8 Jan 2016 12:31:33 +0100
Subject: [PATCH 036/225] Update Boot2docker information for OSX
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 3e22c3c44f7..d6a01c389b6 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ docker run -d -p 4567:4567 --name slate -v $(pwd)/source:/app/source slate
You can now see the docs at . Whoa! That was fast!
*Note: if you're using the Docker setup on OSX, the docs will be
-availalable at the output of `boot2docker ip` instead of `localhost:4567`.*
+available at the output of `docker-machine ip ` (port: 4567) instead of `localhost:4567`.*
Now that Slate is all set up your machine, you'll probably want to learn more about [editing Slate markdown](https://github.com/tripit/slate/wiki/Markdown-Syntax), or [how to publish your docs](https://github.com/tripit/slate/wiki/Deploying-Slate).
From 35690907be70f411352a617eda46c5c7b72a1c0e Mon Sep 17 00:00:00 2001
From: Jack Peterson
Date: Sun, 17 Jan 2016 14:34:19 -0800
Subject: [PATCH 037/225] Added Augur API to examples
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index d6a01c389b6..0d556f0355f 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,7 @@ Examples of Slate in the Wild
* [BlockCypher's API Documentation](http://dev.blockcypher.com)
* [InterServer API Documentation](https://my.interserver.net/apidoc/)
* [ActionHeroJS's API Documentation](http://www.actionherojs.com/docs)
+* [Augur API Documentation](http://docs.augur.net)
(Feel free to add your site to this list in a pull request!)
From 7f88aafcba83e6125ae7496495eccae3fb35f4d1 Mon Sep 17 00:00:00 2001
From: Robert Lord
Date: Tue, 26 Jan 2016 12:52:03 -0600
Subject: [PATCH 038/225] Upgrade to middleman 4
---
Gemfile | 9 +-
Gemfile.lock | 154 +++++++++---------
source/{index.md => index.html.md} | 0
source/layouts/layout.erb | 3 +
.../{_normalize.css => _normalize.scss} | 0
source/stylesheets/_syntax.scss.erb | 27 ---
source/stylesheets/screen.css.scss | 22 ++-
7 files changed, 98 insertions(+), 117 deletions(-)
rename source/{index.md => index.html.md} (100%)
rename source/stylesheets/{_normalize.css => _normalize.scss} (100%)
delete mode 100644 source/stylesheets/_syntax.scss.erb
diff --git a/Gemfile b/Gemfile
index 9a9931a5fab..527ab3ce0bc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,12 @@
source 'https://rubygems.org'
# Middleman
-gem 'middleman', '~>3.3.10'
+gem 'middleman', '~>4.0.0'
gem 'middleman-gh-pages', '~> 0.0.3'
-gem 'middleman-syntax', '~> 2.0.0'
-gem 'middleman-autoprefixer', '~> 2.5.0'
-gem 'rouge', '~> 1.9.1'
+gem 'middleman-syntax', '~> 2.1.0'
+gem 'middleman-autoprefixer', '~> 2.7.0'
+gem "middleman-sprockets", "~> 4.0.0.rc"
+gem 'rouge', '~> 1.10.1'
gem 'redcarpet', '~> 3.3.2'
gem 'rake', '~> 10.4.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index f9400056dad..ced7a072291 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,137 +1,135 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (4.1.12)
- i18n (~> 0.6, >= 0.6.9)
+ activesupport (4.2.5.1)
+ i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
- thread_safe (~> 0.1)
+ thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- autoprefixer-rails (5.2.1.1)
+ addressable (2.4.0)
+ autoprefixer-rails (6.3.1)
execjs
json
- celluloid (0.16.0)
- timers (~> 4.0.0)
- chunky_png (1.3.4)
+ backports (3.6.7)
+ capybara (2.5.0)
+ mime-types (>= 1.16)
+ nokogiri (>= 1.3.3)
+ rack (>= 1.0.0)
+ rack-test (>= 0.5.4)
+ xpath (~> 2.0)
coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.9.1.1)
- compass (1.0.3)
- chunky_png (~> 1.2)
- compass-core (~> 1.0.2)
- compass-import-once (~> 1.0.5)
- rb-fsevent (>= 0.9.3)
- rb-inotify (>= 0.9)
- sass (>= 3.3.13, < 3.5)
- compass-core (1.0.3)
- multi_json (~> 1.0)
- sass (>= 3.3.0, < 3.5)
+ coffee-script-source (1.10.0)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
+ concurrent-ruby (0.9.2)
+ contracts (0.12.0)
erubis (2.7.0)
- execjs (2.5.2)
+ execjs (2.6.0)
+ fastimage (1.8.1)
+ addressable (~> 2.3, >= 2.3.5)
ffi (1.9.10)
- haml (4.0.6)
+ haml (4.0.7)
tilt
- hike (1.2.3)
- hitimes (1.2.2)
- hooks (0.4.0)
- uber (~> 0.0.4)
+ hamster (2.0.0)
+ concurrent-ruby (~> 0.8)
+ hashie (3.4.3)
i18n (0.7.0)
json (1.8.3)
- kramdown (1.8.0)
- listen (2.10.1)
- celluloid (~> 0.16.0)
+ kramdown (1.9.0)
+ listen (3.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
- middleman (3.3.12)
+ middleman (4.0.0)
coffee-script (~> 2.2)
- compass (>= 1.0.0, < 2.0.0)
compass-import-once (= 1.0.5)
- execjs (~> 2.0)
haml (>= 4.0.5)
kramdown (~> 1.2)
- middleman-core (= 3.3.12)
- middleman-sprockets (>= 3.1.2)
+ middleman-cli (= 4.0.0)
+ middleman-core (= 4.0.0)
sass (>= 3.4.0, < 4.0)
- uglifier (~> 2.5)
- middleman-autoprefixer (2.5.0)
- autoprefixer-rails (~> 5.2.0)
+ middleman-autoprefixer (2.7.0)
+ autoprefixer-rails (>= 6.3.1, < 7.0.0)
middleman-core (>= 3.3.3)
- middleman-core (3.3.12)
- activesupport (~> 4.1.0)
+ middleman-cli (4.0.0)
+ thor (>= 0.17.0, < 2.0)
+ middleman-core (4.0.0)
+ activesupport (~> 4.2)
+ addressable (~> 2.4.0)
+ backports (~> 3.6)
bundler (~> 1.1)
+ capybara (~> 2.5.0)
+ contracts (~> 0.12.0)
erubis
- hooks (~> 0.3)
+ execjs (~> 2.0)
+ fastimage (~> 1.8)
+ hamster (~> 2.0)
+ hashie (~> 3.4)
i18n (~> 0.7.0)
- listen (>= 2.7.9, < 3.0)
- padrino-helpers (~> 0.12.3)
+ listen (~> 3.0)
+ padrino-helpers (~> 0.13.0)
rack (>= 1.4.5, < 2.0)
- rack-test (~> 0.6.2)
- thor (>= 0.15.2, < 2.0)
- tilt (~> 1.4.1, < 2.0)
+ sass (>= 3.4)
+ tilt (~> 1.4.1)
+ uglifier (~> 2.6)
middleman-gh-pages (0.0.3)
rake (> 0.9.3)
- middleman-sprockets (3.4.2)
- middleman-core (>= 3.3)
- sprockets (~> 2.12.1)
- sprockets-helpers (~> 1.1.0)
- sprockets-sass (~> 1.3.0)
- middleman-syntax (2.0.0)
- middleman-core (~> 3.2)
+ middleman-sprockets (4.0.0.rc.1)
+ middleman-core (>= 4.0.0.rc.1)
+ sprockets (~> 3.0)
+ middleman-syntax (2.1.0)
+ middleman-core (>= 3.2)
rouge (~> 1.0)
- minitest (5.7.0)
- multi_json (1.11.2)
- padrino-helpers (0.12.5)
+ mime-types (3.0)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2015.1120)
+ mini_portile2 (2.0.0)
+ minitest (5.8.4)
+ nokogiri (1.6.7.2)
+ mini_portile2 (~> 2.0.0.rc2)
+ padrino-helpers (0.13.1)
i18n (~> 0.6, >= 0.6.7)
- padrino-support (= 0.12.5)
+ padrino-support (= 0.13.1)
tilt (~> 1.4.1)
- padrino-support (0.12.5)
+ padrino-support (0.13.1)
activesupport (>= 3.1)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rake (10.4.2)
- rb-fsevent (0.9.5)
+ rb-fsevent (0.9.7)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
- redcarpet (3.3.2)
- rouge (1.9.1)
- sass (3.4.16)
- sprockets (2.12.4)
- hike (~> 1.2)
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sprockets-helpers (1.1.0)
- sprockets (~> 2.0)
- sprockets-sass (1.3.1)
- sprockets (~> 2.0)
- tilt (~> 1.1)
+ redcarpet (3.3.4)
+ rouge (1.10.1)
+ sass (3.4.21)
+ sprockets (3.4.1)
+ rack (> 1, < 3)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
- timers (4.0.1)
- hitimes
tzinfo (1.2.2)
thread_safe (~> 0.1)
- uber (0.0.13)
- uglifier (2.7.1)
+ uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
+ xpath (2.0.0)
+ nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
- middleman (~> 3.3.10)
- middleman-autoprefixer (~> 2.5.0)
+ middleman (~> 4.0.0)
+ middleman-autoprefixer (~> 2.7.0)
middleman-gh-pages (~> 0.0.3)
- middleman-syntax (~> 2.0.0)
+ middleman-sprockets (~> 4.0.0.rc)
+ middleman-syntax (~> 2.1.0)
rake (~> 10.4.2)
redcarpet (~> 3.3.2)
- rouge (~> 1.9.1)
+ rouge (~> 1.10.1)
BUNDLED WITH
- 1.10.5
+ 1.10.6
diff --git a/source/index.md b/source/index.html.md
similarity index 100%
rename from source/index.md
rename to source/index.html.md
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 36ae0f95f81..a939e2d5503 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -24,6 +24,9 @@ under the License.
<%= stylesheet_link_tag :screen, media: :screen %>
<%= stylesheet_link_tag :print, media: :print %>
+
<% if current_page.data.search %>
<%= javascript_include_tag "all" %>
diff --git a/source/stylesheets/_normalize.css b/source/stylesheets/_normalize.scss
similarity index 100%
rename from source/stylesheets/_normalize.css
rename to source/stylesheets/_normalize.scss
diff --git a/source/stylesheets/_syntax.scss.erb b/source/stylesheets/_syntax.scss.erb
deleted file mode 100644
index dfeb0c15240..00000000000
--- a/source/stylesheets/_syntax.scss.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2008-2013 Concur Technologies, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may
-not use this file except in compliance with the License. You may obtain
-a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.
-*/
-
-@import 'variables';
-
-<%= Rouge::Themes::Base16::Monokai.render(:scope => '.highlight') %>
-
-.highlight .c, .highlight .cm, .highlight .c1, .highlight .cs {
- color: #909090;
-}
-
-.highlight, .highlight .w {
- background-color: $code-bg;
-}
\ No newline at end of file
diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index e4b3ef82b22..0d62f9166a1 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -1,8 +1,6 @@
@charset "utf-8";
@import 'normalize';
-@import 'compass';
@import 'variables';
-@import 'syntax';
@import 'icon-font';
/*
@@ -340,7 +338,7 @@ html, body {
padding: 0 $main-padding;
box-sizing: border-box;
display: block;
- @include text-shadow($main-embossed-text-shadow);
+ text-shadow: $main-embossed-text-shadow;
@extend %left-col;
}
@@ -471,7 +469,7 @@ html, body {
aside {
padding-top: 1em;
padding-bottom: 1em;
- @include text-shadow(0 1px 0 lighten($aside-notice-bg, 15%));
+ text-shadow: 0 1px 0 lighten($aside-notice-bg, 15%);
margin-top: 1.5em;
margin-bottom: 1.5em;
background: $aside-notice-bg;
@@ -479,12 +477,12 @@ html, body {
&.warning {
background-color: $aside-warning-bg;
- @include text-shadow(0 1px 0 lighten($aside-warning-bg, 15%));
+ text-shadow: 0 1px 0 lighten($aside-warning-bg, 15%);
}
&.success {
background-color: $aside-success-bg;
- @include text-shadow(0 1px 0 lighten($aside-success-bg, 15%));
+ text-shadow: 0 1px 0 lighten($aside-success-bg, 15%);
}
}
@@ -511,7 +509,7 @@ html, body {
margin: -2px;
border-radius: 4px;
border: 1px solid #F7E633;
- @include text-shadow(1px 1px 0 #666);
+ text-shadow: 1px 1px 0 #666;
background: linear-gradient(to top left, #F7E633 0%, #F1D32F 100%);
}
}
@@ -534,7 +532,7 @@ html, body {
clear:right;
box-sizing: border-box;
- @include text-shadow(0px 1px 2px rgba(0,0,0,0.4));
+ text-shadow: 0px 1px 2px rgba(0,0,0,0.4);
@extend %right-col;
@@ -618,3 +616,11 @@ html, body {
margin-top: $main-padding;
}
}
+
+.highlight .c, .highlight .cm, .highlight .c1, .highlight .cs {
+ color: #909090;
+}
+
+.highlight, .highlight .w {
+ background-color: $code-bg;
+}
\ No newline at end of file
From 02428eb687e33e2900761144c8a94464889cc256 Mon Sep 17 00:00:00 2001
From: Robert Lord
Date: Tue, 26 Jan 2016 12:52:33 -0600
Subject: [PATCH 039/225] Ignore .sass-cache
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index f1953e3a979..10501583560 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ tmp
build/
.cache
.vagrant
+.sass-cache
# YARD artifacts
.yardoc
From b6084cfd0ace748e4f3bd7c947e748d18ec4956c Mon Sep 17 00:00:00 2001
From: Robert Lord
Date: Tue, 26 Jan 2016 12:52:42 -0600
Subject: [PATCH 040/225] Update readme styling
---
README.md | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 40af1a24208..7f386175f59 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,17 @@
-Slate
-========
+
+
+
+
+
+
[](https://travis-ci.org/tripit/slate) [](https://gemnasium.com/tripit/slate)
-Slate helps you create beautiful API documentation. Think of it as an intelligent, responsive documentation template for your API.
+
Slate helps you create beautiful, intelligent, responsive API documentation.
-
+
-*The example above was created with Slate. Check it out at [tripit.github.io/slate](http://tripit.github.io/slate).*
+