Tyler Smith
fd157785f4
Adding text-center to container rather than individual elements
2016-01-25 17:42:50 -08:00
Tyler Smith
77cfc99b59
Adding user details to the removal modal
2016-01-25 17:37:18 -08:00
Sabe Jones
f872547264
chore(news): Bailey 2016-01-20
2016-01-20 16:32:12 -05:00
Sabe Jones
016b080836
Merge branch 'anowlcalledjosh/add-task-fix' into develop
2016-01-20 14:27:21 -05:00
Sabe Jones
af53285e01
Merge branch 'proarunas/fix-css-bugs' into develop
2016-01-20 14:17:39 -05:00
Josh Holland
77342e5790
Fix 'add task' button jumping around
2016-01-19 20:56:06 +00:00
Sabe Jones
95ee19b4ca
Merge branch 'taldin/faq-wiki-links' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-19 13:50:35 -05:00
Sabe Jones
c6b4b24052
Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
...
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
Sabe Jones
23720e0a43
style(subscription): more tweaks
2016-01-15 14:10:02 -05:00
Taldin
3b3c1fead7
Moved the Habitica Wiki link down to the bottom
...
Per Lemoness' request.
2016-01-15 09:48:16 -08:00
Luveluen
5315cc9055
Update character.json to separate optOut into two translation strings
...
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.
Fixes #6511
Closes #6518
2016-01-14 20:40:07 -06:00
Josh Holland
a0b264f686
Align progress and help icons on to-dos column
...
Fixes #6474
As per #6474 , progress and help icons on the to-dos column were
previously misaligned due to inline styles. This commit adds the same
inline styles to both icons.
Move inline styles on task column icons to a class
This uses existing classes instead of adding a new one, because if new
icons are added in the future this should catch them without any extra
classes having to be added to the new icons.
In addition, this will catch any new .option-box added to .task-column
in the future; this may be good or bad, but is easy to fix in any case.
2016-01-14 20:24:09 -06:00
Sabe Jones
b6b2c25358
style(modal): text and visual tweaks for Gems
2016-01-14 15:58:14 -05:00
Sabe Jones
14a6d0dabf
feat(quests): January 2016 pet
2016-01-13 17:15:02 -05:00
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
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
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
Taldin
fd81f70ffa
Adjusted for generic translation
...
Per Lady Alys's suggestion.
2016-01-09 23:59:05 -08:00
pittaxx
8cd34e49bd
Removed extra scrollbars at medium width. Cleared floating for todo tab in medium width.
2016-01-09 18:47:04 +02:00
Sabe Jones
1b7f17cbd2
chore(news): Bailey 2016-01-08
2016-01-08 16:28:49 -05: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
Taldin
07fc30a131
update help menu and FAQ to jump to Wikia
...
The Help > FAQ option no longer jumps to the Wiki. Added a help menu
item to fix that. I also added a link to the Wiki FAQ at the bottom of
the FAQ.
2016-01-05 12:19:18 -08: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
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
Blade Barringer
363ef5e091
fix: Remove stray {{ characters
2015-12-26 19:05:12 -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
fe1de12494
feat(pets): December quest
2015-12-14 16:28:39 -05:00
Daniel Van Camp
3c7ddf8df1
Merge branch 'develop' into static-page-merch
2015-12-14 21:27:50 +01: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
Sabe Jones
f6cdf5d257
chore(news): Android Bailey
2015-12-10 17:00:48 -05: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
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
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
Daniel Van Camp
6a535277a7
updated tab indent
...
added link in footer
renamed Merchandise to Merch (looks better in the footer)
moved css to static.styl
2015-11-27 23:25:56 +01:00
