8840 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eero Penttilä	06bbe338bd	fi.coffee few consistency fixes	2015-09-05 15:30:55 +03:00
Eero Penttilä	abbeffbae0	fi.coffee translated: loading error	2015-09-05 15:15:06 +03:00
Eero Penttilä	88ea77e22c	fi.coffee translated: account_invoices	2015-09-05 15:10:25 +03:00
Eero Penttilä	8fcdbebd04	fi.coffee translated: account	2015-09-05 15:05:59 +03:00
Eero Penttilä	65bd6bbdf0	fi.coffee translated: achievements	2015-09-05 14:55:04 +03:00
Eero Penttilä	1dafdc88ad	Merge pull request #2 from codecombat/master ... update	2015-09-05 14:41:58 +03:00
Nick Winter	3768783ceb	Don't be making LadderSubmissionViews in the CastButtonView unless it's a mirror match.	2015-09-04 18:11:19 -07:00
Nick Winter	a13ccb7360	Fixed DuelStatsView power totals including future units.	2015-09-04 17:21:33 -07:00
Nick Winter	b3496cbf6b	A couple tweaks for the duel stats view.	2015-09-04 17:01:06 -07:00
Nick Winter	73f3e7cdd9	League now preserved throughout ladder navigation flow. Mirror match support for submitting to both sides at once.	2015-09-04 16:21:45 -07:00
Imperadeiro98	765627a627	Merge pull request #2994 from AkaKaras/translation ... Translation	2015-09-04 20:28:40 +01:00
AkaKaras	73f83d3096	new translation ... zh-HANT was helped by @lazydoyP	2015-09-04 11:42:09 -04:00
AkaKaras	553bb8c043	Merge remote-tracking branch 'codecombat/master' into translation	2015-09-03 22:31:25 -04:00
Nick Winter	d92ca389d6	Switched ladder views to display red/blue team instead of humans/ogres.	2015-09-03 15:46:56 -07:00
Nick Winter	89c644e084	Spectate mode starts paused until loading is done, and starts at time 1, so there is less stuttering during playback.	2015-09-03 15:22:25 -07:00
Nick Winter	98b0bcfc75	Fixed playback victory message for spectate mode. Spectate mode now opens in new tabs.	2015-09-03 15:05:10 -07:00
Matt Lott	58880b23af	Add description to tower payment messages	2015-09-03 13:35:24 -07:00
Nick Winter	df60ecd09c	Added multiplayer win/loss notice at end of level.	2015-09-03 13:32:20 -07:00
Imperadeiro98	454f66e10b	Update pt-PT.coffee	2015-09-03 21:29:48 +01:00
Matt Lott	9131d8668f	Course enroll page ... Will add a prepaid purchase once the prepaid-v2 branch is merged into master.	2015-09-03 11:04:52 -07:00
Nick Winter	46ee12ff9d	Updated some timestamps.	2015-09-03 08:33:48 -07:00
Imperadeiro98	84363bc99f	Merge pull request #2992 from Pena86/FIN_translation ... Merged Fin translations	2015-09-03 16:04:21 +01:00
Imperadeiro98	0b5301d13a	Merge pull request #2991 from cwmaia/master ... First changes to pt-BR translation	2015-09-03 16:02:19 +01:00
Eero Penttilä	929f529509	Merge remote-tracking branch 'codecombat/master' into FIN_translation	2015-09-03 17:37:11 +03:00
Eero Penttilä	34b69daf1b	Added fix for #2988	2015-09-03 17:36:39 +03:00
Imperadeiro98	4d6c888370	Update pt-PT.coffee	2015-09-03 15:29:51 +01:00
Carlos Maia	a5ebfce022	First changes to pt-BR translation ... Lines 1-100	2015-09-03 11:28:30 -03:00
Eero Penttilä	29314c21c4	Merge branch 'patch-1'	2015-09-03 17:14:48 +03:00
Eero Penttilä	91035cf957	fi.coffee translated newly added lines	2015-09-03 17:13:06 +03:00
Eero Penttilä	71b71fa19d	Merge remote-tracking branch 'codecombat/master' into patch-1 ... Conflicts: app/locale/fi.coffee	2015-09-03 16:42:13 +03:00
Nick Winter	02676dc59f	Fixed #2988.	2015-09-03 05:10:06 -07:00
Eero Penttilä	d5c46226bb	fi.coffee, Few corrections along the way	2015-09-03 14:54:23 +03:00
Nick Winter	dcfa65213e	Propagated i18n.	2015-09-03 04:47:48 -07:00
Nick Winter	4ad12a139a	Cleaned up an i18n section header typo from #2971.	2015-09-03 04:45:16 -07:00
Eero Penttilä	bc00d4fc78	fi.coffee translated: keyboard_shortcuts	2015-09-03 14:43:15 +03:00
Nick Winter	fbc70435fb	Merge pull request #2971 from AkaKaras/translation ... Translation	2015-09-03 04:39:42 -07:00
Eero Penttilä	bbfa9a1c17	fi.coffee translated: account settings ... Some new, some fixed	2015-09-03 14:31:57 +03:00
Nick Winter	1a6c3ad8c0	Updated level counts in en.coffee.	2015-09-03 04:27:36 -07:00
Eero Penttilä	b5573169b5	fi.coffee translated: contact	2015-09-03 14:10:24 +03:00
Eero Penttilä	4413c0d859	fi.coffee translated: teachers_survey	2015-09-03 13:52:12 +03:00
Eero Penttilä	0f1a854750	fi.coffee translated: teachers	2015-09-03 11:08:45 +03:00
Eero Penttilä	25863b729d	fi.coffee translated: options ... Some new, some fixes	2015-09-03 09:54:50 +03:00
Nick Winter	e6f61b545e	ControlBarView handling playing non-latest versions of levels.	2015-09-02 14:54:44 -07:00
Imperadeiro98	bb119541da	Merge pull request #2987 from sake12/master ... pl.coffee - another update	2015-09-02 21:11:43 +01:00
Imperadeiro98	57c227e9c6	Merge pull request #2985 from kerradus/ru-translation ... add some translation	2015-09-02 21:10:05 +01:00
sake12	0b5c3ad3d0	pl.coffee - update	2015-09-02 21:29:24 +02:00
sake12	b098d0d685	Merge branch 'master' into codecombat/master	2015-09-02 20:59:04 +02:00
Dmitry Suprun	d85b656b24	add some translation	2015-09-02 19:39:55 +03:00
Michael Schmatz	be80b1e355	Add Sao Paulo database condition	2015-09-02 12:33:48 -04:00
Michael Schmatz	704c05bbe5	Add Sao Paulo config options	2015-09-02 12:30:31 -04:00