codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
2843 commits 27 branches 0 tags 134 MiB
Commit graph

29 commits

Author SHA1 Message Date
Nick Winter
8aa36178af Fixed #769. Added some analytics timing tracking. Added replacement for $.browser. 2014-04-13 20:31:23 -07:00
Scott Erickson
308adec7c7 Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade
 2014-04-11 22:52:00 -07:00
Scott Erickson
ce84437345 Updated treema version. 2014-04-11 13:49:02 -07:00
Scott Erickson
d4abbd8ab3 Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator 
Conflicts:
	bower.json
 2014-04-11 12:44:54 -07:00
Scott Erickson
d11b6a5751 Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator 
Conflicts:
	bower.json
 2014-04-11 12:44:29 -07:00
Ruben Vereecken
ba417630dc Validated Backbone Mediator is now a fully functioning bower component 2014-04-11 20:05:48 +02:00
Scott Erickson
2c67df355c Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:33:22 -07:00
Scott Erickson
97a7bc7614 Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
Nick Winter
26266963f4 Updated to jQuery 2.1. 2014-04-11 10:12:39 -07:00
Scott Erickson
f2d21b960f Added a delta subview for displaying deltas of schema'd data. 2014-04-09 16:09:35 -07:00
Scott Erickson
721648dadf Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	bower.json
 2014-04-08 19:29:43 -07:00
Scott Erickson
315ef7f7b8 Added jsondiffpatch to the client. Bower update everyone! 2014-04-08 19:26:34 -07:00
Aditya Raisinghani
7cc9d22254 Moved nanoscroller to bower components and related fixes. 2014-04-08 03:04:36 +05:30
Nick Winter
5c8c7fff1d Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower. 2014-04-05 17:05:03 -07:00
Michael Schmatz
3aa31c7246 Graphs with D3! 2014-04-02 18:41:11 -07:00
Nick Winter
b5f69687cf Fixed #488. 2014-04-01 10:23:39 -07:00
Dominik Kundel
62b6387090 updated aether dependency to support coffeescript 2014-03-31 20:53:28 +02:00
Nick Winter
2f3c0b0cc6 Need updated Aether. 2014-03-20 10:43:24 -07:00
Nick Winter
8b572f0647 Using isThang instead of instanceof Thang. 2014-03-13 17:59:17 -07:00
Nick Winter
28d56f526e Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces. 2014-03-12 20:59:19 -07:00
Nick Winter
6f0ed9040a Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline. 2014-02-17 17:38:49 -08:00
Nick Winter
77dbcf9d89 Backbone 1.1.1 gets underscore as a dependency, which we don't want, so back to 1.1.0 in bower. 2014-02-13 17:34:57 -08:00
Nick Winter
738b791683 Updated to new Aether range info, fixing error line numbers. 2014-02-03 13:58:25 -08:00
Nick Winter
fb7739727c Updates for Aether's protectAPI stuff. 2014-01-28 15:24:08 -08:00
Nick Winter
6fa38bd889 Several improvements to hover debugging. 2014-01-24 13:03:04 -08:00
Nick Winter
1fb68ae717 Fixed bug with team assignments and spell permissions. 2014-01-16 11:37:04 -08:00
Nick Winter
b181aff14e Firebase is now in Bower. 2014-01-08 11:49:42 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00