Commit graph

10889 commits

Author SHA1 Message Date
Matt Lott
b888e9f97a Read concepts from campaign in course data update script 2015-09-10 10:56:01 -07:00
Matt Lott
a2577cc521 Update courses landing page 2015-09-10 10:39:21 -07:00
Nick Winter
8f22ede9ad Merge branch 'master' into production 2015-09-09 21:55:04 -07:00
Nick Winter
4d68080c4c Bumped up Ace of Coders simulations for the tournament. 2015-09-09 21:54:22 -07:00
Michael Schmatz
948df4a09c Ignore Dockerfile and add single core mode 2015-09-09 23:11:11 -04:00
Matt Lott
dfcdfd92b1 Merge pull request #3010 from trotod/update-tests
Fixes #2913
Fixes #2980
2015-09-09 15:21:05 -07:00
David Liu
954bc8df33 Update Travis CI config
* Use the container based infrastructure
* Don't attempt to npm install twice (though there was no effect)
2015-09-09 14:42:16 -07:00
Imperadeiro98
bd4063ed3a Use playSound across the code 2015-09-09 22:36:05 +01:00
David Liu
3266bd4621 Fix karma tests
* "Shim" StripeCheckout
* Fix loadDependenciesForSession test
* Update karma coverage for better perf
2015-09-09 14:02:03 -07:00
Imperadeiro98
25c693eed4 Update pt-PT.coffee 2015-09-09 21:59:25 +01:00
Matt Lott
9041646ecc Update teacher copy 2015-09-09 13:20:23 -07:00
Imperadeiro98
d7d7e8db9c Merge pull request #3008 from cwmaia/master
Changes to pt-BR 300-400
2015-09-09 20:04:29 +01:00
Carlos Maia
b1d520ade7 Changes to pt-BR 300-400
Minor fixes to lines 300-400
2015-09-09 15:02:25 -03:00
Matt Lott
d947bdd520 Reduce server Stripe subscription tests during Travis CI 2015-09-09 09:53:48 -07:00
Nick Winter
dd66018ece Merge branch 'master' into production 2015-09-09 08:59:48 -07:00
Nick Winter
b13504eeb5 Watching out for finding a null session when getting two games. 2015-09-09 08:59:33 -07:00
Nick Winter
cc255086f1 Cleaned up a couple things in LayerAdapter. 2015-09-09 08:59:33 -07:00
Imperadeiro98
769a02eeeb Merge pull request #3004 from kchz/master
Update pt-BR.coffee
2015-09-09 09:46:46 +01:00
Gabriel Maus
ad96233d72 Update pt-BR.coffee
title changes
2015-09-09 04:27:19 -03:00
Nick Winter
35ef48b108 Mirror ladder levels now copy source code to other side, too, not just transpiled code. Mirror sessions don't submit if there's a user code error. 2015-09-08 16:34:20 -07:00
Matt Lott
8d0c467ed6 HelpScout to Close.io script
Copies leads from HelpScout to Close.io based on a given HelpScout tag.
2015-09-08 15:43:26 -07:00
Nick Winter
0153f8078d Disabled Io language choice until/unless someone finishes its parser. 2015-09-08 14:50:07 -07:00
Imperadeiro98
99241fc1f5 Merge pull request #3003 from cwmaia/master
Changes to pt-BT 100-300
2015-09-08 21:54:21 +01:00
Carlos Maia
b33504b2e7 Changes to pt-BT 100-300
Minor changes and fixes.
2015-09-08 17:38:53 -03:00
Nick Winter
588fe0e134 Merge branch 'master' into production 2015-09-08 12:18:13 -07:00
Nick Winter
b1fd171a27 Opening up the ladder tab view by hiding the FB/G+ ladder column for now. Adding submitted dates to the leaderboards. 2015-09-08 06:44:26 -07:00
Nick Winter
6d5ddb65ea Not automatically showing melee ranges on action docs. 2015-09-08 06:31:19 -07:00
Imperadeiro98
3473893e8f Merge pull request #3000 from NicolasHuang/master
Just fixed some wrong punctuation
2015-09-08 11:41:43 +01:00
NicolasHuang
ea976751cf Update zh-HANT.coffee 2015-09-08 13:37:23 +08:00
NicolasHuang
1fae431773 Update zh-HANT.coffee 2015-09-08 10:50:11 +08:00
Nick Winter
0d2d1ddad0 A couple mirror match ladder tweaks. Made programmableMethods other code languages use proper code formatting. 2015-09-07 18:00:48 -07:00
NicolasHuang
bbcab626cc Update zh-HANT.coffee 2015-09-08 00:26:37 +08:00
Imperadeiro98
0549994693 Uncommented some translations 2015-09-07 14:47:33 +01:00
Imperadeiro98
912647872f Merge pull request #2997 from albenarammou/patch-1
Update bg.coffee
2015-09-07 14:41:59 +01:00
Imperadeiro98
a1b0e78ebd Merge pull request #2996 from kchz/master
Little changes for the pt-BR translation
2015-09-07 11:05:03 +01:00
Imperadeiro98
e310c4257d Merge pull request #2995 from Pena86/FIN_translation
Few new Finnish translations
2015-09-07 11:04:02 +01:00
Gabriel Maus
01f3b6dc84 Update pt-BR.coffee
Little changes for the pt-BR translation
2015-09-07 00:29:26 -03:00
AkaKaras
09d5b88ee6 Merge remote-tracking branch 'codecombat/master' into translation 2015-09-06 22:29:31 -04:00
albenarammou
010fc1834d Update bg.coffee 2015-09-06 14:37:39 +03:00
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
17888bb2b1 Merge branch 'master' into production 2015-09-04 18:11:27 -07: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
ce3662fdf6 Merge branch 'master' into production 2015-09-04 17:21:44 -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