Commit Graph

1077 Commits

Author SHA1 Message Date
Alys 23aaf78167 revert change to Bailey about Party Hats now that the code behaviour has changed 2016-01-01 16:06:52 +10:00
Alys 6a7cd0900e adjust Bailey message about party hats to clarify that they're not available to players who join from now on, and that only one hat will appear for each player 2016-01-01 11:24:15 +10:00
Sabe Jones 02f4a84146 fix(news): Winter Flame not Penguin 2015-12-30 18:38:00 -05:00
Sabe Jones 6c3e8e2081 feat(event): more NYE 2015-12-30 16:58:57 -05:00
Blade Barringer b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Georgi Gardev ea54ec607a Add confirmation popover for Release pets/mounts
Add tests for releasing pets and mounts

Refactor tests to use expect syntax from sinon-chai

tests(karma): Refine settings controller tests

refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
2015-12-28 21:37:38 -06:00
Georgi Gardev f6f82cafc4 Add confirmation popover for Rebirth
Add confirmation popover for Fortify/Reroll

Add tests for reroll and rebirth
2015-12-28 21:37:23 -06:00
Paul Rich 56a00efb19 Fix for Issue #3517 Display Current Page Name
Revision for Fix for issue #3517

lint: Remove extraneous white space in app.js file

fix: Correct attribute from pageTitle to title in $state interface
2015-12-28 07:53:51 -06:00
Blade Barringer 363ef5e091 fix: Remove stray {{ characters 2015-12-26 19:05:12 -06:00
Blade Barringer 7df3b333f6 feat: Refine clear local storage function 2015-12-26 19:00:45 -06:00
Blade Barringer ef25956ba3 feat(views): Create generic message alert modal 2015-12-26 19:00:44 -06:00
darkmeep 1c261056fe clear local storage page added
changed submit bug to clear browser data

feat(views): Style clear local storage button
2015-12-26 19:00:42 -06:00
Sabe Jones 7d0efdeeda chore(news): Android announcement
Also adds a higher-quality version of the Winter Town background.
2015-12-23 14:43:16 -05:00
Sabe Jones 468198b9e2 feat(mystery): subscriber items 2015-12
Also enables the Snowball in the Seasonal Shop.
2015-12-22 16:16:30 -05:00
Sabe Jones afe3c87357 fix(credits): Lady Snuffles 2015-12-18 20:09:26 -05:00
Sabe Jones 493ae6f26a feat(event): Winter Wonderland complete 2015-12-18 15:48:14 -05:00
Sabe Jones 6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Sabe Jones 3cc2866c76 Merge pull request #6368 from HabitRPG/sabrecat/pets-201512
December Pet Quest
2015-12-15 11:55:08 -06:00
Nathan Maton 35a921bf43 feat(content): Make mystery set strings translatable
Squashed and cleaned up version of
https://github.com/HabitRPG/habitrpg/pull/6367
2015-12-15 08:47:13 -06:00
Sabe Jones fe1de12494 feat(pets): December quest 2015-12-14 16:28:39 -05:00
Blade Barringer 5fa91713f5 fix(favicon): Add 192x192 image 2015-12-12 20:11:25 -06:00
Blade Barringer 025b302ec6 Merge branch 'develop' into anilanar-favicon192 2015-12-12 20:08:34 -06:00
Blade Barringer 81067efd19 Merge branch 'joyclark-new_mount_heads' into develop 2015-12-12 17:16:36 -06:00
Alys 10a63a6cb7 make Android link in footer open in new tab 2015-12-12 18:59:44 +10:00
Alys 95dbcde4b6 change Android link in footer to point to Google Play 2015-12-12 18:33:36 +10:00
Alys 5d6c4d4dcd add Android app with Google Play logo to static apps page; remove mailing list signup form 2015-12-12 11:32:17 +10:00
Sabe Jones f6cdf5d257 chore(news): Android Bailey 2015-12-10 17:00:48 -05:00
Joy Clark 7628882f24 use new css class 2015-12-08 13:22:13 +01:00
Sabe Jones 0f578b79ff feat(pets): Peppermint Hatching Potions
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
2015-12-04 17:20:33 -05:00
Alys d63cf64944 allow Fetch Recent Messages button to appear on newly-created groups 2015-12-03 10:03:59 +10:00
Sabe Jones 1add0084e8 chore(news): Update Bailey for GX3 2015-12-01 18:27:03 -05:00
Sabe Jones 03222bf084 feat(content): Armoire and backgrounds 2015/12 2015-12-01 16:29:22 -05:00
Sabe Jones 483ff8cb67 Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom
Tasks add push to bottom
2015-12-01 14:20:02 -06:00
Sabe Jones 78890012c1 Merge pull request #6305 from markhowson/fix_narrow_guild_desc
Fixes #6252 - Guild description is too narrow on guild page
2015-11-30 13:16:59 -06:00
Alys 5e105a0e45 allow moderators to reset flags for a chat message when there's only one flag 2015-11-29 19:46:27 +10:00
Keith Holliday 0dcba276a6 Fixed task push text and move ctrlPressed logic to rootScope. 2015-11-28 12:06:34 -06:00
Mark Howson f67bd384d4 Moved guild leader message down slightly 2015-11-26 18:47:54 +00:00
Sabe Jones ad347090c3 Merge remote-tracking branch 'origin/pr/5968' into develop
Conflicts:
	website/views/options/social/challenge-box.jade
2015-11-26 13:33:33 -05:00
Sabe Jones 0a90c7c66d Merge pull request #6270 from Arodang/challenge-tag-field-character-limit
Removed Challenge Tag Maxlength
2015-11-26 11:15:23 -06:00
Mark Howson fa462a1829 Renamed to wide-popover as it's the only remaining use 2015-11-26 12:56:22 +00:00
Mark Howson 848a96a9fa Fix for #6252 2015-11-26 11:56:32 +00:00
Keith Holliday 274f4ab4d2 Removed css in favor of using inverted glyphicon 2015-11-25 23:44:13 -06:00
Alys 0c77737f36 Merge pull request #6299 from ojeytonwilliams/static-string-fix
Fixed broken string reference and centered the string.
2015-11-26 08:59:03 +10:00
Alys 5461345770 remove trailing whitespace 2015-11-26 08:49:40 +10:00
Keith Holliday 83934bf5c9 Added markdown directive to challenge titles 2015-11-26 08:49:40 +10:00
Sabe Jones 29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Oliver Eyton-Williams d385b2e415 Fixed broken string reference and centered the string. 2015-11-25 15:46:59 +01:00
Alys e04066e45f Merge pull request #6228 from AminArria/timezone-information
Timezone information
2015-11-24 21:21:10 +10:00
Keith Holliday b668829d85 Added ability to invert pushToBottom when holding down ctrl or cmd button 2015-11-22 15:57:14 -06:00
Arodang 0b1758f5c6 Removed col-lg-6 class from tags and prize 2015-11-20 18:17:51 -05:00