codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
codecombat/app
History
Scott Erickson 8001e58848 Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 
Conflicts:
	app/models/SuperModel.coffee
2014-03-26 14:39:01 -07:00
..
assets Got the gplus friends loading now. 2014-03-26 13:50:01 -07:00
collections Fixed #405 with a sledgehammer--just loading all Components before loading level editor. 2014-03-15 12:31:39 -07:00
lib Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 2014-03-26 14:29:16 -07:00
locale Added myself to the signature. 2014-03-26 04:46:49 +01:00
models Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 2014-03-26 14:39:01 -07:00
styles Added a google plus connect button. 2014-03-26 14:19:05 -07:00
templates Added a google plus connect button. 2014-03-26 14:19:05 -07:00
views Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master 2014-03-26 14:29:16 -07:00
application.coffee First pass on setting up gplus friends on the ladder page. 2014-03-23 09:30:01 -07:00
initialize.coffee Refactored user creation to /auth/whoami, and made the app call that first, so only one user is created. Fixed #318. Think this also fixes #406. 2014-02-24 11:12:52 -08:00
treema-ext.coffee Reverted few wrong migrations 2014-03-24 22:56:32 +05:30