10929 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nick Winter	721ae833e9	Merge branch 'master' into production	2015-07-31 14:42:08 -07:00
Nick Winter	fc0a6513f3	Fixing some bugs in the geoip and language detection stuff.	2015-07-31 14:32:32 -07:00
Nick Winter	1bfef7c4ff	Merge pull request #2920 from gnerkus/issue/710/add-more-quotes ... chore (coding tips): Add more quotes for #710	2015-07-31 14:23:43 -07:00
gnerkus	835074e5e6	chore (coding tips): Add more quotes for #710	2015-07-31 21:58:10 +01:00
Matt Lott	0e272b8d86	Merge branch 'master' into production	2015-07-30 16:07:32 -07:00
Matt Lott	8fe189f915	Course details page student level progress popups	2015-07-30 16:04:13 -07:00
Matt Lott	59c730ef20	Add aggregate student progress to course details page	2015-07-30 15:30:36 -07:00
Matt Lott	14b4b83148	Move course purchase details off buy button	2015-07-30 13:54:02 -07:00
Matt Lott	c3430ff3e1	Add free teacher trial to course purchase page	2015-07-30 13:54:02 -07:00
Matt Lott	260d062014	🐛Fix courses jquery css typo	2015-07-30 13:54:02 -07:00
Imperadeiro98	574a264daf	Uncommented some headers from th.coffee	2015-07-30 21:30:59 +01:00
Imperadeiro98	ca3baf1995	Merge pull request #2919 from Auratus/patch-2 ... Update th.coffee (More translation)	2015-07-30 21:26:24 +01:00
Auratus	1defff99c1	Update th.coffee	2015-07-31 03:17:21 +07:00
Imperadeiro98	36c018ccf9	Uncommented some headers from th.coffee	2015-07-30 19:46:57 +01:00
Imperadeiro98	96f771e335	Merge pull request #2918 from Auratus/patch-1 ... I am native Thai and already translate some of it.	2015-07-30 19:43:45 +01:00
Auratus	87a838d128	I am native Thai and already translate some of it. ... I would translate more if I have the time. BTW, How can I translate "Gems Gained" when it would sound awkward in Thai if it is "5 Gems gained" and most appropriate translation would be "ได้รับเพชร 5 ชิ้น" - "Gained gem 5 pieces"	2015-07-31 00:55:16 +07:00
Matt Lott	1eb9162463	Add more course info gameplay screenshots	2015-07-29 16:11:06 -07:00
Matt Lott	c5efdb97e1	Course details mock UI edit dialogs	2015-07-29 16:11:06 -07:00
Matt Lott	2baf18ef56	Course mock UI redeem code dialog	2015-07-29 16:11:06 -07:00
Imperadeiro98	78a1e621f1	Merge pull request #2908 from fabichoi/master ... Translated some words and sentences	2015-07-29 23:08:11 +01:00
Matt Lott	822d25984f	Merge pull request #2910 from trotod/fix-clan-details-style ... Fix clan details style	2015-07-29 10:22:36 -07:00
Matt Lott	76f2270e17	Disable Travis CI client tests	2015-07-29 10:19:25 -07:00
Matt Lott	30e8fc2397	Courses: Link to campaigns, add intro course instances ... Courses will now use campaign levels instead of mock data if available. At the moment only the first intro course has a campaign specified (‘intro’).	2015-07-29 09:51:01 -07:00
Matt Lott	48512060d5	🐛Fix subs dashboard fetch state typos	2015-07-28 15:51:09 -07:00
Matt Lott	f89bb8ac0f	Subs dashboard perf ... Update sub sponsors API to use payments collection before users collection to whittle down potential sponsors.	2015-07-28 09:11:55 -07:00
Nick Winter	d07b087c7b	Merge branch 'master' into production	2015-07-27 11:35:35 -07:00
Nick Winter	e43addf55b	Debugging chinaVersion inconsistencies.	2015-07-27 11:35:20 -07:00
Nick Winter	8cffb68462	Merge pull request #2911 from MichaelRevell/patch-1 ... Add names for issue #53	2015-07-27 04:25:20 -07:00
Michael Revell	4d27c8682c	Add names for issue #52	2015-07-26 19:44:07 -07:00
David Liu	b5d7791e84	Custom hero portraits ... Though missing the raider and necromancer from the spritesheet	2015-07-26 12:40:55 -07:00
David Liu	3bf3321411	Fix weird styling on clans details page ... - add `display: table-cell` on hero portrait cell - middle align more things - `Name` should be a table header	2015-07-26 12:39:43 -07:00
Nick Winter	653dc16207	Merge pull request #2909 from gnerkus/add-thang-names ... chore (names.coffee): Add more Thang names for #53	2015-07-26 08:23:25 -07:00
gnerkus	037760e230	chore (names.coffee): Add more Thang names for #53	2015-07-26 15:07:02 +01:00
Nick Winter	1dd5d5c109	Merge pull request #2906 from spkane/loading_tips ... Add a tip for the loading screen #710	2015-07-26 04:00:06 -07:00
fabichoi	788156564f	Translated some words and sentences	2015-07-25 23:10:34 -04:00
Sean P. Kane	d5f81b8f51	Move tip into correct language file	2015-07-25 19:29:13 -07:00
Nick Winter	5644b5aff9	Merge pull request #2890 from trotod/fix-travis-client-tests ... Disable coverage reporter in Travis CI	2015-07-25 18:38:10 -07:00
Nick Winter	2a125d7635	Merge pull request #2905 from spkane/thang_names ... Added a few more names for issue #53	2015-07-25 18:36:04 -07:00
Sean P. Kane	6205ff26ae	Add a tip for the loading screen #710	2015-07-25 14:05:32 -07:00
Sean P. Kane	758e40c7f6	Added a few more names for issue #53	2015-07-25 13:46:41 -07:00
Imperadeiro98	3c7b79964f	Merge pull request #2903 from fabichoi/master ... Translated some words.	2015-07-25 20:21:48 +01:00
Nick Winter	85db686e74	Merge branch 'master' into production	2015-07-24 17:38:39 -07:00
Nick Winter	15ecc92abc	Adding 'course' type levels. Removing 'campaign' type levels.	2015-07-24 17:37:42 -07:00
Nick Winter	640b33ea16	Merge pull request #2904 from spkane/vmware_ulimits ... Add VMware support and fix ulimits	2015-07-24 08:57:33 -07:00
Nick Winter	107f94a08b	Fixed another cause of the bug fixed in 0d99b07b with modified levels still granting rewards.	2015-07-24 08:56:20 -07:00
Sean P. Kane	6edbcf2224	Add VMware support and fix ulimits	2015-07-24 08:48:34 -07:00
unknown	c3d07e950a	modified	2015-07-23 22:43:43 -04:00
Imperadeiro98	aeff90cba9	Re-added a missing string from last merge	2015-07-23 22:20:55 +01:00
Imperadeiro98	26faed2b22	Merge pull request #2902 from dolom/patch-1 ... Update it.coffee	2015-07-23 22:18:50 +01:00
dolom	35dcdff3ff	Update it.coffee	2015-07-23 22:30:06 +02:00