1649 commits

Author	SHA1	Message	Date
Nick Winter	b316a3e078	Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing	2014-04-01 09:44:06 -07:00
Nick Winter	785cb342a2	Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master	2014-04-01 09:12:48 -07:00
jaudhaen	be9edb74af	updated dutch locale	2014-04-01 09:26:42 +02:00
Ting-Kuan	e076440d1b	Move Noty to vendor folder.	2014-04-01 02:41:04 -04:00
Ting-Kuan	085d181ed3	Use Noty to produce warning message while adding component with not added system.	2014-04-01 00:47:50 -04:00
Michael Schmatz	f084588adf	Merge pull request #758 from dkundel/master ... update de.coffee	2014-03-31 16:06:38 -07:00
Nick Winter	0bd8321345	Updated Mondo Bizarro i18n comma.	2014-03-31 16:02:56 -07:00
Dominik Kundel	a9b225ec03	fixed indentation de.coffee	2014-04-01 00:55:45 +02:00
Nick Winter	8c013c1192	Fixed 101: added level completion status to /play.	2014-03-31 15:48:22 -07:00
Dominik Kundel	069a7a41e4	update de.coffee	2014-04-01 00:34:51 +02:00
Michael Schmatz	b021b65ee1	Copied new i18n tags to all languages	2014-03-31 15:31:38 -07:00
Alexei Nikitin	0473ce2df1	Update ru.coffee	2014-03-31 15:11:56 -07:00
Alexei Nikitin	6ff8d0fbe3	Update en.coffee	2014-03-31 15:10:51 -07:00
Jazzis18	c3e4b4d279	Update ru.coffee ... Добавил пробел в начало строки переменной join_desc_3, а то в тексте получалось слитно всё.	2014-04-01 03:34:45 +06:00
Nick Winter	a319e183b6	Fixed a little mistake with user signup.	2014-03-31 14:02:15 -07:00
Nick Winter	382422829e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-31 13:56:17 -07:00
Nick Winter	389323953b	Fixed #180.	2014-03-31 13:56:13 -07:00
Alexei Nikitin	4c3e8671a3	Update ru.coffee	2014-03-31 13:33:22 -07:00
Alexei Nikitin	9e1e59bb3f	Update en.coffee	2014-03-31 13:32:11 -07:00
Nick Winter	d8a194f895	Actually using loading screen template.	2014-03-31 13:21:08 -07:00
Nick Winter	0af05176f6	Re-added a minor fix that got lost.	2014-03-31 13:00:40 -07:00
Nick Winter	a9a0a55331	Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master	2014-03-31 12:42:53 -07:00
Dominik Kundel	725a8bc2d9	updated locales	2014-03-31 20:48:07 +02:00
Dominik Kundel	1c6aea9c1c	Merge remote-tracking branch 'upstream/master'	2014-03-31 20:35:32 +02:00
Alexei Nikitin	1719358856	Update ru.coffee	2014-03-31 11:32:01 -07:00
Alexei Nikitin	aeddb64f90	Update base.jade	2014-03-31 11:09:44 -07:00
tmrdja	dfe6bce351	Added contextmenu ... Added contextmenu	2014-03-31 18:33:14 +02:00
Nick Winter	cb27124285	Fixed #135.	2014-03-30 17:24:07 -07:00
Nick Winter	8df80ad1bc	Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions.	2014-03-30 13:33:21 -07:00
Nick Winter	b0a4a97ff1	Merged	2014-03-30 12:54:48 -07:00
Bia	53c20d3b9d	Added Thang names	2014-03-30 20:43:48 +01:00
tmrdja	f8de6162d1	Added contextmenu ... Added contextmenu with Delete and Duplicate button	2014-03-30 19:38:54 +02:00
tmrdja	470a79e6b0	Added contextmenu	2014-03-30 19:33:21 +02:00
Nick Winter	6bff295d2e	Linking up Prabh's Coin Mania level.	2014-03-29 18:04:29 -07:00
Nick Winter	1b92654a44	Merged.	2014-03-29 17:45:01 -07:00
Nick Winter	54f4e8d1e9	Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor	2014-03-29 17:38:14 -07:00
Nick Winter	a79fe37ca1	Merged; made a couple tweaks.	2014-03-29 17:30:12 -07:00
Alexei Nikitin	ee5ee4bc88	Update ru.coffee	2014-03-29 17:28:44 -07:00
Dominik Maier	78c18b03b6	Merged new tips	2014-03-30 00:48:31 +01:00
Dominik Maier	fb607d06fa	Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670	2014-03-30 00:38:45 +01:00
Nick Winter	c58a1682f4	Fixed #519 for real, I think.	2014-03-29 14:09:45 -07:00
Nick Winter	e08265a725	Merge pull request #730 from Darredevil/master ... Added setGoalState	2014-03-29 14:04:33 -07:00
Nick Winter	b6e0f9037f	Merge pull request #731 from herby/locale ... some more Slovak	2014-03-29 14:02:38 -07:00
Nick Winter	bd0ecd76e5	Fixed SearchView projections.	2014-03-29 13:22:21 -07:00
Ting-Kuan	130d322d60	Move error_view's dom to template file.	2014-03-28 23:51:15 -04:00
Herbert Vojčík	f0298f4596	some more Slovak	2014-03-29 03:18:45 +01:00
Darredevil	c4de6ef996	Added setGoalState	2014-03-29 03:54:16 +02:00
Darredevil	0a969bb103	Added setGoalState	2014-03-29 03:53:19 +02:00
Darredevil	e060d4b73d	Added setGoalState	2014-03-29 03:52:02 +02:00
Nick Winter	5bcaf2c746	Fixed #64 (I hope; let's UX test.)	2014-03-28 17:06:21 -07:00