6806 commits

Author	SHA1	Message	Date
Imperadeiro98	1961d786cc	Fixed last merge	2015-07-19 19:50:24 +01:00
Imperadeiro98	41a00d0090	Merge pull request #2893 from Abdel-Malik13/patch-1 ... Traduction d'une ligne non traduite.	2015-07-19 19:48:43 +01:00
itcbx	478efd82d7	I18n for zh-HANS ... I18n for zh-HANS	2015-07-19 23:44:36 +08:00
itcbx	eea2f511ba	i18n for zh-HANS ... i18n for zh-HANS	2015-07-19 09:54:21 +08:00
Christelle	0e8c578562	Update fr.coffee	2015-07-18 05:11:03 -04:00
sake12	6c66c782e4	pl.coffee: Translation update	2015-07-18 00:27:22 +02:00
sake12	6e6fda889f	Updated polish translation	2015-07-16 01:40:12 +02:00
Abdel-Malik	f5ec107fb0	Traduction de l'anglais vers l'arabe 0.5 ... Traduction supplémentaire, il reste quelques erreurs de traduction, je les modifierai plus tard si personne ne le fait :)	2015-07-15 12:43:28 +02:00
Abdel-Malik	5e5d4d6445	Traduction de l'anglais vers l'arabe 0.4	2015-07-15 12:26:06 +02:00
Abdel-Malik	901c1e4c56	Traduction de l'anglais vers l'arabe 0.3 ... Ajout de traducton	2015-07-15 11:58:53 +02:00
Abdel-Malik	b177f63b4e	Traduction de l'anglais vers l'arabe 0.2	2015-07-15 11:43:34 +02:00
Abdel-Malik	69d21e279e	Traduction de l'anglais vers l'arabe ... Si il y a des problèmes au niveau de la traduction, n'hésitez pas à modifier :)	2015-07-15 11:33:48 +02:00
Abdel-Malik	50e4eb5769	Update fr.coffee	2015-07-15 11:23:14 +02:00
Matt Lott	e70b8b8652	Add sorting to course details mock UI	2015-07-10 17:11:16 -07:00
Matt Lott	49a75d2d42	Update course info mock UI	2015-07-10 17:11:16 -07:00
Nick Winter	899aae5798	Consolidated extra resources.	2015-07-10 14:20:25 -07:00
Nick Winter	bcbffd1f65	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-07-10 12:54:25 -07:00
Nick Winter	929455b234	Fixed bug with heroes not loading the proper amount of gems.	2015-07-10 11:13:31 -07:00
Matt Lott	0b714e98d1	Update course info mock UI	2015-07-10 11:04:52 -07:00
Matt Lott	57f869379d	Add student view to course details mock UI	2015-07-10 10:37:41 -07:00
Nick Winter	7173fd367f	Re-enabled gutter highlights for executing code.	2015-07-10 09:39:08 -07:00
Matt Lott	0a2248393d	Update course details mock UI ... Add student concepts progress. Add level status and concepts covered. Add mostly working level Play button.	2015-07-09 17:53:35 -07:00
Nick Winter	36d3b8e910	Highlighting entry points is working pretty well, at least in Python through the forest.	2015-07-09 15:05:35 -07:00
Nick Winter	4f443efd8b	First draft of logic to work out where the code entry points should be.	2015-07-09 12:47:07 -07:00
Nick Winter	dfa0de7521	Bad testing version of code entry point arrow numbering.	2015-07-09 11:45:11 -07:00
Matt Lott	6831355649	🐛Fix subs dashboard monthly churn and perf ... Use Stripe events API to calculate monthly churn. Move Stripe API page handling to the client.	2015-07-08 17:34:34 -07:00
Imperadeiro98	a8e59c5302	Updated 'Generate Terrain' strings	2015-07-08 23:20:32 +01:00
Imperadeiro98	ad25f66db0	Update pt-PT.coffee	2015-07-08 22:22:56 +01:00
Nick Winter	be19edb7a1	Merge pull request #2881 from Vikasgupta09/master ... fix #2867 added i18n to some words of lvl save form	2015-07-07 16:09:53 -07:00
Nick Winter	16407a8ca0	Merged fr.coffee.	2015-07-07 16:07:42 -07:00
Nick Winter	45c249ac27	Not asking for resubscription in buy gems modal if already subscribed.	2015-07-07 11:50:55 -07:00
Nick Winter	51c08eff3b	Propagated i18n.	2015-07-07 11:45:41 -07:00
Nick Winter	07f81755b0	Added deprecation message to old arenas, highlighting new hero arenas instead.	2015-07-07 11:43:38 -07:00
Julien Reichardt	9748c80cae	Translation of "concepts" section	2015-07-06 23:57:19 +00:00
Cat Sync	5ab7fd7840	Added 'arguments' to the concepts list, and renamed while loops to just 'Loops', for now	2015-07-06 15:46:18 -04:00
Matt Lott	0c427ff440	Update teachers and sales copy with latest level and hour counts	2015-07-03 13:07:25 -07:00
Matt Lott	8d258c6943	Update private clans preview image and copy	2015-07-02 18:44:13 -07:00
Matt Lott	6a53237e65	Add member sorting to premium clan dashboard	2015-07-02 15:17:34 -07:00
Imperadeiro98	8a4645ebc6	Updated i18n of 'Status' in clan-details.jade	2015-07-02 21:50:28 +01:00
Matt Lott	a316924576	Add member concept maps to private clans	2015-07-02 13:23:26 -07:00
Matt Lott	a62e0a8fe6	👕Fix linter warning in mock course details view ... warn: Linting of app/views/courses/mock1/CourseDetailsView.coffee: warn: ensure_comprehensions at line 50.	2015-07-02 10:54:22 -07:00
Imperadeiro98	ede3b35368	Fixes to previous merge	2015-07-02 12:47:20 +01:00
Imperadeiro98	74cdc1c3ea	Merge pull request #2882 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-07-02 12:46:17 +01:00
Imperadeiro98	41f2eacff9	Some fixes to previous merge	2015-07-02 12:44:30 +01:00
Ikuyadeu	8a9ea09eca	Update ja.coffee	2015-07-02 19:20:25 +09:00
Vikas Gupta	4776ff8325	fix #2867 added i18n to some words of lvl save form	2015-07-02 11:40:37 +05:30
Federico Tomas	7e0c5490e0	Update es-419.coffee ... up guys!.	2015-07-01 23:06:20 -03:00
Matt Lott	af612afcdd	Mock course UI show last expanded complete level	2015-07-01 15:36:33 -07:00
Matt Lott	bee5d53457	Fix clan details html indentation ... And reorder progress key.	2015-07-01 15:16:21 -07:00
Matt Lott	254d6a9d6b	Add course mock UI for student level progress	2015-07-01 15:16:20 -07:00
tahmidshahriar	62b050f6d8	Merge remote-tracking branch 'upstream/master'	2015-07-01 10:54:37 -07:00
tahmidshahriar	f6dd3ce0c8	minimize changes	2015-07-01 10:22:25 -07:00
tahmidshahriar	60e27d386f	add close buttonn to payment methods	2015-07-01 10:20:14 -07:00
Nick Winter	1c5f176c3c	Added recursion to concepts list.	2015-06-30 20:52:10 -07:00
Matt Lott	71fd13276f	Update mock course details page ... Add individual course session selection, call them classes. Edit buttons for class name and description. Rearrange layout. Update course concept lists to use real values. Also add class name field to course enrollment page.	2015-06-30 16:53:37 -07:00
Imperadeiro98	90e02cba48	Updated i18n	2015-06-30 20:33:05 +01:00
Imperadeiro98	0ef6dfcc30	Updated i18n in add-thangs-view.jade	2015-06-30 20:33:03 +01:00
Imperadeiro98	92052ceb5b	Update pt-PT.coffee	2015-06-30 19:59:50 +01:00
Nick Winter	4742b23854	Propagated i18n.	2015-06-30 11:29:18 -07:00
Nick Winter	b0c7b50761	Added programming concept tags to campaign and level editor.	2015-06-30 11:27:58 -07:00
Nick Winter	8df32b47d0	Some tweaks to #2876.	2015-06-30 10:31:52 -07:00
Nick Winter	1d6f777b58	Merge pull request #2876 from tahmidshahriar/master ... Fixed email requirement	2015-06-30 10:13:50 -07:00
tahmidshahriar	259c91b62d	fix unneeded changes	2015-06-30 09:37:39 -07:00
tahmidshahriar	56b81f175e	Fix email	2015-06-30 09:35:45 -07:00
Nick Winter	8155d6fba0	Merge pull request #2873 from UltCombo/gh-2740 ... updateLevelRequiredItems: special-case rings, fixes #2740	2015-06-29 19:46:55 -07:00
Nick Winter	be2f47c79a	Merge pull request #2857 from laituan245/for2806_teacher_survey ... Fixes #2806 (radio buttons of teacher survey page)	2015-06-29 19:37:06 -07:00
UltCombo	7d7d2d5f0e	updateLevelRequiredItems: special-case rings, fixes #2740 ... Rings often have unique effects instead of progressively enhancing another ring's effect, hence let's make rings required even if there's already non-restricted rings equipped. If, by any chance, there's ever a new ring which enhances the effect of a ring which is required for some level, then it should be easy enough to whitelist it in the given ring slot's allowed items array.	2015-06-29 21:25:43 -03:00
Imperadeiro98	e1e1328906	Updated i18n in account-settings-root-view.jade	2015-06-29 20:26:45 +01:00
Matt Lott	e36cf0ca3f	Initial courses mock UI ... Do not localize these files. This is under construction.	2015-06-29 12:15:10 -07:00
Imperadeiro98	e932d27242	Merge pull request #2871 from SuperPranx/patch-1 ... Added new translations and modified existing ones	2015-06-29 20:05:49 +01:00
Matt Lott	8c6fd49f43	Clans view class name typo	2015-06-29 11:51:38 -07:00
Nick Winter	11d69880f7	Merge pull request #2868 from UltCombo/required-rings ... Improved `updateLevelRequiredItems` logic regarding rings, fixes #2740	2015-06-29 11:19:04 -07:00
Nick Winter	ba3a1dd3df	Merge pull request #2869 from UltCombo/2828 ... fix #2828	2015-06-29 11:14:09 -07:00
Nick Winter	39f8a8a8af	Fixed #2870.	2015-06-29 11:13:15 -07:00
Nick Winter	d7f88c3d95	Merge pull request #2856 from laituan245/for2854 ... Fixes #2854	2015-06-29 11:03:47 -07:00
tahmidshahriar	4d8c539b2c	Merge remote-tracking branch 'upstream/master'	2015-06-29 09:51:26 -07:00
Ivan Milanov	c7dc30ea64	Added new translations and modified existing ones	2015-06-29 17:23:13 +02:00
Imperadeiro98	d4f1fcaaed	Added i18n	2015-06-28 11:43:56 +01:00
Imperadeiro98	f4e54d4f54	Updated i18n in add system	2015-06-28 11:43:53 +01:00
UltCombo	cc8b8fa8be	fix #2828	2015-06-28 00:32:08 -03:00
UltCombo	63299c4d80	Improved updateLevelRequiredItems logic regarding rings, fixes #2740 ... This fixes the main issue of #2740, allowing the player to play the level if the required ring is equipped on either ring slot. There's still a small problem: if the player already had a ring equipped in the `right-ring` slot, the Ring of flowers will not display as required due to this [line](0df6da7efa/app/views/play/menu/InventoryModal.coffee (L436)). This seems to be a different issue though, probably related to the `unequipLevelRestrictedItems` logic.	2015-06-27 22:22:37 -03:00
Imperadeiro98	5eed3361f3	Updated i18n	2015-06-27 12:40:48 +01:00
Imperadeiro98	737dd56754	Updated i18n in save-version-modal.jade	2015-06-27 12:40:41 +01:00
Imperadeiro98	d868894845	Updated i18n in play-account-modal.jade	2015-06-27 12:39:42 +01:00
Nikita Gryzlov	2d7e9e88f9	Update ru.coffee. Sync type_in_email ... Sync type_in_email	2015-06-25 23:31:33 +03:00
Lai Tuan	1453c132fe	Fixes #2806	2015-06-25 23:58:12 +09:00
Lai Tuan	29d19ffc37	Fixes #2854	2015-06-25 23:30:13 +09:00
tahmidshahriar	4ac7408166	Fix small change in not-found to keep change to minimum	2015-06-24 14:53:52 -07:00
tahmidshahriar	e287e515f1	Fix small change in not-found to keep change to minimum	2015-06-24 14:51:07 -07:00
tahmidshahriar	f6a35f1fd4	Fixed not found page (got rid of NotFoundView in core)	2015-06-24 14:49:26 -07:00
tahmidshahriar	6ac3ea9f5f	Fixed not found page	2015-06-24 14:46:59 -07:00
Nick Winter	270340a79f	Removed Learnable.	2015-06-24 09:18:13 -07:00
Nikita Gryzlov	8c5b67d826	Update en.coffee. {change} added.	2015-06-23 10:59:14 +03:00
Imperadeiro98	a9eeb7723b	Update pt-PT.coffee	2015-06-22 20:46:53 +01:00
Nick Winter	aa1150768f	Propagated i18n.	2015-06-22 11:59:28 -07:00
Imperadeiro98	80bb030951	Removed unnecessary i18n	2015-06-22 19:18:47 +01:00
Imperadeiro98	cbf65ff352	Removed unnecessary i18n from about page	2015-06-22 19:18:18 +01:00
nixel2007	8f3efeb97c	Update ru.coffee. teachers_survey	2015-06-22 20:00:42 +03:00
nixel2007	a3781d887a	Update ru.coffee ... Misc.	2015-06-22 17:56:12 +03:00
NoYzE1	7fcfce5b33	Update de-DE.coffee ... Beim Dialog Abonnieren steht "$9.99/Monate". Es sollte aber "$9.99/Monat" heißen. Dev-tools sagen, dass der Text von subscribe.month stammt, wo "Monate" steht.	2015-06-20 20:59:43 +02:00
Lai Tuan	7c680e4efa	Removed 'this' and 'tempThis'	2015-06-21 02:09:44 +09:00
Lai Tuan	39fc882303	Require user password for deleting accounts #2842	2015-06-20 23:12:26 +09:00
Matt Lott	d632119a6c	Add 6 month graph to admin dashboard	2015-06-19 13:49:19 -07:00
David Liu	1716359fdf	Limit multiplayer leaderboard name width even more ... adjusted max-width to 100px, fixes #2373	2015-06-19 07:35:35 -07:00
Nick Winter	8ef4a9ddde	Merge pull request #2830 from arthurnn/master ... i18N press enter on spell view	2015-06-18 18:37:24 -07:00
Nick Winter	339aaa0aee	Uncommented all translations for #2840.	2015-06-18 18:35:26 -07:00
Nick Winter	b220849190	Merge pull request #2840 from flowabuse/patch-2 ... Update ro.coffee	2015-06-18 18:28:12 -07:00
Matt Lott	b9622d54a3	Merge pull request #2835 from Mihbo/patch-3 ... Update names.coffee	2015-06-18 18:05:35 -07:00
Matt Lott	b12b7e8ca4	Add user deletion date ... Fixes #2734	2015-06-18 15:17:56 -07:00
flowabuse	5facc41f82	Update ro.coffee ... Forgot a " on line 10.	2015-06-18 18:38:31 +03:00
Nick Winter	6a4efa9a21	Switching to Boom and Bust as first level of the forest.	2015-06-17 18:17:14 -07:00
Matt Lott	5fb8b18a31	🐛Fix managed subs next payment UI	2015-06-17 16:35:30 -07:00
flowabuse	1b1482f118	Update ro.coffee ... It had to be done! Sorry it took so long... Life happend...	2015-06-17 03:27:34 +03:00
Nick Winter	593f7a9dd7	Some improvements for handling new art.	2015-06-16 13:50:33 -07:00
Imperadeiro98	a8c06652ec	Merge pull request #2839 from Mihbo/patch-4 ... Update uk.coffee	2015-06-16 10:01:50 +01:00
Mihbo	ce73d87f92	Update uk.coffee ... some more strings translated	2015-06-16 10:27:32 +03:00
Ikuyadeu	e8a862b2ce	Update ja.coffee	2015-06-16 11:05:18 +09:00
Matt Lott	8df49b036b	Merge pull request #2831 from trotod/fix-achievement-dates ... Show correct achievement earned dates on user page - fixes #2524	2015-06-15 13:21:23 -07:00
Matt Lott	535ca8d2ac	Merge pull request #2834 from laituan245/master ... Add Contact section to About page #2822	2015-06-15 11:11:58 -07:00
Mihbo	50bcbd97be	Update names.coffee ... added some more names	2015-06-15 16:57:31 +03:00
Imperadeiro98	c35c9eadf1	Merge pull request #2833 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-06-15 11:30:57 +01:00
Lai Tuan	aabae7082e	Add Contact section to About page #2822	2015-06-15 19:11:48 +09:00
Ikuyadeu	fa8d317745	Update ja.coffee	2015-06-15 18:48:04 +09:00
Mihbo	fd5a99b9d0	Update uk.coffee ... translated some more strings	2015-06-15 10:02:24 +03:00
David Liu	1c633a8ee4	Show correct achievement earned dates on user page ... fixes #2524	2015-06-14 15:40:14 -07:00
Arthur Neves	6cb673e228	i18N press enter on spell view	2015-06-14 23:20:49 +02:00
Nick Winter	7d637a0a27	Added a couple levels' next-campaign links.	2015-06-14 11:07:21 -07:00
Nick Winter	b1680f500b	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-06-14 11:06:48 -07:00
Nick Winter	ac2039c81a	Merged fr.coffee.	2015-06-14 11:06:15 -07:00
Ikuyadeu	3f3f44038e	Update ja.coffee	2015-06-14 17:11:26 +09:00
Kevin Avignon	e263866a3a	Made some update within the spanish file	2015-06-13 23:33:48 -04:00
Kevin Avignon	c806b8865e	Made some changes into the french file	2015-06-13 11:39:25 -04:00
Imperadeiro98	2f9e9b1b67	Merge pull request #2818 from Zleep-Dogg/da-translation ... A bit of Danish translation pt. 2	2015-06-11 11:24:26 +01:00
Esben Madsen	db25007765	A bit of Danish translation pt. 2	2015-06-11 00:35:56 +02:00
Nick Winter	a85d52ebe2	Made a tabbed interface for Programmaticon V's Vector and standard library documentation.	2015-06-10 15:18:37 -07:00
Esben Madsen	8293c717a1	A bit of Danish translation	2015-06-10 01:05:12 +02:00
Imperadeiro98	1383d4c9b7	Merge pull request #2813 from Danylo-Dubinin/patch-3 ... translate few strings	2015-06-09 19:44:56 +01:00
Nick Winter	bb417e9a97	Tweaked glacier terrain generation to work similarly to dungeon (still needs flare) for #2812.	2015-06-09 11:23:05 -07:00
Danylo Dubinin	c0f05e7c86	translate few strings	2015-06-09 18:42:20 +03:00
nemoyatpeace	e0e62271b4	Added Ice Level to terrain generator	2015-06-09 18:30:40 +08:00
Imperadeiro98	66c126a8df	Update pt-PT.coffee	2015-06-08 23:39:34 +01:00
Imperadeiro98	c1d8022f35	Merge pull request #2811 from Danylo-Dubinin/patch-2 ... Improve translation, add infinite loop	2015-06-08 22:35:17 +01:00
Nick Winter	4e08d453b7	Added some code for the glacier world.	2015-06-08 13:20:54 -07:00
Danylo Dubinin	fe8c680fb1	Improve translation, add infinite loop ... Better translation of "comment out" phrase and correct translation of "rewind and fast-forward".	2015-06-08 21:45:51 +03:00
Imperadeiro98	fa273d7535	Update pt-PT.coffee	2015-06-08 18:19:27 +01:00
Matt Lott	021ff541e4	Add separate school field for teacher survey	2015-06-08 06:39:30 -07:00
Imperadeiro98	a9f8a7b1be	Fixed some typos	2015-06-08 14:32:55 +01:00
Matt Lott	78004a0a94	Trial requests localization typo ... Adding missing period at end of approved sentence.	2015-06-08 06:27:40 -07:00
Matt Lott	9b37c9f18a	🐛Fix trial request onclick	2015-06-08 06:27:40 -07:00
Imperadeiro98	198806bfc9	Removed hard-coded strings... ... ... from teachers-free-trial.jade	2015-06-08 14:16:24 +01:00