Commit Graph

701 Commits

Author SHA1 Message Date
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 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
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 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
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 9c6e303fe4 move Daily and To-Do tabs to mixin and put at top and bottom 2014-10-19 15:03:24 +10: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
Tyler Renelle fb68f70adf feat(halloween): updated bailey @lemoness 2014-10-14 20:30:05 -06:00
Tyler Renelle 3b769a1407 Merge branch 'spider' into develop 2014-10-14 16:54:56 -06:00
gjoyner 4ab19ac225 Popovers now disappear when clicking Save and Close 2014-10-13 14:10:59 -07:00
Tyler Renelle 32cab260a2 bailey(spider) 2014-10-12 20:04:18 -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
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 80042a7a64 update jade 2014-10-07 21:30:00 +02:00
Tyler Renelle 0a630d7d9b feat(halloween): jackolantern pet 2014-10-06 16:14:48 -06:00
Brian Chen 9ecbe9d48f Add unallocated attribute points notification
* Uses i18n "haveUnallocated" string, to come in another commit
2014-10-04 19:57:30 +08:00
Brian Chen 74be4b211b DRY-refactor notification display conditions
* Condense the different notification icons into one span with a
  dynamically selected ng-class.
* Move logic for determining which notification icon to show and whether
  there are no notifications into AuthCtrl.
* Refactor out the two similar sequences of logic conditions into a
  helper function.
2014-10-04 17:56:56 +08:00
Tyler Renelle 8e85581679 fix(spookDust): rename to spooky sparkles 2014-10-03 13:24:55 -06:00
Tyler Renelle 81c98f7630 bailey(): spookDust, october backgrounds, memleak 2014-10-02 23:18:13 -06:00
Tyler Renelle 0841cafd1f feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:18:13 -06:00
Negue b1a34a25a8 - add popoverHtml to enable Markdown in Popovers
- add markdown filter to get Task Notes as Markdown
2014-10-01 20:30:13 +02:00
Tyler Renelle 5c56b0b7c9 bailey(halloween): 2014-09-30 21:53:34 -06:00
Alice Harris ee325ce27f Merge pull request #4093 from deilann/release_pets
feat(pets): release pets
2014-10-01 06:35:36 +10:00
deilann 8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Tyler Renelle 351e220b83 feat(mystery): 201409 2014-09-24 23:15:46 -06:00
Alice Harris 73f7f6605e remove track by to fix https://github.com/HabitRPG/habitrpg/issues/4060 2014-09-22 20:23:37 +10:00
Tyler Renelle f38db7b964 feat(fall): bailey + free candy script 2014-09-20 14:13:07 -06:00
Negue c501652194 - add popoverHtml to enable Markdown in Popovers
- add markdown filter to get Task Notes as Markdown
2014-09-20 12:13:36 +02:00
Matteo Pagliazzi 7e53eaf1ae Revert "Revert "ngRepeat with track by""
This reverts commit c90c8f9a5f.
2014-09-18 18:37:02 +02:00
Tyler Renelle c32cd57c92 bailey: Rooster Pets, Party Sorting, And Back-To-School Challenge 2014-09-16 16:13:29 -06:00
Alice Harris 9cd323294a disable feature to block chat until use agreed to guidelines; remove unneeded code; adjust last-updated date to today 2014-09-14 12:39:25 +10:00
Tyler Renelle dc359e7f75 fix(pushTo): only pushToBottom on todos 2014-09-12 14:44:03 -06:00
Tyler Renelle 78624c0bc7 bailey: new official challenge, help menu, MD in checklists 2014-09-12 14:13:06 -06:00
Alice Harris b5ee56b079 Merge pull request #4007 from Alys/pushToBottom-sortOrder-Sep03
add support for pushTaskToBottom to help with To-Do sort order bug
2014-09-12 14:05:52 +10:00
Alice Harris e6a29f80fa Merge pull request #4002 from Alys/questAbortFix
add Cancel button for quests, allow party to cancel/abort if quest owner missing, add Debug tools for quest testing
2014-09-12 14:01:09 +10:00
Tyler Renelle 29d1cf460c bailey() 2014-09-09 23:10:05 -06:00
Alice Harris dc65bd7f45 comment out the button for allowing manual pushToBottom 2014-09-09 17:13:19 +10:00
Alice Harris 6cc1d1146e refactor User.user.ops.sortTask into $scope.pushTask 2014-09-09 17:04:13 +10:00
Alice Harris 52efad41a2 make pushTaskToBottom work, but it is messy 2014-09-09 16:20:02 +10:00