Blade Barringer
a021ab2896
Allow admin to reflag a message they've flagged and unflagged previously
2014-12-11 21:43:01 -06:00
Blade Barringer
38cd0e8de1
Added method for letting an admin unhide a flagged message
2014-12-11 17:29:01 -06:00
Blade Barringer
8ac3e312ed
Admin flagging counts for more, automatically hides message
2014-12-11 13:34:43 -06:00
Blade Barringer
6fb531234d
Added flagCount variable
2014-12-11 13:00:25 -06:00
Blade Barringer
d8515fc8de
Added fallback for is message does not contain flags key. Added error
...
for if message was already flagged by user
2014-12-11 12:16:57 -06:00
Blade Barringer
0cf7bba822
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
2014-12-11 10:21:19 -06:00
Matteo Pagliazzi
29382d18f7
fix(reset-password): use array for variables
2014-12-11 17:05:31 +01:00
Matteo Pagliazzi
1761752240
use email server for reset-password
2014-12-11 16:51:39 +01:00
Matteo Pagliazzi
ae6e0255c6
feat(flag-message): add server methods
2014-12-07 14:35:09 +01:00
Blade Barringer
e49e8f5765
Added note for paglias
2014-12-07 13:50:47 +01:00
Blade Barringer
a2cf14324c
Added a flags key to message object
2014-12-07 13:50:46 +01:00
Tyler Renelle
cb9083d9ba
fix(webhooks): don't send webhooks if not valid url (also if not
...
enabled), fixes #4357
2014-12-06 10:25:41 -07:00
Tyler Renelle
f3fc6644b8
refactor(paypal): some plan debugging cleanup
2014-12-04 16:16:53 -07:00
Tyler Renelle
c14af0e855
chore(multi-core): allow "CORES" nconf var, so can just use one core (or
...
however many) cc @paglias
2014-12-03 19:12:42 -07:00
Tyler Renelle
1a84d01933
fix(gifts): allow gifting 0<gift<1 (cc @Alys @crookedneighbor)
2014-12-03 19:00:49 -07:00
Tyler Renelle
d2e230db1f
fix(plans): various bug fixes
2014-12-03 18:34:26 -07:00
Tyler Renelle
30c1ac4b1e
fix(plans): lots of bug fixes & cleanup
2014-12-03 16:01:57 -07:00
Tyler Renelle
0fffd66588
feat(plans): time travelers tab, 1 trinket to buy 1 set
2014-12-03 14:17:08 -07:00
Tyler Renelle
7f2b6b5cfb
feat(plans): allow block subscriptions from paypal/stripe
2014-12-03 14:17:07 -07:00
Tyler Renelle
5fd805db88
feat(plans): consectuive-month subscription perks (gifting)
2014-12-03 14:17:07 -07:00
Tyler Renelle
5b01fff700
feat(gifts): allow gifting subscriptions
2014-12-03 14:17:07 -07:00
Tyler Renelle
e8dbd5ca1a
feat(gifts): allow gifting gems from paypal/stripe
2014-12-03 14:17:07 -07:00
Tyler Renelle
7e9b92fcad
feat(gifts): allow gifting from balance
2014-12-03 14:17:07 -07:00
Tyler Renelle
57bfee02cf
feat(plans): consecutive months & extra months (like a time-card)
2014-12-03 14:17:07 -07:00
Tyler Renelle
117a424a5d
refactor(members): DRY some members code
2014-12-03 14:17:07 -07:00
Tyler Renelle
66b4dae0d9
feat(news): move old news to /static/old-news, better use of content space
2014-12-03 13:49:24 -07:00
Tyler Renelle
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
benmanley
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
Alice Harris
48cfd1c2a1
convert JackOLantern-Base pumpkin pet code to commented-out example code for future use
2014-11-01 07:30:40 +10:00
Tyler Renelle
b15e239601
Merge branch 'Alys-communityGuidelines' into develop
2014-10-27 16:20:30 -06:00
Tyler Renelle
fd18232187
bailey(): mystery, costume challenge
2014-10-24 20:33:51 -06:00
Tyler Renelle
3a3066cf08
Merge branch 'Alys-gemsIncrease' into develop
2014-10-24 18:56:49 -06:00
Tyler Renelle
623175c312
tmp(memleak): try working with apdex score to restart, rather than
...
response time
2014-10-24 18:42:07 -06:00
Alice Harris
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
Tyler Renelle
d6e8d669b1
tmp(memleak): combine mem usage with avg request time
2014-10-17 11:59:39 -04:00
Blade Barringer
ed15d0b1c7
Added setting for making the due tab default on dailies
2014-10-16 21:04:23 -05:00
Tyler Renelle
d0caf5f69b
tmp(halloween): revert d5610ba , didn't work. Assign pumpkin on user.save()
2014-10-14 17:40:20 -06:00
Tyler Renelle
d5610ba01f
tmp(halloween): grant pumpkin pet to all users through october,
...
REMEMBER revert on 11/1
2014-10-14 17:29:27 -06:00
Tyler Renelle
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
Matteo Pagliazzi
8da33857e4
fix(payments): revert unwanted change
2014-10-10 21:33:32 +02:00
Matteo Pagliazzi
1a15043cdd
feat(emails): add backoff to delay failed jobs
2014-10-10 21:31:32 +02:00
Tyler Renelle
2a8128872d
fix(moment): fix deprecated warnings, use updated moment syntax
2014-10-08 17:37:30 -06:00
Matteo Pagliazzi
9ccf2c8d11
upgrade moment
2014-10-07 21:30:00 +02:00
Matteo Pagliazzi
d71f126ac4
chore(npm): upgrade express to ~3.17.5
2014-10-07 21:30:00 +02:00
Tyler Renelle
57a5a62d7c
fix(memleak): possible improvements to leaked vars #4079
2014-10-06 17:59:07 -06:00
Matteo Pagliazzi
fda93773c7
feat(emails): add subscription cancelled email
2014-10-06 20:03:55 +02:00
Tyler Renelle
ef83c9999b
fix(tests): snowball
2014-10-03 15:51:30 -06:00
Tyler Renelle
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
Matteo Pagliazzi
704a8658f3
require moment where necessary
2014-10-03 19:38:18 +02:00
Matteo Pagliazzi
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