Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,321 Commits 64 Branches 1,256 Tags
557ccc7ec0cfea41a8534a4e9f2fed6eff7d05bb
Commit Graph

8321 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 d74f9d7a47 fix(goldenknight): add shop img for shield_special_goldenknight and fix 
translation issues, fixes https://github.com/HabitRPG/habitrpg/issues/4249
 2014-11-17 12:14:14 -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 83a22b8133 feat(webhooks): add webhooks operations 2014-11-16 20:03:20 -08:00
Tyler Renelle 21d6b71d37 Merge branch 'webhooks' into develop 
Conflicts:
	src/controllers/user.js
 2014-11-16 15:24:15 -08:00
Blade Barringer 4d08bb9206 Added uuid parameter to data link 2014-11-16 16:05:32 -06:00
Tyler Renelle d078654f41 chore(logo): 512x & 1024x logos 2014-11-16 13:57:50 -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
Matteo Pagliazzi 63d700aa5a chore(i18n): update locales 2014-11-15 18:06:45 +01: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 cbd436a867 fix(invite-friends): canbuy->canBuy typo 2014-11-13 17:53:09 -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
Sabe Jones 1aa7f6ca91 feat(quest): Begin implementing owl 
Initial/test commit for building out the Owl quest.
 2014-11-12 20:57:19 -06: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 9bb40d6a96 feat(invite-friends): add basilist quest 2014-11-12 19:23:43 -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
Alice Harris dcfa0817f6 Merge pull request #357 from ShilohT/develop 
Added definitions for new 'Data' menu item
 2014-11-12 20:14:57 +10:00
Tyler Renelle cf66383a94 bailey(goldenknight) 2014-11-11 21:05:06 -07:00
Tyler Renelle 97a9ecf1f4 feat(quests): goldeknight auto-drops at 40 2014-11-11 21:04:21 -07:00
Tyler Renelle 73bdc0dbaf feat(quests): golden knight chain 2014-11-11 20:59:31 -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
ShilohT 14a4bfd0cb Update settings.json 
Added definitions for new 'Data' menu item
 2014-11-10 02:11:04 -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 5b9f79eab2 rename Habit tabs to make them shorter (Weak/Strong instead of Struggling/On Track) - https://github.com/HabitRPG/habitrpg/pull/4167#issuecomment-61394775 2014-11-09 09:09:38 +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