Commit graph

715 commits

Author SHA1 Message Date
Tyler Renelle
89060c9561 feat(fall): turn off fall hair, skins, spookySparkles 2014-11-01 13:25:09 -06:00
Matteo Pagliazzi
b858aece51 Merge pull request #4201 from crookedneighbor/href-to-nghref
Updated href with angular expression to ng-href
2014-11-01 10:19:38 +01:00
Alice Harris
0963f0fc0a Merge pull request #4114 from Alys/lynnyliz-develop
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
2014-11-01 10:25:38 +10:00
Blade Barringer
416058ffcf Updated href with angular expression to ng-href 2014-10-31 14:03:57 -05:00
Alice Harris
0da873308d adjust last-updated date in Community Guidelines; add quick-and-dirty fix to allow staff/moderator names to wrap in message above Tavern chat 2014-10-28 11:05:18 +10:00
Tyler Renelle
b15e239601 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:20:30 -06:00
Tyler Renelle
5d67995458 Merge pull request #4177 from holyspecter/challenge-action-bacground-bug
Minor bug: In challenges area, Join button has a yellow background
2014-10-27 13:58:26 -06:00
Jonathan Klein
c790e2bf5b Fixing alignment for invited party members 2014-10-23 10:03:29 -04:00
hospect
76de909683 Minor bug: In challenges area, Join button has a yellow background 2014-10-22 01:45:37 +03:00
Alice Harris
8d87ce6c1b moved new Dailies default setting to bottom of list to keep together the three settings about task edit mode 2014-10-20 05:49:50 +10:00
Alice Harris
739e7d3d76 Merge pull request #4157 from crookedneighbor/add-setting-for-due-view
Added setting for making the due tab default on dailies
2014-10-20 05:34:40 +10:00
Alice Harris
7f8bec57d3 Merge pull request #4164 from Alys/questOwnerFix-2014-10-16
remove fix for case where quest owner has abandoned the party - fixes https://github.com/HabitRPG/habitrpg/issues/4074
2014-10-20 05:17:19 +10:00
Alice Harris
c75b272eb1 comment-out code that handles the cases where the quest owner has left the quest or left the party, at least until we can work out why it fails sometimes 2014-10-18 06:15:46 +10:00
Blade Barringer
cc71e493c6 Fixed classes so padding would be correct on party tab 2014-10-17 12:05:48 -05:00
Blade Barringer
ed15d0b1c7 Added setting for making the due tab default on dailies 2014-10-16 21:04:23 -05:00
Tyler Renelle
39ab41549a feat(quests): spider quest 2014-10-12 19:29:51 -06: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
Jonathan Klein
41de8014a0 Putting the boot icon on the same line as the member name in group members 2014-10-07 14:10:15 -04:00
Alice Harris
8a1973ae2f fix bug where quest Pets were being used instead of quest Mounts 2014-10-06 13:20:01 +10:00
Alice Harris
0c377343d5 fix bug where dropEggs were used for both types of mounts (instead of 'source') 2014-10-06 13:18:39 +10:00
Alice Harris
d24b4ad141 add fix for hiding Plain Eggs on mounts page 2014-10-06 11:37:40 +10:00
Alice Harris
ecd61ee602 Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop
Conflicts:
	views/options/inventory/stable.jade
2014-10-06 11:36:32 +10: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
Tyler Renelle
ab3c238d11 fix(avatar): put missing ng-click=buy-set back in 2014-09-30 22:06:05 -06:00
Tyler Renelle
3605b51748 feat(halloween): refactoring skin & hair to use the same mixins, add new
halloween seasonal set
2014-09-30 21:25:06 -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
Negue
b3c8acef10 fix guild list 2014-09-18 19:47:30 +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
94e1d48588 feat(quests): add rooster rampage quest 2014-09-16 16:08:35 -06:00
Alice Harris
6e33c237d3 Merge pull request #4022 from Alys/partyAvatarSortOrder
improve and clarify party avatar sort options for header - fixes https://github.com/HabitRPG/habitrpg/issues/2239
2014-09-16 14:15:01 +10: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
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
5afb258aa9 add sort by name and background for party avatars in header, remove sort option from guilds pages 2014-09-12 09:47:02 +10:00
Alice Harris
d9661cf089 hide Plain Egg mounts and remove them from the totalMounts count 2014-09-11 17:59:37 +10:00
Alice Harris
367ce13ce3 improve formatting and text in chat area before use has agreed to accept guidelines 2014-09-11 17:28:54 +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
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
c68a061c0d experimental changes for indicating acceptance of guidelines 2014-09-07 15:14:58 +10:00
Negue
397ef5e72c ngRepeat with track by 2014-09-05 20:10:13 +02: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
Alice Harris
3ac9c4f13b Revert "fix problem in chat of usernames hiding first part of message"
This reverts commit 910e4ac0f9e9886a8d3439e197eae3b5c30848ad.
2014-09-05 21:20:40 +10:00
Alice Harris
9457c844cc move Community Guidelines from an included html page in a modal to a static page with no modal 2014-09-05 21:17:57 +10:00
Alice Harris
08c37a07a9 fix problem in chat of usernames hiding first part of message 2014-09-05 21:17:57 +10:00
Alice Harris
38ea43b7f1 remove admin checkbox from Hall - not needed now that level/tier 8 and 9 automatically turn on hero.contributor.admin 2014-09-05 21:17:57 +10:00
Alice Harris
d6ce6f8986 remove unnecessary style; fix spacing in tavern message 2014-09-05 21:17:56 +10:00
Alice Harris
8343a728c0 delete unnecessary views/static/community-guidelines.jade 2014-09-05 21:17:56 +10:00