Commit graph

7924 commits

Author SHA1 Message Date
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
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
Imperadeiro98
20b3c8dfc2 Merge pull request #2622 from cundamic/patch-3
Update sk.coffee
2015-04-05 11:39:28 +01:00
Imperadeiro98
82f314bd97 Merge pull request #2620 from javatlacati/patch-5
Update es-ES.coffee
2015-04-05 11:38:09 +01:00
Imperadeiro98
b97eff7386 Merge pull request #2616 from cundamic/patch-2
Update sk.coffee
2015-04-05 11:35:57 +01:00
cundamic
a13d0e713e Update sk.coffee
Translation of tips II
2015-04-04 20:07:57 +02:00
Nick Winter
04ccb2273f Raising hard execution limit from one million to three million statements. 2015-04-04 09:34:31 -07:00
cundamic
38f71010ae Update sk.coffee
Translated: Leaderboard
2015-04-04 12:22:01 +02:00
cundamic
e05fe0103f Update sk.coffee
Translation : choose_hero
2015-04-04 08:32:05 +02:00
javatlacati
7f527360f7 Update es-ES.coffee
Addeded some translations.
2015-04-03 20:58:20 -06:00
Nick Winter
383e64d6dc Updating possible user gender choices. 2015-04-03 19:12:48 -07:00
Nick Winter
a426f34b55 A couple tweaks to the Polish blurb. 2015-04-03 16:22:45 -07:00
Nick Winter
1d5b1f1c6c Added Polish IT Leader Club blurb. 2015-04-03 16:21:31 -07:00
cundamic
04037114bf Update sk.coffee
Translaltion of tips
2015-04-04 00:26:14 +02:00
Nick Winter
801d3fae73 Merge pull request #2615 from AlanHohn/vagrant-brunch-watch
vagrant brunch detect file changes made on host
2015-04-03 15:23:53 -07:00
Alan Hohn
ae7f7fa44f vagrant brunch detect file changes made on host 2015-04-03 17:21:28 -04:00
Nick Winter
3913ae9909 Wizard Dude gets his own avatar from winning the Greed tournament. 2015-04-03 12:19:06 -07:00
Imperadeiro98
80fe6c283a Reverted a mistake I did 2015-04-03 19:27:12 +01:00
Nick Winter
d6f6e3b58c Merge pull request #2611 from AlanHohn/vagrant-ws-port
add websocket port forward for Vagrant
2015-04-03 11:19:39 -07:00
Nick Winter
8208b7eb51 Merge pull request #2599 from AlanHohn/vagrant-node-modules
Vagrant node modules
2015-04-03 11:19:26 -07:00
Nick Winter
9e5f08aaaf Merge pull request #2598 from AlanHohn/vagrant-mongo-backup
add user backup / restore for Vagrant
2015-04-03 11:19:10 -07:00
Nick Winter
dcdaa1fee3 Merge pull request #2587 from popey456963/master
Update Vagrantfile
2015-04-03 11:18:58 -07:00
Nick Winter
4f962c3120 Switched fourth level group to the good-converting level instead of the bad one (oops). 2015-04-03 09:08:02 -07:00
Scott Erickson
77cc89a825 Updated subscriptionStats.js, to March and to skip over teacher subscriptions. 2015-04-02 14:13:47 -07:00
Imperadeiro98
6f3f6d66ab Uncommented a string from last merge...
... so that it doesn't get lost
2015-04-02 19:58:16 +01:00
Imperadeiro98
a0e01c78fe Merge pull request #2610 from javatlacati/patch-4
Update es-419.coffee
2015-04-02 19:56:47 +01:00
Matt Lott
6c1e7b9560 Add 7 day net to admin subs count page 2015-04-01 20:23:05 -07:00
Alan Hohn
189b7e8c0a add websocket port forward for Vagrant 2015-03-31 19:50:48 -04:00
javatlacati
6e83de564d Update es-419.coffee
translated some phrases
2015-03-31 17:06:11 -06:00
Matt Lott
2213aff909 Campaign level counts script 2015-03-30 14:29:54 -07:00
Imperadeiro98
049ad631e3 Uncommented headers from last merge 2015-03-30 22:01:58 +01:00
Imperadeiro98
6be1acdad0 Merge pull request #2601 from Moschti/patch-1
Update de-CH.coffee
2015-03-30 21:58:19 +01:00
Matt Lott
14a6ad8564 🐛Fix doubling data in admin sub counts page
Better data resetting to handle weird event firings.
2015-03-30 11:59:14 -07:00
Imperadeiro98
d283bd92ad Merge pull request #2604 from FedericoTomas/patch-8
Update es-419.coffee
2015-03-30 10:21:54 +01:00
FedericoTomas
cd86c836b6 Update es-419.coffee
Up,
2015-03-30 01:07:28 -03:00
Imperadeiro98
352b6d6d45 Uncommented some headers from last merge 2015-03-29 23:11:55 +01:00
Imperadeiro98
2d1b526d75 Merge pull request #2603 from javatlacati/patch-3
Update es-ES.coffee
2015-03-29 23:10:08 +01:00