Commit Graph

5280 Commits

Author SHA1 Message Date
Alice Harris 5ce4f18567 gut README.md and add links to wiki documentation - everything in one place. Approved by lefnire in https://github.com/HabitRPG/habitrpg/pull/4024#issuecomment-55451042 2014-09-13 14:56:07 +10:00
Tyler Renelle 84d1bf9e27 tmp(challenges): remove STW chal from tavern, revert with 4c6bcb5444 2014-09-12 19:15:11 -06:00
Tyler Renelle 49f2718eec Merge pull request #4006 from gasolin/mobile_task_view
add responsive mobile web task view #4005
2014-09-12 17:28:03 -06:00
Tyler Renelle dc359e7f75 fix(pushTo): only pushToBottom on todos 2014-09-12 14:44:03 -06:00
Tyler Renelle 4c6bcb5444 tmp(challenges): temporarily remove STW challenge from the list until we
can fix the bug
2014-09-12 14:13:06 -06:00
Tyler Renelle 78624c0bc7 bailey: new official challenge, help menu, MD in checklists 2014-09-12 14:13:06 -06:00
Tyler Renelle 09e43a3560 Merge pull request #4024 from Alys/seedjs
comment-out seed.js because it's no longer required
2014-09-12 13:39:12 -06:00
Negue 34fe2a9d9e change sticky-header height to 205px instead of auto - fixes #4023 2014-09-12 17:25:58 +02: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 85498d8257 adjust comments 2014-09-12 13:12:42 +10:00
Alice Harris 1503924a2e comment-out seed.js because it's no longer required - https://github.com/HabitRPG/habitrpg/issues/3852#issuecomment-55334572 2014-09-12 13:09:08 +10:00
Alice Harris 0378cb5dae Merge pull request #4019 from Alys/eggMounts-Sep11
hide Plain Egg mounts and remove them from totalMounts count - fixes https://github.com/HabitRPG/habitrpg/issues/3240
2014-09-12 12:10:06 +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
Negue 62361b6c3b set sticky header height to auto - fix #3011 2014-09-09 20:10:08 +02: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
gasolin d4701e60da add responsive mobile web task view #4005 2014-09-09 11:14:38 +08:00
Tyler Renelle f59bba598e Merge pull request #4003 from Lamecarlate/develop
Update inventory.styl
2014-09-08 17:53:58 -06:00
Chaopale Lamecarlate 716fb9b111 Update inventory.styl 2014-09-08 23:10:27 +02: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 801753b37a add Cancel option to API for quests that have not been started (invitation stage) 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 6253404677 tests(api.mocha): move bac to coffeescript from javascript 2014-09-07 17:06:24 -06:00
Tyler Renelle aa0c365326 wip(indexes): starter code for handling duplicate accounts #3986 2014-09-07 14:34:43 -06:00
Tyler Renelle 7e91fa4524 Merge pull request #3987 from Alys/soundOff404-Sep05
prevent harmless but annoying 404 errors for sound files when sound is off
2014-09-05 16:08:14 -06:00
Tyler Renelle 1dc141b1ec Merge pull request #3993 from negue/performance_trackBy
ngRepeat with track by
2014-09-05 16:04:14 -06:00
Tyler Renelle 9dda82ac1c Merge pull request #3988 from Alys/helpMenu_0827
add Help menu - fixes UI Trello card: Help/FAQs
2014-09-05 13:47:08 -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
Alice Harris 2350989dfb prevent harmless but annoying 404 errors for sound files when sound is off 2014-09-05 18:45:52 +10:00
Tyler Renelle 8961ac6198 Merge pull request #3984 from negue/checklist_markdown
Markdown for Checklist Items
2014-09-04 18:56:36 -06: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
Alice Harris 73ed5e0292 Merge pull request #3972 from Alys/reportCountOwnedGear
stop database_reports/count_users_who_own_specified_gear.js crashing when user doesn't have expected object
2014-09-03 11:47:34 +10:00
Alice Harris 8192888af2 stop crashing when user doesn't have expected object 2014-09-03 11:45:07 +10:00
Tyler Renelle 6229b2c79e perf(auth): exclude unecessary auth fields 2014-09-02 15:54:56 -06:00
Tyler Renelle 12a93c8fe3 Merge pull request #3960 from Alys/reportCountOwnedGear
count how many users own wondercon Unconventional Armor and Halloween Spooky Skins
2014-09-02 15:53:08 -06: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 46aec7ef95 Merge pull request #3970 from Alys/tags-Sep-02
allow new tag to have same UUID on client and server - fixes https://github.com/HabitRPG/habitrpg/issues/2856 , fixes https://github.com/HabitRPG/habitrpg/issues/2370
2014-09-02 15:50:09 -06:00
Alice Harris 28505c139f allow newly created tag to have the same UUID on client and server - fixes https://github.com/HabitRPG/habitrpg/issues/2856 2014-09-03 06:16:46 +10: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