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

5555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Alice Harris 7b2b287826 Merge pull request #4192 from Alys/quickfix1 
change Heroic to Guardian for non-staff moderators
 2014-10-28 11:37:51 +10:00
Alice Harris 7d817f1298 change Heroic to Guardian for non-staff moderators 2014-10-28 11:33:50 +10:00
Alice Harris 2d392be772 Merge pull request #4191 from Alys/quickfix 
Community Guidelines date; wrapping in staff/mod names in Tavern
 2014-10-28 11:17:21 +10:00
Alice Harris 0da873308d adjust last-updated date in Community Guidelines; add quick-and-dirty fix to allow staff/moderator names to wrap in message above Tavern chat 2014-10-28 11:05:18 +10:00
Alice Harris 354e8a8167 change mods@habitrpg.com to leslie@habitrpg.com 2014-10-27 18:07:15 -06:00
Tyler Renelle edc9382e99 bailey(communityGuidelines): -breadstrings x1 2014-10-27 17:43:36 -06:00
Tyler Renelle a394a1bc42 baily(communityGuidelines) 2014-10-27 16:51:42 -06:00
Tyler Renelle b15e239601 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:20:30 -06:00
Tyler Renelle 5d67995458 Merge pull request #4177 from holyspecter/challenge-action-bacground-bug 
Minor bug: In challenges area, Join button has a yellow background
 2014-10-27 13:58:26 -06:00
Tyler Renelle b5fe46155b Merge pull request #4188 from tylerdmace/develop 
removed broken img tag and added quotes to malformed a tags
 2014-10-27 13:57:49 -06:00
Alice Harris 3d0f9c09bd Merge pull request #4167 from Alys/task-column-Habits-Rewards-tabs 
new tabs for Habits and Rewards columns on task page
 2014-10-27 18:46:08 +10:00
Tyler Mace 5a4aee90ed removed broken img tag and added quotes to malformed a tags 2014-10-26 06:14:31 -06:00
Matteo Pagliazzi f8a975d4ea Merge pull request #4180 from jklein/fixing_alignment 
Fixing alignment for invited party members
 2014-10-26 12:44:53 +01:00
Tyler Renelle 85aef2dd27 fix(communityGuidelines): modify script query to use collection indexes 
first for better perf
 2014-10-25 16:26:57 -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 35308853a5 feat(contributors): small update to alys's script 2014-10-24 18:56:11 -06:00