Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,193 Commits 64 Branches 1,256 Tags
e966de7bf0fd0f4eecff7ace286d4863565bbd7b
Commit Graph

9193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alice Harris 6f4eebb348 Merge pull request #354 from Alys/beeminderDeleteWarning-2014-11-06 
add warning text for Beeminder users about deleting To-Dos
 2014-11-07 19:31:26 +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 8120d69d05 feat(halloween): costume contest badges 2014-11-06 16:21:52 -07:00
Tyler Renelle d043048d28 deleted facebook.jpeg, now using zocial (see HabitRPG/habitrpg#6304dd2) 2014-11-06 16:21:09 -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
Alice Harris a34beb7686 add warning text for Beeminder users about deleting To-Dos 2014-11-06 12:24:27 +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 c53e6a23cf feat(backgrounds): add new backgrounds 2014-11-04 19:45:42 -07:00
Tyler Renelle ee879decb9 chore(upgrade): passport-facebook 2014-11-04 18:26:31 -07:00
Matteo Pagliazzi 28668bea8c Merge pull request #352 from Alys/commGuide-translation-fix-2014-11-04 
merge strings to ease translations
 2014-11-04 19:15:13 +01: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 cad04b376a merge strings to ease translations 2014-11-04 16:44:15 +10:00
Alice Harris 62f71fbdb8 merge strings to ease translations 2014-11-04 16:43:27 +10:00
Matteo Pagliazzi 2ac9cd037c chore(i18n): add communityGuidelines translations 2014-11-03 20:28:18 +01:00
Matteo Pagliazzi e788872932 fix typo in previous commit 2014-11-03 19:55:10 +01:00
Matteo Pagliazzi e692b4b392 do not allow user to revive if not dead, fixes HabitRPG/habitrpg#3599 2014-11-03 19:53:27 +01:00
Matteo Pagliazzi 7e573bc877 chore(i18n): update locales, add pirate english 2014-11-03 19:29:01 +01:00
Tyler Renelle 3fc4978176 feat(fall): back to default npcs 2014-11-02 23:10:48 -07:00
Tyler Renelle 1151002dd6 feat(fall): disable candy drops 2014-11-02 17:02:09 -07: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
Alice Harris 036b855777 improve wording for Dated To-Dos tab tooltip 2014-11-02 06:05:15 +10:00