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

2217 Commits

Author SHA1 Message Date
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 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
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
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 fd18232187 bailey(): mystery, costume challenge 2014-10-24 20:33:51 -06:00
Tyler Renelle 87273ec680 bailey(quests): moonstone chain quest 2014-10-23 10:57:09 -06:00
Jonathan Klein c790e2bf5b Fixing alignment for invited party members 2014-10-23 10:03:29 -04:00
hospect 76de909683 Minor bug: In challenges area, Join button has a yellow background 2014-10-22 01:45:37 +03:00
Alice Harris 5e89d07e07 add tabs to Habits (All, Yellow-Red, Green-Blue) and to rewards (All, Equipment & Skills) 2014-10-21 15:39:46 +10:00
Alice Harris 3dc6d6385c Merge pull request #4166 from Alys/task-column-tabs-to-top 
put Daily and To-Do tabs at top and bottom - fixes https://github.com/HabitRPG/habitrpg/issues/3827
 2014-10-21 15:37:21 +10:00
Alice Harris 8d87ce6c1b moved new Dailies default setting to bottom of list to keep together the three settings about task edit mode 2014-10-20 05:49:50 +10:00
Alice Harris 739e7d3d76 Merge pull request #4157 from crookedneighbor/add-setting-for-due-view 
Added setting for making the due tab default on dailies
 2014-10-20 05:34:40 +10:00
Alice Harris 7f8bec57d3 Merge pull request #4164 from Alys/questOwnerFix-2014-10-16 
remove fix for case where quest owner has abandoned the party - fixes https://github.com/HabitRPG/habitrpg/issues/4074
 2014-10-20 05:17:19 +10:00
Alice Harris 9c6e303fe4 move Daily and To-Do tabs to mixin and put at top and bottom 2014-10-19 15:03:24 +10:00
Alice Harris c75b272eb1 comment-out code that handles the cases where the quest owner has left the quest or left the party, at least until we can work out why it fails sometimes 2014-10-18 06:15:46 +10:00
Matteo Pagliazzi edb005f2ae Merge pull request #4161 from crookedneighbor/fix-padding-on-party 
Fixed classes so padding would be correct on party tab
 2014-10-17 21:32:24 +02:00
Blade Barringer 1ca6d7a55b Removed second binding 2014-10-17 13:02:26 -05:00
Blade Barringer 8f6dc64b10 Corrected html not showing up correctly in quest modal 2014-10-17 12:45:16 -05:00
Blade Barringer cc71e493c6 Fixed classes so padding would be correct on party tab 2014-10-17 12:05:48 -05:00
Blade Barringer ed15d0b1c7 Added setting for making the due tab default on dailies 2014-10-16 21:04:23 -05:00
Matteo Pagliazzi 56af84bfdf Merge pull request #4146 from ebiagogo/3477 
Issue #3477 (again) - Fixed admin email address display text from admin@gmail.com
 2014-10-15 19:08:20 +02:00
Tyler Renelle fb68f70adf feat(halloween): updated bailey @lemoness 2014-10-14 20:30:05 -06:00
Michael P. Looby 3f92fb4b64 Fixed admin email address display text from admin@gmail.com to admin@habitrpg.com. 2014-10-14 22:17:20 -04:00
Tyler Renelle 3b769a1407 Merge branch 'spider' into develop 2014-10-14 16:54:56 -06:00
gjoyner 5e87b42af3 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-13 23:47:34 -07:00
gjoyner 4ab19ac225 Popovers now disappear when clicking Save and Close 2014-10-13 14:10:59 -07:00
gjoyner feb55324ba Tags (filters) saves when pressing Enter instead of deleting the current tag 2014-10-13 01:57:59 -07:00
Tyler Renelle 32cab260a2 bailey(spider) 2014-10-12 20:04:18 -06:00
Tyler Renelle 39ab41549a feat(quests): spider quest 2014-10-12 19:29:51 -06:00
Tyler Renelle 56e2ec1bc4 Merge pull request #4140 from gjoyner/checklists 
Adding checklist item drag and drop feature
 2014-10-12 18:27:06 -06:00
Negue 67b341760e stop spell casting on rewards 2014-10-12 22:01:12 +02:00
gjoyner 36bf09d984 Adding checklist item drag and drop feature 2014-10-12 01:48:51 -07:00
Alice Harris d7c8d48078 Merge pull request #4129 from Alys/Gaelan-hide_completed_dailies 
Add ability to hide completed dailies (Gaelan's changes with fixes for merge conflicts etc)
 2014-10-10 22:07:30 +10:00
Tyler Renelle 1fbf3a7eba fix(static): fix static/api page, fixes #3636 2014-10-09 13:28:37 -06:00
Alice Harris 264b16f76b move Dailies "All" tab to the first position, to make it the default (I hope) 2014-10-09 21:08:46 +10:00
Alice Harris 43d2d1355e renamed Daily tabs to save space, removed To-Dos from new code because compled/all tabs were blank, decoupled To-Do code from Dailes code to allow future changes (e.g., "Dated" tab for To-Dos) 2014-10-09 20:04:03 +10:00
Alice Harris f0c3b3db4c add pipes in front of plain text to prevent "Warning: missing space before text for line nn of jade file ..." 2014-10-09 15:56:06 +10:00
Bob Example c4a2e720fd Add ability to hide completed dailies. 
While I was at it, I also did a bit of refactoring in general around the hiding
of completed todos/dailies.
 2014-10-09 14:49:04 +10:00
Matteo Pagliazzi 96b41448cd Merge pull request #4112 from betaveros/unallocated-notification 
Notification for Unallocated Attribute Points (fixes #4109)
 2014-10-08 19:53:50 +02:00
Matteo Pagliazzi f4977cd1ed Merge pull request #4122 from jklein/develop 
Putting the boot icon on the same line as the member name in group members
 2014-10-08 15:04:21 +02:00
Matteo Pagliazzi 95e71c68de fix(jade): update api page to new doctype 2014-10-07 21:30:01 +02:00
Matteo Pagliazzi 80042a7a64 update jade 2014-10-07 21:30:00 +02:00