ea6abbfabc
feat(content): Armoire and BGs 2016-03
2016-03-01 15:59:25 -05:00
91fc6186e5
Merge pull request #6736 from delftswa2016/fix-perks-buygems
...
Fixed perk amounts when buying subscription through gem
2016-02-28 18:32:39 +10:00
bf002a2d1e
chore(news): add bang
2016-02-25 14:06:06 -05:00
86824c5304
fix(news): add byline
2016-02-24 17:25:49 -05:00
ca57fad0b9
feat(time-travel): add Phoenixes
...
Also adds Bailey news for the above and the subscriber set.
2016-02-24 17:23:42 -05:00
db595564b3
fixed perk amounts when buying subscription through gem
...
set SettingsCtrl as ng-controller for modal buy-gems window to show perk
amounts when buying subscriptions through gem button
2016-02-18 23:43:25 +01:00
bafdfc4ed5
chore(news): Bailey 20160217
2016-02-17 20:59:11 -05:00
ffb5cfd46e
Merge pull request #6582 from tylerxo/remove_modal_username
...
Adds user details to the removal modal
2016-02-18 06:39:31 +10:00
884e3573a6
fix(deploy): junk commit for Heroku
2016-02-08 17:25:01 -05:00
e1b13db6e8
feat(quests): pets 201602
...
Also enables the Valentine's Day card for selection in the Market.
2016-02-08 16:20:05 -05:00
d8e9b781c8
feat(content): BGs and Armoire 201602
2016-02-02 16:02:50 -05:00
065238525c
Removing extra class in favor of .lead
2016-02-02 10:22:17 -08:00
0fcdc49adb
chore(event): end Winter Wonderland
2016-02-01 17:01:17 -05:00
ea57808176
remove instructions for Beeminder users to read a warning about deleting completed To-Dos (warning is no longer needed)
2016-01-31 18:25:37 +10:00
91c6ce27c5
feat(event): Habit Birthday 2016
...
Also adds AWS Elastic Beanstalk local config file to .gitignore.
2016-01-28 17:16:01 -05:00
d7782584db
chore(news): Bailey 20160126
2016-01-26 20:31:43 -05:00
ff2ebe46b8
Fixing jade and angular syntax miscues
2016-01-26 07:59:31 -08:00
588fdc6cad
Properly chaining classes in jade
2016-01-26 07:52:35 -08:00
fd157785f4
Adding text-center to container rather than individual elements
2016-01-25 17:42:50 -08:00
77cfc99b59
Adding user details to the removal modal
2016-01-25 17:37:18 -08:00
f872547264
chore(news): Bailey 2016-01-20
2016-01-20 16:32:12 -05:00
016b080836
Merge branch 'anowlcalledjosh/add-task-fix' into develop
2016-01-20 14:27:21 -05:00
af53285e01
Merge branch 'proarunas/fix-css-bugs' into develop
2016-01-20 14:17:39 -05:00
77342e5790
Fix 'add task' button jumping around
2016-01-19 20:56:06 +00:00
95ee19b4ca
Merge branch 'taldin/faq-wiki-links' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-19 13:50:35 -05:00
c6b4b24052
Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
...
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
23720e0a43
style(subscription): more tweaks
2016-01-15 14:10:02 -05:00
3b3c1fead7
Moved the Habitica Wiki link down to the bottom
...
Per Lemoness' request.
2016-01-15 09:48:16 -08:00
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
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
b6b2c25358
style(modal): text and visual tweaks for Gems
2016-01-14 15:58:14 -05:00
14a6d0dabf
feat(quests): January 2016 pet
2016-01-13 17:15:02 -05:00
2db1ef0f7a
style(subscriptions): Gem layout feedback
2016-01-12 15:00:07 -05:00
8bc78af5ae
Added specificity to CSS, removed exxtra line
2016-01-12 15:00:07 -05:00
6a72027d8b
Add subscription conditionals for buying or purchasing gems
2016-01-12 14:58:39 -05:00
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
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
fd81f70ffa
Adjusted for generic translation
...
Per Lady Alys's suggestion.
2016-01-09 23:59:05 -08:00
8cd34e49bd
Removed extra scrollbars at medium width. Cleared floating for todo tab in medium width.
2016-01-09 18:47:04 +02:00
1b7f17cbd2
chore(news): Bailey 2016-01-08
2016-01-08 16:28:49 -05:00
0362977dbd
Merge branch 'develop' into static-page-merch
2016-01-06 22:38:19 +01:00
adfa248dd0
feat(content): backgrounds and Armoire 2016-01
2016-01-06 15:11:20 -05:00
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
23aaf78167
revert change to Bailey about Party Hats now that the code behaviour has changed
2016-01-01 16:06:52 +10:00
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
02f4a84146
fix(news): Winter Flame not Penguin
2015-12-30 18:38:00 -05:00
6c3e8e2081
feat(event): more NYE
2015-12-30 16:58:57 -05:00
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
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
363ef5e091
fix: Remove stray {{ characters
2015-12-26 19:05:12 -06:00
Sabe Jones