Commit graph

8090 commits

Author SHA1 Message Date
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
Matt Lott
cc7bb406ec Add language icon to clan details page 2015-04-03 17:21:30 -07:00
Matt Lott
57bdbb4432 🐛Fix anonymous clan details page viewing 2015-04-03 16:55:26 -07:00
Matt Lott
b7fd2a89ee Add hero icons to clan details page 2015-04-03 16:44:35 -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
Matt Lott
b808fa5276 Add favorite language to clan details page 2015-04-03 15:52:16 -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
Matt Lott
565cd9cf50 Add clan invite link on details page 2015-04-03 14:48:00 -07:00
Alan Hohn
ae7f7fa44f vagrant brunch detect file changes made on host 2015-04-03 17:21:28 -04:00
Matt Lott
5ae93cd6ab Add clan description field 2015-04-03 14:09:43 -07:00
Matt Lott
db1e8f0cb4 Update clan copy to chieftain and heroes 2015-04-03 13:22:07 -07:00
Matt Lott
39990ee151 Sort and limit clan lists
Clan lists sorted by member count, then created date.
Public clans lists limited to 100.
Member lists sorted by slug.
2015-04-03 12:22:44 -07: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
Matt Lott
dfff871c58 Add achievements to clan details view 2015-04-03 11:05:37 -07:00
Matt Lott
f0bee3fd98 Normalize clan owner data 2015-04-03 09:52:25 -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
Matt Lott
56342ad993 Normalize clan members data 2015-04-02 17:00:28 -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
df120bdea3 Delete clan 2015-04-02 11:44:18 -07:00