287 commits

Author	SHA1	Message	Date
Scott Erickson	5cefb8fc30	Merge branch 'production'	2014-02-20 11:47:02 -08:00
Michael Schmatz	cb0c22f0c9	Replaced rank button with button going to ladder page	2014-02-20 10:14:25 -08:00
Scott Erickson	878d1e4098	Fixed the placement of the music note in the playback view.	2014-02-19 12:27:49 -08:00
Nick Winter	d45f67a8c3	Fixed some popover and modal layout and bugs.	2014-02-18 10:03:57 -08:00
Nick Winter	e3824d7698	Many improvements to the spell palette.	2014-02-16 15:30:00 -08:00
Scott Erickson	72712a349c	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-15 12:07:28 -08:00
Scott Erickson	ac08490e86	Reworked the multiplayer modal a bit.	2014-02-15 12:06:47 -08:00
Nick Winter	50f683534f	Support for seeing this.now() in spell palette.	2014-02-14 16:52:50 -08:00
Nick Winter	aa282c3a35	Updates for formatting palette docs.	2014-02-13 11:18:20 -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	8a80b9770d	More work on docs. Got rid of Docs.coffee.	2014-02-12 18:54:45 -08:00
Nick Winter	dc8c4394e1	Spell palette entries now using property docs from components.	2014-02-12 16:42:09 -08:00
Nick Winter	d2a7bfd11c	Added GoldView.	2014-02-11 12:02:27 -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
Nick Winter	738b791683	Updated to new Aether range info, fixing error line numbers.	2014-02-03 13:58:25 -08:00
Nick Winter	e0108a3166	A few fixes for the Bootstrap 3 migration. Fixed #280.	2014-01-29 12:18:37 -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
Scott Erickson	88c8c3896b	Merge branch 'master' into feature/bootstrap3	2014-01-27 11:03:04 -08:00
Nick Winter	47c78d1758	Revamped SpellToolbarView.	2014-01-25 15:11:29 -08:00
Scott Erickson	0727e11669	Merge branch 'bootstrapMigration' of https://github.com/TomSteinbrecher/codecombat into feature/bootstrap3 ... Conflicts: app/templates/play/level/playback.jade	2014-01-23 20:15:36 -08:00
Tom Steinbrecher	cd33376dea	Upgrade from Bootstrap 2 to Bootstrap 3	2014-01-23 21:49:29 -05:00
Nick Winter	24c4051442	Merge branch 'feature/time-travel-debugger'	2014-01-21 09:04:09 -08:00
Nick Winter	6ea4f645f8	Added spell toolbar view. Made many time-travel debugger improvements.	2014-01-21 09:03:04 -08:00
GlenDC	9313e5cc70	Found more tags. ar, bg and nl should have now the correct versions with the (re)moved i18n tags.	2014-01-19 18:43:55 +01:00
Nick Winter	f87c3a37e8	More progress on debugger.	2014-01-19 09:14:42 -08:00
Nick Winter	0a8d64046a	Starting work on time-travel debugging interface.	2014-01-19 07:08:28 -08:00
Nick Winter	af7344175a	Merged and tweaked phansch's save indicator from #205.	2014-01-16 10:10:27 -08:00
Philipp Hansch	ff5807adb8	New i18n tag	2014-01-16 13:37:52 +01:00
Philipp Hansch	17afb62dc9	Add basic code-saved indicator ... Using the tome:spell-changed callback to determine when to start showing the code-saved indicator	2014-01-15 20:58:39 +01:00
Nick Winter	1041ce4b17	Added GitHub stars button.	2014-01-13 18:19:28 -08:00
Scott Erickson	8077c62ceb	Set up talking portraits in the hud.	2014-01-09 11:04:22 -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