Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,614 Commits 64 Branches 1,256 Tags
7ea8ff70ae96ed7c6f19d7630d115d91167cc0e1
Commit Graph

2095 Commits

Author SHA1 Message Date
Tyler Renelle a429dce5dd fix(private-messages): blocker can't message blockee 2014-11-21 08:25:35 -07:00
Tyler Renelle 697694c69d refactor(private-messages): cleanup block-user 2014-11-20 20:14:52 -07:00
Tyler Renelle f5415ac6c5 feat(private-messages): start implementing private messaging (includes blocking). Start experimenting with reflists for PMs, instead of arrays 2014-11-20 19:03:01 -07:00
Tyler Renelle cb3ebccbbf feat(invite-friends): obfuscated invite 2014-11-18 16:38:43 -08:00
Tyler Renelle 10fb931bf2 fix(hall): remove global vars 2014-11-17 16:08:10 -08:00
Tyler Renelle e1ff9610d0 fix(paypal): charge "immediately" for on subscription setup 2014-11-17 12:38:35 -08:00
Tyler Renelle 6ef838cf1a feat(webhooks): move webhooks from array to object (everything should 
really be stored as objects). Add to API routes (see
HabitRPG/habitrpg-shared#83a22b8). Note, sorting doesn't work. Meh.
 2014-11-16 20:03:56 -08:00
Tyler Renelle 21d6b71d37 Merge branch 'webhooks' into develop 
Conflicts:
	src/controllers/user.js
 2014-11-16 15:24:15 -08:00
Tyler Renelle 45e67f0a7a refactor(payments): cleanup into directory, separate paypal & stripe files 2014-11-16 10:32:01 -08:00
Tyler Renelle 47cd11b76f refactor(paypal): move billing plan setup to a one-time file. It needn't 
be called every server-run (see #4246)
 2014-11-16 10:31:58 -08:00
Tyler Renelle 7a121b4273 fix(paypal): don't crash server when no paypal plan.id (see #4246) 2014-11-16 08:03:57 -07:00
Matteo Pagliazzi 727c96e5da fix(config): switch to new config style for emails, cc @lefnire 2014-11-16 10:56:18 +01:00
Tyler Renelle 25a5bf92a6 fix(paypal): move from classic paypal APIs to paypal REST SDK 2014-11-15 16:01:29 -07:00
Tyler Renelle 64fd6c02f7 fix(mods): restricted projected fields for mods-listing. Also, 
static-bind for perf
 2014-11-13 23:00:22 -07:00
Tyler Renelle 5fab3881a2 feat(invite-friends): allow specifying inveter's name (#4238 @lemoness) 2014-11-13 16:33:09 -07:00
Tyler Renelle d1ff1337e6 Merge pull request #4238 from HabitRPG/invite-friends 
Invite friends
 2014-11-13 13:04:20 -07:00
Matteo Pagliazzi 02328fcf58 fix(invite-friend): change variables 2014-11-13 20:11:43 +01:00
Matteo Pagliazzi beea956d77 feat(emails): allow variables to be passed to emails 2014-11-13 19:52:16 +01:00
Tyler Renelle 0da391df59 fix(intive-friends): only invite set invitation if user hasn't already 
been invited to a party
 2014-11-13 11:42:56 -07:00
Tyler Renelle 2166321572 feat(invite-friends): add inviting friends via email. URL parsed, session holds invitation. If user joins party (new user or existing), the inviter is rewarded 2014-11-12 19:24:47 -07:00
Tyler Renelle de509c83be fix(sharing): add bucket to nconf 2014-11-12 14:40:33 -07:00
Tyler Renelle 8f633e81db fix(sharing): add phantomjs buildpack to heroku (for pageres), proper use of nested nconf keys 2014-11-12 14:30:17 -07:00
Tyler Renelle 3e21e1f448 feat(sharing): implement caching of avatar img. img as image/png instead 
of octet/stream
 2014-11-11 19:12:02 -07:00
Tyler Renelle 69da58503a feat(sharing): move avatar-sharing to herobox, use addthis instead of 
custom solution. refactor from pages/* to export/*
 2014-11-11 19:11:49 -07:00
Tyler Renelle 18b350ebcc feat(sharing): directly stream avatar screenshot to aws 2014-11-11 16:07:50 -07:00
Tyler Renelle e6a99f33a9 feat(sharing): add ability to share avatar. adds static page with avatar 
screen, and generates image from it
 2014-11-11 16:07:12 -07:00
Tyler Renelle 4eae55f3ba refactor(payments): move transactional emails to utils.js for 
DRY (cc @paglias)
 2014-11-06 18:25:44 -07:00
Tyler Renelle 6304dd2e15 feat(auth): move to hello.js for social auth, paves the way for multiple 
connectors. Prettier buttons via zocial
 2014-11-06 14:45:06 -07:00
Tyler Renelle 8651f0da25 fix(facebook): move from passport-facebook to Facebook JS SDK. Better 
security on FB login by validating accessToken. Create user from FB
profile if none exists, allows 3rd-party apps to. Fixes #4221
 2014-11-05 18:23:10 -07:00
Tyler Renelle 8ff971b1ec fix(facebook): try using facebook oauth route 2.1 #4221 2014-11-05 11:31:26 -07:00
Tyler Renelle 1f72721e6a fix(facebook): attempt using a callback buster to generate a new 
authorization code #4221
 2014-11-05 11:30:53 -07:00
Matteo Pagliazzi cfbb564801 feat(emails): add recaptureEmailsPhase path to flags 2014-11-05 17:56:10 +01: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 9efaf39b2b feat(webhooks): add webhooks to user.preferences (API settings) so we can post to external services (eg, Beeminder) 2014-10-29 15:27:39 -06: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