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

2120 Commits

Author SHA1 Message Date
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
Alice Harris d9661cf089 hide Plain Egg mounts and remove them from the totalMounts count 2014-09-11 17:59:37 +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
Alice Harris e1d10a9af4 introduce some hideous temporary test code 2014-09-09 13:53:15 +10:00
Alice Harris 9dcc2576c3 remove dev comment 2014-09-09 06:00:23 +10:00
Alice Harris b5ac0c635a improve new code for cancelling quests in invitation stage and for handling the cases where the quest owner is no longer in the quest or in the party 2014-09-09 06:00:23 +10:00
Alice Harris f520b8ae66 add extra Debug tools useful for quests 2014-09-09 06:00:23 +10:00
Alice Harris 0e163034cf semi-random tentative crappy code for improving quest aborting, especially when the quest owner has left the party 2014-09-09 06:00:23 +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
Alice Harris 9cf76f0deb fix whitespace 2014-09-05 21:07:57 +10:00
Alice Harris c731753e33 add Help menu 2014-09-05 20:57:44 +10:00
Negue 042dabcae9 Markdown for Checklist Items 2014-09-04 22:32:54 +02:00
Alice Harris 371bae31b1 Merge pull request #3952 from negue/tooltip_fix_part2 
2nd Try to fix Avatar tooltips
 2014-09-03 12:03:55 +10:00
Tyler Renelle 5cc4bf8aca Merge pull request #3966 from Alys/questLeaderAndNotifications 
mark Quest Owner in quest participants box on party page
 2014-09-02 15:50:58 -06:00
Tyler Renelle 772ea500a3 feat(auth): allow logging in with either username or email address 2014-09-02 12:23:29 -06:00
Tyler Renelle 2fc0f24c19 bailey(backgrounds): september 2014 backgrounds 2014-09-02 12:03:03 -06:00
Alice Harris fa96717175 mark quest owner in quest participants box on party page (in invitation stage and after quest started) 2014-09-02 17:33:26 +10:00
Alice Harris 679a120053 add Enable Class System button to User -> Stats ("Stats and Achievements") page when user has opted out 2014-09-02 14:56:14 +10:00
Tyler Renelle 72c6fd720a bailey(mystery): september mystery reminder 2014-09-01 12:25:01 -06:00
Tyler Renelle ff0b8ad88b bailey(subscriptions): last day reminder @lemoness 2014-08-31 12:09:30 -06:00
Negue f7d0c91471 fix tooltip .. again 2014-08-29 20:51:12 +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
Tyler Renelle 76206e32d6 Merge pull request #3930 from ebiagogo/3477 
Fix for issue #3477, 'No "Contact Us" at Bottom of the page. Added the n...
 2014-08-26 13:48:26 -06:00
Michael Looby fd1cb82716 Fix for issue #3477, 'No "Contact Us" at Bottom of the page. Added the new link and used the existing env.t('contactUs') string so all the translations are correct. Also added the link to layout.jade because that was stubbed out there in comments. Both links go to a new page with other links as described in the issue. 2014-08-26 14:59:54 -04:00
Alice Harris 581b921ae1 revert https://github.com/HabitRPG/habitrpg/pull/3920 because it causes level tooltip to hide Buffed and Rebirth tooltips 2014-08-26 15:49:59 +10:00
Tyler Renelle 592ffd9818 feat(registration): show some basic registration information on Settings 
> Site (if facebook, then "Registered with Facebook". If local, then
username & email)
 2014-08-25 18:01:57 -06:00
Tyler Renelle 2cc251149c feat(mystery): august mystery 2014-08-25 17:16:41 -06:00
Tyler Renelle 13f6c5fddd Merge pull request #3913 from negue/pushToTopTooltip 
Tooltip: Push to top
 2014-08-25 12:22:52 -06:00
Negue 0ddcea95f1 fix level tooltip 2014-08-25 19:04:03 +02: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 184e145914 Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop 
Conflicts:
	views/options/settings.jade
 2014-08-23 16:05:17 -06:00
Alice Harris fdf8aa696e add quest image to party page for collection quests - fixes https://github.com/HabitRPG/habitrpg/issues/3892 2014-08-21 06:27:01 +10:00
Tyler Renelle 50a34eb6c7 fix(tags): fix sortable tags by separating edit & !edit into diff 
<ul>s (cc @Fandekasp)
 2014-08-19 15:21:39 -06:00
Tyler Renelle 88d27e2153 Merge branch 'Fandekasp-sortable_tags' into develop 
Conflicts:
	public/js/directives/directives.js
 2014-08-19 15:00:36 -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 3ca84d8ef1 Merge pull request #3139 from mapleoin/partygems 
fix Guild Gems strings on the party tab
 2014-08-19 12:55:11 -06:00
Tyler Renelle faed77f186 bailey(mobile): 2014-08-18 19:58:47 -06:00
Tyler Renelle ab9393b694 bailey(audio): add bailey for audio 2014-08-18 19:12:05 -06:00
Tyler Renelle a88fde9862 feat(quests): parrot quest 2014-08-18 19:04:31 -06:00
Matteo Pagliazzi 6d251aeb91 feat(mobile): adapt boss box to mobile 2014-08-17 15:39:12 +02:00
Matteo Pagliazzi 4c8309c8cc fix(jade): fix warings 2014-08-17 13:32:09 +02:00