sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5590 commits 3 branches 0 tags 1.6 GiB
Commit graph

5590 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
45845228d0 fix(invite-friends): generate correct link on the client 2014-11-16 11:39:56 +01: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
f2ee452a33 Merge pull request #4244 from HabitRPG/paypal2 
fix(paypal): move from classic paypal APIs to paypal REST SDK
 2014-11-15 16:09:24 -07: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
1d85bcd14e bailey(invite-friends) 2014-11-13 16:38:32 -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
Tyler Renelle
524e0514a1 feat(invite-friends): update wording on invitations. Add commented-out 
sample code on copy-link (it's not working)
 2014-11-13 12:57:04 -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
114cbe2760 Merge pull request #4236 from HabitRPG/share-avatar 
Share avatar
 2014-11-12 14:42:48 -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
Alice Harris
65ec6bcf2c Merge pull request #4230 from ShilohT/develop 
create 'Data' menu item
 2014-11-12 20:15:04 +10:00
Tyler Renelle
cf66383a94 bailey(goldenknight) 2014-11-11 21:05:06 -07:00
Tyler Renelle
15f318ccc2 feat(sharing): screw it, social links + img + text aint working, just 
redirect to homepage + show member modal
 2014-11-11 19:12:02 -07:00
Tyler Renelle
3a415a45a9 feat(sharing): add download link 2014-11-11 19:12:02 -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
cd2d861860 fet(analytics): track individually for cohort 2014-11-11 13:00:41 -07:00
ShilohT
54c913a5a8 Update menu.jade 
Added 'Data' menu item
 2014-11-10 02:21:49 -05:00
Tyler Renelle
c08ad60200 bailey: community guidelines, facebook login 2014-11-09 15:17:29 -07:00
Alice Harris
f80da293ce fix bug that was causing empty pet paws to appear for rare mounts 2014-11-10 06:00:01 +10:00
Alice Harris
00b9e0d6ac Merge pull request #4205 from Alys/commGuide-accept-before-post-2014-11-01 
block chat until user agrees to Community Guidelines
 2014-11-08 12:02:59 +10:00
Alice Harris
7ebc4763d3 Merge pull request #4206 from Alys/fetch-recent-messages-2014-11-01 
change Fetch Recent Messages from tooltip to button text
 2014-11-08 07:20:46 +10:00
Alice Harris
1f9cb90d2d Merge pull request #4225 from Alys/beeminderDeleteWarning-2014-11-06 
add warning text for Beeminder users about deleting To-Dos
 2014-11-07 19:29:43 +10: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
a8d4a7545c bailey(costumes) 2014-11-06 16:24:48 -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
Alice Harris
551e5d4e83 add warning text for Beeminder users about deleting To-Dos 2014-11-06 12:24:57 +10: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
Tyler Renelle
94a813fc6b bailey: backgrounds, beeminder 2014-11-04 19:50:56 -07:00
Tyler Renelle
ee879decb9 chore(upgrade): passport-facebook 2014-11-04 18:26:31 -07:00
Matteo Pagliazzi
2b085b8803 Merge pull request #4220 from Alys/commGuide-translation-fix-2014-11-04 
merge strings to ease translations
 2014-11-04 19:15:10 +01:00
Alice Harris
62f71fbdb8 merge strings to ease translations 2014-11-04 16:43:27 +10:00