Commit Graph

9193 Commits

Author SHA1 Message Date
Negue cc17c3cfef return group members on questAccept / questAbort 2014-09-09 18:35:32 +02:00
Alice Harris a1e3505667 implement pushToBottom 2014-09-09 17:26:00 +10: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 b5efe1f3c3 Merge pull request #299 from Alys/setOfSubmissions-Sep06
change "submission" to "set of submissions" in Player Tiers box on Tavern page
2014-09-08 17:56:58 -06: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
Alice Harris e6022b53a6 add text and improve existing text for cancelling/aborting quests and for reporting on various situations in which quest owner is no longer in quest or in party 2014-09-08 18:49:05 +10:00
Tyler Renelle 6253404677 tests(api.mocha): move bac to coffeescript from javascript 2014-09-07 17:06:24 -06:00
Alice Harris 52b3b930c3 improve message for when quest owner has left 2014-09-08 08:43:47 +10:00
Tyler Renelle aa0c365326 wip(indexes): starter code for handling duplicate accounts #3986 2014-09-07 14:34:43 -06:00
Alice Harris bb64eb9cf2 add locale text for agreeing to abide by guidelines 2014-09-07 15:15:43 +10:00
Alice Harris c68a061c0d experimental changes for indicating acceptance of guidelines 2014-09-07 15:14:58 +10:00
Alice Harris 31973a869f change "submission" to "set of submissions" as requested in private staff/mods [G+ post](https://plus.google.com/u/0/114447825469587375506/posts/YH5UKKGuxbJ) 2014-09-06 16:04:44 +10:00
Alice Harris bdb2fac682 semi-random tentative crappy code for improving quest aborting, especially when the quest owner has left the party 2014-09-06 09:53:27 +10: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 8708207c1c fix(inventory): disallow buying if !item.canOwn(user) 2014-09-05 15:54:53 -06:00
Tyler Renelle cce99612a6 Merge pull request #298 from Alys/helpMenu_0827
add text for new Help menu
2014-09-05 13:50:39 -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 2e5bd6773c Merge branch 'communityGuidelines' of https://github.com/Alys/habitrpg-shared into communityGuidelines
Conflicts:
	script/content.coffee
2014-09-05 21:30:34 +10:00
Alice Harris a6695a29fa add Bailey as a moderator 2014-09-05 21:25:18 +10:00
Alice Harris 02e98ed8f6 add localisation strings for Wiki Administrators Emeritus and month names 2014-09-05 21:25:18 +10:00
Alice Harris 38b8bf4fa1 fix capitalisation of GitHub 2014-09-05 21:25:17 +10:00
Alice Harris d1646dd81e create localisation strings for Community Guidelines document 2014-09-05 21:25:17 +10:00
Alice Harris d47fca2343 add Tavern Community Guidelines message 2014-09-05 21:23:35 +10:00
Alice Harris ae3994b0bc add communityGuidelines text 2014-09-05 21:23:34 +10:00
Alice Harris a1a6320a61 remove redundant moderator message 2014-09-05 21:23:34 +10:00
Alice Harris cb228ddc4a in Hall, change admin's description of levels 2014-09-05 21:23:34 +10:00
Alice Harris 7552bc957b remove redundant message about moderators (all info now comes from colours and icons) 2014-09-05 21:23:33 +10:00
Alice Harris dd1baeabdb Merge branch 'communityGuidelines' of https://github.com/Alys/habitrpg into communityGuidelines 2014-09-05 21:22:19 +10:00
Alice Harris 87d8387640 change order of staff/moderator names at top of Tavern chat to staff, npc, moderator 2014-09-05 21:20:42 +10:00
Alice Harris b41ce1f6f3 add intro image and Bailey as a moderator to Community Guidelines 2014-09-05 21:20:42 +10:00
Alice Harris ee0794343b add Intro image by Luciferian to Community Guidelines 2014-09-05 21:20:41 +10:00
Alice Harris c0d0dcbcf6 move community-guidelines styles from static.style to community-guidelines.jade (new extraHead block in layout.jade); improve clearing of floats for pulled images 2014-09-05 21:20:41 +10:00
Alice Harris 82eb6bff3c adjust community guidelines modal for new static location and comment it out because not currently needed 2014-09-05 21:20:41 +10:00
Alice Harris 89fcd4e658 use localisation strings for Wiki Administrators Emeritus and month names 2014-09-05 21:20:41 +10:00
Alice Harris d3e98b6156 remove test code that made the avatar names always visible in the header 2014-09-05 21:20:41 +10:00
Alice Harris f7ed881002 add comment to explain the invisible username label (it confused the heck out of me until I realised) 2014-09-05 21:20:40 +10:00
Alice Harris 0f0eb055fb do proper fix for problem in chat of usernames hiding first part of message 2014-09-05 21:20:40 +10:00