38 commits

Author	SHA1	Message	Date
Nick Winter	0af05176f6	Re-added a minor fix that got lost.	2014-03-31 13:00:40 -07:00
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
Nick Winter	1397b63e50	Merged.	2014-03-17 04:37:54 -07:00
honam bang	41d26f5709	Refactoring ModalView Templates	2014-03-17 11:00:25 +09:00
Nick Winter	1f1802dc38	A couple tweaks for #577.	2014-03-16 16:04:17 -07:00
IngridMorstrad	dadf0dab86	refactored docs and reload	2014-03-17 02:57:15 +05:30
IngridMorstrad	57f24932fb	Removed redundant code for close button	2014-03-17 01:10:55 +05:30
IngridMorstrad	52115876bb	Refactored docs.jade to use the base template	2014-03-17 01:03:27 +05:30
honam bang	29a88ee128	Merge remote-tracking branch 'codecombat/master'	2014-03-17 02:20:44 +09:00
Nick Winter	125ffa9f43	Merged	2014-03-16 10:06:47 -07:00
honam bang	34be8917cb	Fixes #546	2014-03-17 01:41:19 +09:00
IngridMorstrad	8d9a8aaf73	Change victory.jade to use the base template	2014-03-16 21:16:00 +05:30
Dominik Kundel	46133ab85d	added select statement for programming language	2014-03-15 22:00:29 +01:00
Nick Winter	5c76ca71e3	Added configuring of behaviors to the editor config.	2014-03-14 10:14:48 -07:00
Dominik Kundel	190469d794	removed unnecessary comment	2014-03-14 03:28:20 +01:00
Dominik Kundel	0392f630cc	including i18n support for new editor config and minor styling changes	2014-03-14 03:26:53 +01:00
Dominik Kundel	6f2a04c5c0	added new editor config modal	2014-03-14 00:54:06 +01:00
Nick Winter	234b3f105d	Reworked ladder game victory modal main call to action to actually submit game for ranking.	2014-03-10 10:36:28 -07:00
Nick Winter	68099bbd7c	Victory modal for ladder games takes you back to the ladder matches.	2014-03-07 21:20:09 -08:00
Nick Winter	085fb82cc9	Fixed a multiplayer link and debug mark alpha.	2014-03-07 21:02:10 -08:00
Scott Erickson	619b628661	Reworked the victory modal styling a bit.	2014-03-03 16:39:56 -08:00
George Saines	4b6ebd6532	styled the victory modal a bit	2014-03-02 18:21:42 -08:00
Nick Winter	7855ca02d8	Hit a really bad victory modal image.	2014-02-28 21:29:14 -08:00
Nick Winter	72cfcf96ed	Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels.	2014-02-22 12:01:05 -08:00
Michael Schmatz	cb0c22f0c9	Replaced rank button with button going to ladder page	2014-02-20 10:14:25 -08:00
Nick Winter	d45f67a8c3	Fixed some popover and modal layout and bugs.	2014-02-18 10:03:57 -08:00
Scott Erickson	ac08490e86	Reworked the multiplayer modal a bit.	2014-02-15 12:06:47 -08:00
Scott Erickson	2e280fad6b	Set up the multiplayer modal with a submit button for the ladder queue.	2014-02-13 10:16:27 -08:00
Nick Winter	9ac0939bb8	Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.	2014-02-13 09:26:21 -08:00
Nick Winter	2efb9a0ea1	Simple team switch links in multiplayer menu.	2014-02-07 10:51:21 -08:00
Nick Winter	86de427204	Messing with team setting.	2014-02-06 17:31:08 -08:00
Scott Erickson	a239ba3465	Removed some more .controls from forms.	2014-01-27 18:50:03 -08:00
Scott Erickson	13af9febbf	More fixes for #283	2014-01-27 18:44:05 -08:00
Scott Erickson	d6e21192f5	Fixed #278	2014-01-27 16:59:34 -08:00
Tom Steinbrecher	cd33376dea	Upgrade from Bootstrap 2 to Bootstrap 3	2014-01-23 21:49:29 -05:00
Nick Winter	1041ce4b17	Added GitHub stars button.	2014-01-13 18:19:28 -08:00
Ronald Cheng	3658d5ca3a	Make G+ button same size as other buttons ... The default G+ button size is slightly larger than the Facebook and Twitter buttons. Use the "medium" size to make the size even.	2014-01-08 02:15:52 -08:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00