Commit graph

7976 commits

Author SHA1 Message Date
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
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
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
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
Matt Lott
51e077215e Add monthly growth to admin dashboard 2015-04-06 16:58:36 -07:00
Matt Lott
9d6e5fe20b Clan analytics
Hook up server-side operations.
2015-04-06 16:27:56 -07:00
Matt Lott
7cd71b6146 Add clans blurb to /teachers 2015-04-06 16:11:54 -07:00
cundamic
a8d17843e0 Update sk.coffee
translation: teachers
2015-04-07 00:19:40 +02:00
Imperadeiro98
8fb6de0d62 Restored some translations 2015-04-06 22:09:35 +01:00
Imperadeiro98
b9ce416f46 Merge pull request #2631 from cundamic/patch-9
Update sk.coffee
2015-04-06 22:02:11 +01:00
Matt Lott
cc4620bf6d 🐛Fix clan schema require case typo 2015-04-06 12:01:48 -07:00
Matt Lott
a77e9cafe9 Merge branch 'clans' 2015-04-06 11:18:08 -07:00
Matt Lott
43fb8ed462 Add clans link everywhere
Top-level menu, world view, user profiles.
Will add to /teachers later.
2015-04-06 11:17:13 -07:00
cundamic
2d3b84ccd0 Update sk.coffee
translation: options
2015-04-06 20:14:45 +02:00
Nick Winter
08ea51d1d9 Updated default hero costs for the bug where it didn't load them properly. Probably fixed typo in Polish teachers blurb thing. 2015-04-06 10:52:55 -07:00
Matt Lott
7f0e9e73a8 Add latest achievements to clan details page 2015-04-06 10:19:35 -07:00
Matt Lott
d4aa9882a9 Update clan buttons UI
And remove temporary test logging.
2015-04-06 10:07:16 -07:00
Nick Winter
de48934016 Merge pull request #2629 from cundamic/patch-8
Update sk.coffee
2015-04-06 08:00:39 -07:00
Nick Winter
61165df41b Merge pull request #2627 from lazydogP/master
Update zh-HANS.coffee
2015-04-06 08:00:05 -07:00
Nick Winter
c870cf3f94 Merge branch 'cundamic-patch-5' 2015-04-06 07:59:29 -07:00
Nick Winter
4ed4c5a07c Merged sk.coffee. 2015-04-06 07:59:22 -07:00
Nick Winter
1982d8d5f1 Merge pull request #2595 from nemoyatpeace/patch-5
Update the shift-click insertion
2015-04-06 07:53:01 -07:00
cundamic
43f4a2c76e Update sk.coffee
Translation account_settings
2015-04-06 10:17:56 +02:00
cundamic
8e97b05af7 Update sk.coffee
line 341 deleted
2015-04-06 03:03:28 +02:00
Imperadeiro98
e1afa33b82 Small fix for last commit 2015-04-05 21:38:37 +01:00
Imperadeiro98
aac85fc302 Merge pull request #2628 from cundamic/patch-7
Update sk.coffee
2015-04-05 21:36:26 +01:00
cundamic
5f533abf5d Update sk.coffee
translation : suscribe II, choose hero
2015-04-05 21:11:38 +02:00
Imperadeiro98
81b0150f51 Merge pull request #2626 from cundamic/patch-6
Update sk.coffee
2015-04-05 18:15:34 +01:00
lazydogP
bd7703d4fe Update zh-HANS.coffee 2015-04-06 00:02:17 +08:00
cundamic
3d842b56b5 Update sk.coffee
Translation : share progress, signup, subscribe
2015-04-05 17:00:33 +02:00
Imperadeiro98
19b1cf7f77 Merge pull request #2623 from cundamic/patch-4
Update sk.coffee
2015-04-05 11:39:53 +01:00