I hereby claim:
- I am btoconnor on github.
- I am btoconnor (https://keybase.io/btoconnor) on keybase.
- I have a public key whose fingerprint is E629 1F5B FFB3 7E6C 7F5B F015 F645 E83C ED00 ADB7
To claim this, I am signing this object:
Brian O'Connor btoconnor
btoconnor
/ keybase.md
Created
April 11, 2014 14:51
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| .navbar-default .navbar-nav > li > a { | |
| color: #333; | |
| font-weight: 300; | |
| -webkit-transition: all 0.5s; | |
| -moz-transition: all 0.5s; | |
| -o-transition: all 0.5s; | |
| transition: all 0.5s; | |
| } | |
| .nav > li > a { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| {# -*- engine:jinja -*- #} | |
| <!DOCTYPE html> | |
| <html lang="en"> | |
| <head> | |
| <title>Brian & Emily's Wedding Party</title> | |
| <meta charset="utf-8"> | |
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | |
| <meta name="viewport" content="width=device-width, initial-scale=1"> | |
| <link |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.eslintrc.js b/.eslintrc.js | |
| index d135142..9046651 100644 | |
| --- a/.eslintrc.js | |
| +++ b/.eslintrc.js | |
| @@ -1,4 +1,4 @@ | |
| - module.exports = { | |
| +module.exports = { | |
| "env": { | |
| "browser": true, | |
| "commonjs": true, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/breakbase/game/engine/boardgame.py b/breakbase/game/engine/boardgame.py | |
| index 81d3daf..05952e6 100644 | |
| --- a/breakbase/game/engine/boardgame.py | |
| +++ b/breakbase/game/engine/boardgame.py | |
| @@ -54,6 +54,10 @@ class BoardGame(object): | |
| obj.moves = game_model.moves | |
| obj.status = game_model.status | |
| + # Fire the callback so that the engines can re-hydrate any utility helpers | |
| + # or anything else. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/breakbase/api/views/room_proposal.py b/breakbase/api/views/room_proposal.py | |
| index 8b8670b..e8ef214 100644 | |
| --- a/breakbase/api/views/room_proposal.py | |
| +++ b/breakbase/api/views/room_proposal.py | |
| @@ -64,7 +64,7 @@ class RoomProposalAPIView(FlaskView): | |
| cent, | |
| room.occupant_users, | |
| action=messages.ROOM_PROPOSAL_CREATED, | |
| - room_id=room.id, | |
| + room_id=room.room_id, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/breakbase/api/__init__.py b/breakbase/api/__init__.py | |
| index fd9aee6..85330a2 100644 | |
| --- a/breakbase/api/__init__.py | |
| +++ b/breakbase/api/__init__.py | |
| @@ -39,26 +39,27 @@ def create_api_app(): | |
| def handle_404(e): | |
| - return handle_error(e, 'Not Found') | |
| + return handle_error(e, 'Resource Not Found', 'The requested resource was not found') |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/breakbase/game/engine/boardgame.py b/breakbase/game/engine/boardgame.py | |
| index 81d3daf..d278a0d 100644 | |
| --- a/breakbase/game/engine/boardgame.py | |
| +++ b/breakbase/game/engine/boardgame.py | |
| @@ -28,7 +28,7 @@ class BoardGame(object): | |
| self.moves = [] | |
| self.players = [] | |
| - def _default_payload(self): | |
| + def _default_payload(self, settings=None): |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/breakbase/game/engine/boardgame.py b/breakbase/game/engine/boardgame.py | |
| index 81d3daf..d278a0d 100644 | |
| --- a/breakbase/game/engine/boardgame.py | |
| +++ b/breakbase/game/engine/boardgame.py | |
| @@ -28,7 +28,7 @@ class BoardGame(object): | |
| self.moves = [] | |
| self.players = [] | |
| - def _default_payload(self): | |
| + def _default_payload(self, settings=None): |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/breakbase/game/engine/boardgame.py b/breakbase/game/engine/boardgame.py | |
| index 81d3daf..058f4f9 100644 | |
| --- a/breakbase/game/engine/boardgame.py | |
| +++ b/breakbase/game/engine/boardgame.py | |
| @@ -28,7 +28,7 @@ class BoardGame(object): | |
| self.moves = [] | |
| self.players = [] | |
| - def _default_payload(self): | |
| + def _default_payload(self, settings=None): |
OlderNewer