Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ringcentral/slate
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: myfreecomm/cobrato-api-docs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
Loading
Showing with 17,177 additions and 428 deletions.
  1. +5 −2 .gitignore
  2. +2 −1 .travis.yml
  3. +22 −2 CHANGELOG.md
  4. +10 −3 CONTRIBUTING.md
  5. +0 −12 Dockerfile
  6. +7 −9 Gemfile
  7. +81 −87 Gemfile.lock
  8. +43 −58 README.md
  9. +0 −6 Rakefile
  10. +39 −0 Vagrantfile
  11. +2 −0 config.rb
  12. +222 −0 deploy.sh
  13. +1 −0 source/CNAME
  14. BIN source/images/logo.png
  15. +328 −0 source/includes/_bank_accounts.md
  16. +105 −0 source/includes/_basic_information.md
  17. +572 −0 source/includes/_charge_configs.md
  18. +325 −0 source/includes/_charge_templates.md
  19. +1,264 −0 source/includes/_charges.md
  20. +60 −0 source/includes/_charging_types.md
  21. +379 −0 source/includes/_credit_cards.md
  22. +0 −20 source/includes/_errors.md
  23. +291 −0 source/includes/_payees.md
  24. +277 −0 source/includes/_payers.md
  25. +837 −0 source/includes/_payloads.md
  26. +236 −0 source/includes/_payment_configs.md
  27. +43 −0 source/includes/_payment_methods.md
  28. +996 −0 source/includes/_payments.md
  29. +258 −0 source/includes/_people.md
  30. +252 −0 source/includes/_regress_cnabs.md
  31. +366 −0 source/includes/_remittance_cnabs.md
  32. +236 −0 source/includes/_webhook.md
  33. +31 −0 source/index.html.md
  34. +0 −168 source/index.md
  35. +4 −0 source/javascripts/app/_lang.js
  36. +1 −0 source/javascripts/app/_search.js
  37. +11 −4 source/javascripts/app/_toc.js
  38. +7 −0 source/javascripts/lib/_imagesloaded.min.js
  39. +9,831 −0 source/javascripts/lib/_jquery.js
  40. +6 −12 source/layouts/layout.erb
  41. 0 source/stylesheets/{_normalize.css → _normalize.scss}
  42. +0 −27 source/stylesheets/_syntax.scss.erb
  43. +2 −6 source/stylesheets/_variables.scss
  44. +6 −1 source/stylesheets/print.css.scss
  45. +19 −10 source/stylesheets/screen.css.scss
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -14,9 +14,12 @@ tmp
*.DS_STORE
build/
.cache

.vagrant
.sass-cache
.ruby-version
.ruby-gemset
# YARD artifacts
.yardoc
_yardoc
doc/
.idea/
.idea/
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,8 @@ sudo: false
language: ruby

rvm:
- 1.9.3
- 2.0.0
- 2.1.0

cache: bundler
script: bundle exec middleman build
24 changes: 22 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
# Changelog

## Version 1.3.2

*February 3, 2016*

A small bugfix for slightly incorrect background colors on code samples in some cases.

## Version 1.3.1

*January 31, 2016*

A small bugfix for incorrect whitespace in code blocks.

## Version 1.3

*January 27, 2016*

We've upgraded Middleman and a number of other dependencies, which should fix quite a few bugs.

Instead of `rake build` and `rake deploy`, you should now run `bundle exec middleman build --clean` to build your server, and `./deploy.sh` to deploy it to Github Pages.

## Version 1.2

*June 20, 2014*
*June 20, 2015*

**Fixes:**

@@ -21,7 +41,7 @@

## Version 1.1

*July 27th, 2014*
*July 27, 2014*

**Fixes:**

13 changes: 10 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
# Contributing to Slate
# Before You Submit an Issue

Thanks for contributing to Slate! A couple of quick guidelines for submitting PRs:
- Are you using Windows? We unfortunately don't support Windows. You could try using Docker, as outlined in the `README`.
- Is your version of Slate out of date? We have [upgrade instructions](https://github.com/tripit/slate/wiki/Updating-Slate) in the wiki. You could also try seeing if your problem is reproducible on the latest version of Slate.

- Please point your pull requests at the `dev` branch, and keep your commit messages clear and informative.
If you answered "no" to each of the questions above, feel free to submit an issue! It's also helpful if you include a code example of your problem (if applicable), we can't help you if you just say "Slate stopped loading for me once I added my documentation" without telling us the problematic documentation.

# Before You Submit a Pull Request

Thanks for contributing to Slate! A couple of quick guidelines for submitting pull requests:

- **Please point your pull requests at the `dev` branch.** We don't accept pull requests to `master`.
- Please make sure your contributions work in the most recent version of Chrome, Firefox, and IE.
- If you're implementing a new feature, even if it's relatively small, it's nice to open an issue before you start so that others know what you're working on and can help make sure you're on the right track.

12 changes: 0 additions & 12 deletions Dockerfile

This file was deleted.

16 changes: 7 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
source 'https://rubygems.org'
source 'http://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.4.4'
gem 'rouge', '~> 1.9.0'
gem 'redcarpet', '~> 3.3.1'

gem 'rake', '~> 10.4.2'
gem 'therubyracer', '~> 0.12.1', platforms: :ruby
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'
168 changes: 81 additions & 87 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,140 +1,134 @@
GEM
remote: https://rubygems.org/
remote: http://rubygems.org/
specs:
activesupport (4.1.11)
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.0.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)
ffi (1.9.8)
haml (4.0.6)
execjs (2.6.0)
fastimage (1.8.1)
addressable (~> 2.3, >= 2.3.5)
ffi (1.9.10)
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.7.0)
libv8 (3.16.14.7)
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.4.4)
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.1)
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.1)
ref (1.0.5)
rouge (1.9.0)
sass (3.4.14)
sprockets (2.12.3)
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)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
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.4.4)
middleman (~> 4.0.0)
middleman-autoprefixer (~> 2.7.0)
middleman-gh-pages (~> 0.0.3)
middleman-syntax (~> 2.0.0)
rake (~> 10.4.2)
redcarpet (~> 3.3.1)
rouge (~> 1.9.0)
therubyracer (~> 0.12.1)
middleman-sprockets (~> 4.0.0.rc)
middleman-syntax (~> 2.1.0)
redcarpet (~> 3.3.2)
rouge (~> 1.10.1)

BUNDLED WITH
1.12.4
Loading