Commit graph

8518 commits

Author SHA1 Message Date
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
Popey Gilbert
915f98ee8b Update headless_client.coffee 2015-04-03 20:29:46 +01: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
Matt Lott
d91a7d8d1a Clans remove member 2015-04-02 11:01:37 -07:00
Matt Lott
6c1e7b9560 Add 7 day net to admin subs count page 2015-04-01 20:23:05 -07:00
Matt Lott
bf38327578 Leave clan
And add join clan plumbing to clan details page.
2015-04-01 16:00:39 -07:00
Matt Lott
b48de3d74d Join clan 2015-04-01 15:24:45 -07:00
Matt Lott
482b66b8a4 Create and list clans
Replace mock data with some real functionality.
2015-04-01 11:56:48 -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
32b48a3c4c Clans v1 UI with mock data
Main clans view shows public list, user’s clans, and create clan form.
Clan details view shows clan details and members list.
2015-03-31 13:28:57 -07: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