5fd805db88
feat(plans): consectuive-month subscription perks (gifting)
2014-12-03 14:17:07 -07:00
5b01fff700
feat(gifts): allow gifting subscriptions
2014-12-03 14:17:07 -07:00
e8dbd5ca1a
feat(gifts): allow gifting gems from paypal/stripe
2014-12-03 14:17:07 -07:00
7e9b92fcad
feat(gifts): allow gifting from balance
2014-12-03 14:17:07 -07:00
57bfee02cf
feat(plans): consecutive months & extra months (like a time-card)
2014-12-03 14:17:07 -07:00
117a424a5d
refactor(members): DRY some members code
2014-12-03 14:17:07 -07:00
66b4dae0d9
feat(news): move old news to /static/old-news, better use of content space
2014-12-03 13:49:24 -07:00
e63f2b6d97
Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
...
Conflicts:
database_reports/count_users_who_own_specified_gear.js
2014-11-29 08:33:28 -07:00
50b1cba0a6
refactor(tasks) improve UI consistency
...
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
48cfd1c2a1
convert JackOLantern-Base pumpkin pet code to commented-out example code for future use
2014-11-01 07:30:40 +10:00
506ac6ebe7
added mountmaster support
...
inventoryCtrl: Changed Matt to show 90 mounts instead of 180
notificationCtrl: added mountmaster achievement test
userCtrl: added scope.profile.mountCount
user.js: added fields for mountMaster and mountMasterCount (not used
yet), mountCount function
modals/achievements.jade - added modal dialog for mountmaster (note:
wolf graphic was not available locally)
profiles/achievements - jade - mountmaster added
stats.jade -- uncommented broken Mounts Tamed section, since it works
now
2014-10-30 12:35:40 -07:00
b15e239601
Merge branch 'Alys-communityGuidelines' into develop
2014-10-27 16:20:30 -06:00
fd18232187
bailey(): mystery, costume challenge
2014-10-24 20:33:51 -06:00
3a3066cf08
Merge branch 'Alys-gemsIncrease' into develop
2014-10-24 18:56:49 -06:00
623175c312
tmp(memleak): try working with apdex score to restart, rather than
...
response time
2014-10-24 18:42:07 -06:00
739e7d3d76
Merge pull request #4157 from crookedneighbor/add-setting-for-due-view
...
Added setting for making the due tab default on dailies
2014-10-20 05:34:40 +10:00
d6e8d669b1
tmp(memleak): combine mem usage with avg request time
2014-10-17 11:59:39 -04:00
ed15d0b1c7
Added setting for making the due tab default on dailies
2014-10-16 21:04:23 -05:00
d0caf5f69b
tmp(halloween): revert d5610ba , didn't work. Assign pumpkin on user.save()
2014-10-14 17:40:20 -06:00
d5610ba01f
tmp(halloween): grant pumpkin pet to all users through october,
...
REMEMBER revert on 11/1
2014-10-14 17:29:27 -06:00
1ffb640833
tmp(memleak): temporary memleak measure to check avg response-time every 3mins. If >650ms (high mem) or ==0 (blackout), restart
2014-10-14 15:21:29 -06:00
8da33857e4
fix(payments): revert unwanted change
2014-10-10 21:33:32 +02:00
1a15043cdd
feat(emails): add backoff to delay failed jobs
2014-10-10 21:31:32 +02:00
2a8128872d
fix(moment): fix deprecated warnings, use updated moment syntax
2014-10-08 17:37:30 -06:00
9ccf2c8d11
upgrade moment
2014-10-07 21:30:00 +02:00
d71f126ac4
chore(npm): upgrade express to ~3.17.5
2014-10-07 21:30:00 +02:00
57a5a62d7c
fix(memleak): possible improvements to leaked vars #4079
2014-10-06 17:59:07 -06:00
fda93773c7
feat(emails): add subscription cancelled email
2014-10-06 20:03:55 +02:00
ef83c9999b
fix(tests): snowball
2014-10-03 15:51:30 -06:00
0bb1de680c
fix(challenges): since we're setting {minimize:false} on tasks, don't
...
overwrite user tasks.*.challenges in the _.merge()
2014-10-03 14:34:58 -06:00
704a8658f3
require moment where necessary
2014-10-03 19:38:18 +02:00
8fa8e39eca
Revert "Revert "fix(tasks): tmp fix for #4066 , minimize:false on tasks so they have""
...
This reverts commit 0fa7277cf0
2014-10-03 19:05:37 +02:00
0f2c773bcb
Merge pull request #4058 from Feriority/codeclimate_improvements
...
small payments refactor for better codeclimate
2014-10-03 17:44:15 +02:00
4925882804
Merge pull request #4028 from Verabird/challengecvsalt
...
Make export to csv button on challenges export all tasks (issue #2947 )
2014-10-02 23:40:41 -06:00
6ab1e70440
Revert "Revert "perf(challenges): WIP" (see #4085 )"
...
This reverts commit efbf151c11
2014-10-02 23:23:39 -06:00
0841cafd1f
feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP
2014-10-02 23:18:13 -06:00
ead42e7cef
fix(memleak): temp, wonky fix to #4079 . Sets closure vars user to
...
null in api.batchUpdate(). More will be needed
2014-10-02 16:38:01 -06:00
e21230f8c2
Revert "small fix"
...
This reverts commit f3401e72c2
2014-09-30 21:42:48 -06:00
0fa7277cf0
Revert "fix(tasks): tmp fix for #4066 , minimize:false on tasks so they have"
...
This reverts commit a6631f5d36
2014-09-30 21:28:47 -06:00
ee325ce27f
Merge pull request #4093 from deilann/release_pets
...
feat(pets): release pets
2014-10-01 06:35:36 +10:00
8427c53d90
release pets feature
2014-09-29 13:35:38 -07:00
a6631f5d36
fix(tasks): tmp fix for #4066 , minimize:false on tasks so they have
...
tags:{} default empty object
2014-09-27 15:53:42 -06:00
f3401e72c2
small fix
2014-09-26 11:24:29 -06:00
efbf151c11
Revert "perf(challenges): WIP" (see #4085 )
...
This reverts commit 632726fe02
2014-09-25 20:47:44 -06:00
351e220b83
feat(mystery): 201409
2014-09-24 23:15:46 -06:00
632726fe02
perf(challenges): WIP
2014-09-24 21:50:14 -06:00
562f593c8f
fix(spells): temp fix to #4067 , for some reason _v is undefined after
...
casting spells?
2014-09-24 13:07:40 -06:00
0dc20b4b08
small payments refactor for better codeclimate
2014-09-20 14:53:14 -07:00
292d2455ba
fix(emails): try multiple attemps (delay not avalaible in api because in not yet released version)
2014-09-18 18:43:55 +02:00
f6e1e091f4
Merge pull request #4010 from negue/group_returnMembers
...
return group members on questAccept / questAbort
2014-09-18 18:39:38 +10:00
Tyler Renelle