Commit graph

8923 commits

Author SHA1 Message Date
Nick Winter
d082aa3754 Fixed leaderboard level projection issue. 2015-04-08 15:11:35 -07:00
Nick Winter
98b749eb1b Making simulator stuff more efficient by using less bandwidth. 2015-04-08 12:00:23 -07:00
Matt Lott
b500e5334a Update admin subs dashboard 2015-04-08 11:53:26 -07:00
Imperadeiro98
ce56312120 Changed some spr and spl in contact form 2015-04-08 19:31:52 +01:00
Imperadeiro98
e923f7a4fc Moved a string to its correct place 2015-04-08 19:25:59 +01:00
Nick Winter
7a83a39469 Merge branch 'master' into production 2015-04-08 10:56:13 -07:00
Nick Winter
d743bd3a4e Merge branch 'master' of https://github.com/codecombat/codecombat 2015-04-08 10:56:02 -07:00
Nick Winter
8bf42fff50 Added achievement, campaign, and poll patch properties to User schema. 2015-04-08 10:55:44 -07:00
Imperadeiro98
e1aaa9faee Update pt-PT.coffee 2015-04-08 18:46:02 +01:00
Nick Winter
7fa782e7bd Workaround for #2630: Programmable is weird. 2015-04-08 10:31:38 -07:00
Nick Winter
0f124bdddc Fixed i18n editor not allowing translation of level guides. 2015-04-08 09:51:54 -07:00
Nick Winter
e6c200b64d eye-open instead of eye-close for non-English leaderboard view buttons. 2015-04-08 09:46:55 -07:00
Nick Winter
817e382324 Updated VCS link/blurb for Lost Viking. 2015-04-08 09:44:15 -07:00
Matt Lott
51e25d8a9c Update /teachers level counts 2015-04-08 09:42:39 -07:00
Imperadeiro98
ca9ab623fb Merge pull request #2641 from cundamic/patch-15
Update sk.coffee
2015-04-08 17:10:58 +01:00
cundamic
e1f5a31734 Update sk.coffee
translation: classes, contribute
2015-04-08 15:43:01 +02:00
Nick Winter
1906c1268b Merge branch 'master' into production 2015-04-07 21:35:50 -07:00
Nick Winter
2103c6b4e0 Shared ranks in case of ties for Zero Sum. 2015-04-07 21:10:41 -07:00
Nick Winter
497978b27d Preparing Zero Sum tournament results. 2015-04-07 20:56:24 -07:00
Nick Winter
f02a8b54f3 Fixed #2596. Stopped bless-brunch from using its cacheBuster feature. Set no-cache header for /db/model.type/slug so that we can use Cloudflare on /db/model.type/object-id. Fixed a coffeelint warning. 2015-04-07 19:03:35 -07:00
Matt Lott
f3c973b945 Add payment methods to subscribe dialog
And update level counts in subscription breakdown.
2015-04-07 15:54:59 -07:00
Nick Winter
8e715560c2 Using a watch button instead of an eye icon for leaderboards in English. 2015-04-07 15:32:41 -07:00
Matt Lott
3c755d39e6 Add recent subscribers to admin dashboard 2015-04-07 15:00:53 -07:00
Nick Winter
603f9f9a37 Fixed issue where some sessions would not grant proper leaderboard replay access. 2015-04-07 14:51:18 -07:00
Nick Winter
bf86b2f9cd Not including levels that are unlocked in later campaigns in level counts for earlier campaigns until they are started. 2015-04-07 14:32:51 -07:00
Nick Winter
eef33f2ed5 Community popovers now pop to the top instead of to the bottom. 2015-04-07 13:58:04 -07:00
Imperadeiro98
ef19612ab2 Changed some spr and spl in community page...
... so that links don't get over-underlined
2015-04-07 21:51:57 +01:00
Nick Winter
f60e8d1885 Don't need confusing nested comment about Backbone (see #2633). 2015-04-07 13:44:40 -07:00
Nick Winter
77d040c866 Merge branch 'cundamic-patch-11' 2015-04-07 13:33:52 -07:00
Nick Winter
2dec5921e8 Merged sk.coffee. 2015-04-07 13:33:31 -07:00
Nick Winter
3ec2d776e6 Improved style for programming concept display in campaign view. 2015-04-07 13:32:18 -07:00
Imperadeiro98
e121179329 Merge pull request #2640 from cundamic/patch-14
Update sk.coffee
2015-04-07 21:12:33 +01:00
cundamic
16bb298250 Update sk.coffee
translation : about II. ladder II
2015-04-07 21:03:53 +02:00
Nick Winter
b388d25435 Hooked up Viking Code School offer for players who beat Lost Viking. 2015-04-07 11:19:22 -07:00
Nick Winter
50adb7b982 Fixed previously started subscriber-only levels not being available to non-subscribers. 2015-04-07 10:18:04 -07:00
Matt Lott
4da477c72f Merge branch 'master' into production 2015-04-07 10:06:20 -07:00
Matt Lott
970dedbea5 Update Stripe checkout.js 2015-04-07 10:03:52 -07:00
Imperadeiro98
a1dba5886c Merge pull request #2638 from cundamic/patch-13
Update sk.coffee
2015-04-07 18:00:03 +01:00
Imperadeiro98
85ba433857 Merge pull request #2637 from cundamic/patch-12
Update sk.coffee
2015-04-07 17:59:33 +01:00
Imperadeiro98
6f867702ba Merge pull request #2634 from cundamic/patch-10
Update sk.coffee
2015-04-07 17:57:26 +01:00
Nick Winter
7f41ad6c52 Added OSTraining and Breakout Mentors resources. 2015-04-07 09:25:42 -07:00
Nick Winter
8673cca96c Added Viking Helmet reward icon and removed Master Sword reward icon. Not showing Apocalypse particles after you have beaten it. Fixed #2580. 2015-04-07 09:05:13 -07:00
Nick Winter
c1ec1611ad Fixed style reversion for page loading bar showing over code area. 2015-04-07 08:55:33 -07:00
Barney
69ac9974b6 Update zh-HANT.coffee 2015-04-07 23:17:09 +08:00
cundamic
1fe85e8a5c Update sk.coffee
translation: ladder
2015-04-07 16:19:03 +02:00
cundamic
3d7f73a773 Update sk.coffee
translation: about
2015-04-07 14:48:32 +02:00
cundamic
d0cc29899f Update sk.coffee
translation community,classes I
2015-04-07 10:14:32 +02:00
Nick Winter
ca440e5b78 Merge branch 'master' into production 2015-04-06 17:06:00 -07:00
Nick Winter
f1d14d5bcb Updated Zero Sum tournament blurb now that it has ended. 2015-04-06 17:05:39 -07:00
Nick Winter
d973e6dbeb Requiring CoffeeScript in the worker_world.coffee for headless simulations. 2015-04-06 16:59:44 -07:00