Skip to content

Commit

Permalink
Merge pull request #33 from Tidwell/master
Browse files Browse the repository at this point in the history
2.1.1 Release PR
  • Loading branch information
Tidwell authored May 5, 2018
2 parents 56cc284 + f2cb11c commit d939f8d
Show file tree
Hide file tree
Showing 45 changed files with 145 additions and 11,860 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 2.1.1
- Fix bug preventing match_id and participant_id passed as underscore properties for URL generation #32

### 2.1.0
- Fix null values being returned as empty objects (#24)
- Add processCheckIns and abortCheckIn methods to tournament api
Expand Down
2 changes: 1 addition & 1 deletion docs/Client.html
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ <h6>Properties</h6>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
8 changes: 4 additions & 4 deletions docs/Matches.html
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ <h6>Properties</h6>



<td class="description last">The id of the match to get</td>
<td class="description last">OR obj.match_id The id of the match to get</td>
</tr>


Expand Down Expand Up @@ -677,7 +677,7 @@ <h4 class="name" id="update"><span class="type-signature"></span>update<span cla

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="api_matches.js.html">api/matches.js</a>, <a href="api_matches.js.html#line103">line 103</a>
<a href="api_matches.js.html">api/matches.js</a>, <a href="api_matches.js.html#line104">line 104</a>
</li></ul></dd>


Expand Down Expand Up @@ -852,7 +852,7 @@ <h6>Properties</h6>



<td class="description last">The id of the match to update</td>
<td class="description last">OR obj.match_id The id of the match to update</td>
</tr>


Expand Down Expand Up @@ -945,7 +945,7 @@ <h6>Properties</h6>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
218 changes: 0 additions & 218 deletions docs/Matches_.html

This file was deleted.

14 changes: 7 additions & 7 deletions docs/Participants.html
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ <h4 class="name" id="destroy"><span class="type-signature"></span>destroy<span c

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line165">line 165</a>
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line167">line 167</a>
</li></ul></dd>


Expand Down Expand Up @@ -637,7 +637,7 @@ <h6>Properties</h6>



<td class="description last">The id of the participant to remove</td>
<td class="description last">OR obj.participant_id The id of the participant to remove</td>
</tr>


Expand Down Expand Up @@ -922,7 +922,7 @@ <h4 class="name" id="randomize"><span class="type-signature"></span>randomize<sp

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line192">line 192</a>
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line195">line 195</a>
</li></ul></dd>


Expand Down Expand Up @@ -1309,7 +1309,7 @@ <h6>Properties</h6>



<td class="description last">The id of the participant to get</td>
<td class="description last">OR obj.participant_id The id of the participant to get</td>
</tr>


Expand Down Expand Up @@ -1378,7 +1378,7 @@ <h4 class="name" id="update"><span class="type-signature"></span>update<span cla

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line136">line 136</a>
<a href="api_participants.js.html">api/participants.js</a>, <a href="api_participants.js.html#line137">line 137</a>
</li></ul></dd>


Expand Down Expand Up @@ -1552,7 +1552,7 @@ <h6>Properties</h6>



<td class="description last">The id of the participant to update</td>
<td class="description last">OR obj.participant_id The id of the participant to update</td>
</tr>


Expand Down Expand Up @@ -1645,7 +1645,7 @@ <h6>Properties</h6>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/Tournaments.html
Original file line number Diff line number Diff line change
Expand Up @@ -2356,7 +2356,7 @@ <h6>Properties</h6>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
9 changes: 7 additions & 2 deletions docs/api_client.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ <h1 class="page-title">api/client.js</h1>
}
};

Client.prototype.convertCamelToUnderscoreProperties = function(obj) {
obj = util.convert(obj, util.camelToUnderscore);
return obj;
};

// cleans the passed in object, generates the API url/query-string, makes the request, delegates errors and calls callbacks
Client.prototype.makeRequest = function(obj) {
const self = this;
Expand All @@ -107,7 +112,7 @@ <h1 class="page-title">api/client.js</h1>
let path = obj.path;

// normalize the rest of the properties
obj = util.convert(obj, util.camelToUnderscore);
obj = this.convertCamelToUnderscoreProperties(obj);

// Add on the api key
obj.api_key = this.options.get('apiKey');
Expand Down Expand Up @@ -175,7 +180,7 @@ <h1 class="page-title">api/client.js</h1>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/api_error-handler.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ <h1 class="page-title">api/error-handler.js</h1>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Mon Mar 20 2017 22:51:32 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Sat May 05 2018 17:05:04 GMT-0400 (EDT) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
Loading

0 comments on commit d939f8d

Please sign in to comment.