Dominik Kundel c55b608886 Merge remote-tracking branch 'upstream/master' ... Conflicts: app/templates/play/level/modal/editor_config.jade		2014-03-17 19:39:38 +01:00
..
assets	Added a border to the home view video.	2014-03-16 22:46:57 -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	Removed a TODO.	2014-03-17 07:33:53 -07:00
locale	Merge remote-tracking branch 'upstream/master'	2014-03-17 19:39:38 +01:00
models	Fixed the new build queue system for levels where there are multiple builders for a single thang type.	2014-03-13 15:45:24 -07:00
styles	Embedded new video in multiplayer launch modal.	2014-03-17 03:18:13 -07:00
templates	Merge remote-tracking branch 'upstream/master'	2014-03-17 19:39:38 +01:00
views	Merge remote-tracking branch 'upstream/master'	2014-03-17 19:39:38 +01:00
application.coffee	Better handling of refreshing ladder and matches views depending on idle state.	2014-03-12 11:39:09 -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	Merge pull request #513 from rubenvereecken/treema_fix	2014-03-12 09:21:52 -07:00