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
5776 commits 3 branches 0 tags 1.6 GiB
Commit graph

5776 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Alice Harris
16fff701d4 Merge pull request #4212 from Alys/mountsFix 
fix decapitated mount head - fixes https://github.com/HabitRPG/habitrpg/issues/4209
 2014-11-02 19:16:30 +10:00
Alice Harris
b79118c976 fix decapitated mount head 2014-11-02 18:54:33 +10:00
Tyler Renelle
51a850c766 fix(bailey) 2014-11-01 13:32:50 -06:00
Tyler Renelle
5e0f4e7823 bailey(mystery) 2014-11-01 13:31:08 -06:00
Tyler Renelle
89060c9561 feat(fall): turn off fall hair, skins, spookySparkles 2014-11-01 13:25:09 -06:00
Tyler Renelle
050acdc8f3 Merge pull request #4203 from Alys/revertPumpkin-2014-11-01 
convert JackOLantern-Base pumpkin pet code to commented-out example code
 2014-11-01 13:12:01 -06:00
Matteo Pagliazzi
b858aece51 Merge pull request #4201 from crookedneighbor/href-to-nghref 
Updated href with angular expression to ng-href
 2014-11-01 10:19:38 +01:00
Alice Harris
876d1d435d change Fetch Recent Messages from tooltip to button text 2014-11-01 11:42:48 +10:00
Alice Harris
372869d709 enable feature to block chat until user agrees to guidelines 2014-11-01 11:03:01 +10:00
Alice Harris
0963f0fc0a Merge pull request #4114 from Alys/lynnyliz-develop 
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
 2014-11-01 10:25:38 +10: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
d9cfe3c370 bailey(halloween) 2014-10-31 13:05:33 -06:00
Blade Barringer
416058ffcf Updated href with angular expression to ng-href 2014-10-31 14:03:57 -05: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
d45f40ca1f refactor(tags): simplify with ui-keyup, see #4141 2014-10-29 14:28:09 -06:00
Tyler Renelle
c3a62096ad Merge pull request #4141 from gjoyner/tags 
Tags (filters) saves when pressing Enter instead of deleting
 2014-10-29 14:27:21 -06:00
Tyler Renelle
8423de287e Merge pull request #4142 from gjoyner/tasks 
Popovers now disappear when clicking Save & Close
 2014-10-29 14:22:21 -06:00
Tyler Renelle
d11dd852c5 Merge pull request #4144 from gjoyner/front 
Front page's Forgot Password will report an invalid email address instead of simply errorring. Does NOT include updated locals/en/front.json
 2014-10-29 14:19:38 -06:00