Commit graph

7908 commits

Author SHA1 Message Date
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
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
javatlacati
a5c94a6277 Update es-ES.coffee
Addeded some translations.
2015-03-29 15:23:17 -06:00
Moschti
680da7ee79 Update de-CH.coffee 2015-03-29 13:57:27 +02:00
Alan Hohn
2bc2f90665 vagrant fix issues with node_modules bind mount 2015-03-28 22:58:04 -04:00
Alan Hohn
8bf7a29d9e vagrant node_modules workaround 2015-03-28 22:24:18 -04:00
Alan Hohn
58e05f63fe add user backup / restore for Vagrant 2015-03-28 18:27:38 -04:00
Nick Winter
0b1bb6a4aa Added admin/pending-patches view. Fixed accepting several kinds of patches. Added keyboard shortcuts for accepting (a) and rejecting (r) patches. Fixed #2490. Fixed #2515. Fixed #2304. 2015-03-28 13:54:44 -07:00
Nick Winter
37d7b4661c Possible fix for #2589, but need to test in production. 2015-03-27 16:24:40 -07:00
Matt Lott
532e8133c6 Add graph to sub counts admin page 2015-03-27 15:27:34 -07:00
Matt Lott
1dbb382318 Add auto-refresh to sub counts admin page 2015-03-27 15:27:34 -07:00
Matt Lott
53de6c6134 Add current subscription counts view under the admin page 2015-03-27 15:27:34 -07:00
Nick Winter
155eb4a4a8 Fixed missing disabled success button illustrated image reference. 2015-03-27 14:47:59 -07:00
Popey456963
4309f1108c Remove Debug 2015-03-27 19:05:55 +00:00
Nick Winter
3137eb05f0 Fix for extra-wide Zero Sum graphic in level info popover. 2015-03-27 11:50:08 -07:00
Popey Gilbert
5b325c7819 Update Vagrantfile 2015-03-27 16:32:04 +00:00
Popey Gilbert
88a2cbeef6 Update Vagrantfile 2015-03-27 16:19:49 +00:00