Commit Graph

162 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
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
gjoyner 4ab19ac225 Popovers now disappear when clicking Save and Close 2014-10-13 14:10:59 -07: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 80042a7a64 update jade 2014-10-07 21:30:00 +02: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
Alice Harris 73f7f6605e remove track by to fix https://github.com/HabitRPG/habitrpg/issues/4060 2014-09-22 20:23:37 +10: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 dc359e7f75 fix(pushTo): only pushToBottom on todos 2014-09-12 14:44:03 -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
Alice Harris e1d10a9af4 introduce some hideous temporary test code 2014-09-09 13:53:15 +10:00
Matteo Pagliazzi c90c8f9a5f Revert "ngRepeat with track by"
This reverts commit 397ef5e72c.
2014-09-08 12:30:30 +02:00
Tyler Renelle 1dc141b1ec Merge pull request #3993 from negue/performance_trackBy
ngRepeat with track by
2014-09-05 16:04:14 -06:00
Negue 397ef5e72c ngRepeat with track by 2014-09-05 20:10:13 +02:00
Negue 042dabcae9 Markdown for Checklist Items 2014-09-04 22:32:54 +02:00
Tyler Renelle f981223153 fix(sortable): revert back to jqueryUI, fixes #3946 2014-08-28 16:32:05 -06:00
Nathaniel E Skiba b9321807ca Completed tasks no longer display past dates in red 2014-08-28 11:21:58 -04:00
Negue c74f983c03 Tooltip: Push to top 2014-08-25 00:35:22 +02:00
Tyler Renelle ef548ec9ed Merge pull request #3588 from negue/feat_pushToTop
feat(todolist): Push To Top Button
2014-08-23 17:05:32 -06:00
Tyler Renelle 750135b673 feat(sortable): use angular-ui-sortable instead of jqueryui directly 2014-08-19 14:35:10 -06:00
Tyler Renelle c0ae0b35b6 feat(clearCompleted): explain what clearCompleted does #3670 2014-07-01 10:19:18 -06:00
Tyler Renelle ce5d83d5a1 Merge pull request #3605 from yafinee/etheral_surge
#3534 - Rewards: Broken layout when the text is too long.
2014-06-14 18:03:33 -06:00
Yafinee c5d9fe4e1d #3534 - Rewards: Broken layout when the text is too long. 2014-06-14 14:31:12 +02:00
negue 76ac10395f feat(todolist): Push To Top Button 2014-06-10 20:41:30 +02:00
Greg Laabs 04034dbdf1 Hide task control buttons during editing 2014-05-23 19:54:32 -07:00
Matteo Pagliazzi d242ee3291 refactor(i18n): use strings for content 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi 626352e04b improve(i18n): use strings for gear items and potion 2014-05-06 20:04:09 +02:00
SabreCat 3f5e130552 feat(tooltips): Add expand/collapse cues
Some users (@fragmental) didn't realize that you could click the checklist badge to expand or collapse checklists. This commit adds a tooltip to the badge, as well as to a couple other not-obviously-clickable spots, to cue the user that they can be expanded and collapsed.

BREAKING CHANGE: Will result in "String not found" errors until all locales have an "expandCollapse" string available.
2014-04-28 20:44:16 -05:00
benmanley 055c25fac3 Remove gold and silver totals from Reward list 2014-03-18 17:30:57 +00:00
Tyler Renelle c13b18030b fix(rewards): hide special event spells section if empty, fixes #2909 2014-02-20 17:52:46 -08:00
Tyler Renelle 02c283b628 chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop
Conflicts:
	views/options/settings.jade
2014-02-20 16:34:28 -08:00
Tyler Renelle 55782512bf feat(valentine): remove valentine event 2014-02-18 11:22:31 -07:00
Marc-André Larivière dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Tyler Renelle fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07:00
Matteo Pagliazzi fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
Matteo Pagliazzi 1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi 46053cc520 refactor(bs3): spaces 2014-02-08 20:10:37 +01:00
Matteo Pagliazzi 5e98fa013d refactor(bs3): typo 2014-02-08 19:56:31 +01:00