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 |
|
nemoyatpeace
|
b50c3fbc89
|
Update the shift-click insertion
Insertion is now language specific.
|
2015-03-29 01:14:13 +08: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 |
|
Imperadeiro98
|
8d35cea21f
|
Merge pull request #2586 from nixel2007/ru
Update ru.coffee. Zero_sum
|
2015-03-27 15:37:34 +00:00 |
|
nixel2007
|
b2c8f3c1f6
|
Update ru.coffee. Zero_sum.
|
2015-03-27 17:23:11 +03:00 |
|
Imperadeiro98
|
a7198d5456
|
Update pt-PT.coffee
|
2015-03-27 13:57:53 +00:00 |
|
Imperadeiro98
|
a07523bd04
|
Merge pull request #2585 from e-jigsaw/archmage-ja
Translate Archmage page in Japanese
|
2015-03-27 13:52:50 +00:00 |
|
jigsaw
|
57fb8588b6
|
Translate Archmage page in Japanese
|
2015-03-27 16:02:04 +09:00 |
|
Nick Winter
|
0e56117642
|
Fixed adding custom programmableProperties to heroes for specific levels.
|
2015-03-26 22:29:21 -07:00 |
|
Nick Winter
|
4d1babb95e
|
Propagated i18n for Zero Sum tournament.
|
2015-03-26 22:06:33 -07:00 |
|
Nick Winter
|
3bfc1a88ce
|
Slight copy update.
|
2015-03-26 22:05:52 -07:00 |
|
Nick Winter
|
bbf9628bde
|
Merge pull request #2582 from AlanHohn/vagrant
Integrate Vagrant
|
2015-03-26 21:11:08 -07:00 |
|