Commit Graph

1109 Commits

Author SHA1 Message Date
Sabe Jones 2db1ef0f7a style(subscriptions): Gem layout feedback 2016-01-12 15:00:07 -05:00
AnitaYCheng 8bc78af5ae Added specificity to CSS, removed exxtra line 2016-01-12 15:00:07 -05:00
AnitaYCheng bf6ebd88f6 Modifications to settings mixin and misc last changes. 2016-01-12 15:00:07 -05:00
AnitaYCheng 6a72027d8b Add subscription conditionals for buying or purchasing gems 2016-01-12 14:58:39 -05:00
AnitaYCheng 5f88aef3ca Add new mixin for purchasing gems. Add new areas that will be conditionally set by user subscription status. 2016-01-12 14:58:39 -05:00
Sabe Jones dba620ee7a Merge pull request #6417 from GeorgeSG/reverse-chat-option
Add option to reverse chat order
2016-01-11 12:55:28 -06:00
Sabe Jones 7e8f0d24c5 Merge remote-tracking branch 'origin/pr/6307' into develop
Conflicts:
	common/dist/sprites/habitrpg-shared.css
2016-01-11 13:48:01 -05:00
Sabe Jones 1b7f17cbd2 chore(news): Bailey 2016-01-08 2016-01-08 16:28:49 -05:00
Sabe Jones eadf967c9f Merge pull request #6409 from pnrich/flag-text
add extra text to flagging confirmation dialog and to top of PM inbox -- Fix for issue #4648, parts 3 and 4
2016-01-08 14:05:22 -06:00
Daniel Van Camp 99a694bb10 added EU version of t-shirt 2016-01-06 23:15:36 +01:00
Daniel Van Camp 0362977dbd Merge branch 'develop' into static-page-merch 2016-01-06 22:38:19 +01:00
Sabe Jones adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Sabe Jones cb984d8d22 fix(event): remove NYE card 2016-01-04 18:27:52 -05:00
Sabe Jones cc00602112 fix(event): remove magic potions 2016-01-04 11:56:34 -05:00
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
Georgi Gardev 42d09bd758 Reverse order of chat messages from chat box 2015-12-30 23:47:10 +02:00
Georgi Gardev beaf0b83bb Add option to reverse order of chat messages 2015-12-30 23:47:03 +02: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 c9fdff38f9 Fix for issue #4648, parts 3 and 4 2015-12-28 14:24:48 -05: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
Daniel Van Camp 338cfb3fc9 update logo and image links to be dynamicly added instead with a manual written link 2015-12-14 21:44:32 +01:00
Daniel Van Camp 3c7ddf8df1 Merge branch 'develop' into static-page-merch 2015-12-14 21:27:50 +01: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