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
Georgi Gardev
24e08676db
Add icon for pinned Safari tabs
...
Fixes #6451
Closes #6522
2016-01-14 20:32:51 -06:00
Georgi Gardev
e761315c74
Remove tooltip for 'reverse chat messages' checkbox
...
Fixes #6517
Closes #6525
2016-01-14 20:28:08 -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
14a6d0dabf
feat(quests): January 2016 pet
2016-01-13 17:15:02 -05:00
Alys
fc01104a0d
change habitrpg to habitica for PayPal subscription config
2016-01-14 03:08:16 +10:00
Matteo Pagliazzi
f83b271b30
rever new history preening
2016-01-13 11:07:52 +01:00
Sabe Jones
9887fe58c4
fix(Stripe): zoom out so gryphon is visible
2016-01-12 16:12:44 -05:00
Sabe Jones
81842bbee1
fix(subscription): visual and wording tweaks
2016-01-12 15:29:10 -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
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
AnitaYCheng
313a18971e
Add CSS changes for conditional buy-gem modal
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
Matteo Pagliazzi
5244702e48
perf improvements for challenges history and migration
2016-01-11 18:29:39 +01:00
Matteo Pagliazzi
f55e4f65f9
Merge pull request #6483 from HabitRPG/new-history-preening
...
fixes for new history preening, allow only 1 history entry per day in…
2016-01-09 21:03:18 +01:00
Matteo Pagliazzi
b1a7e44722
fixes for new history preening, allow only 1 history entry per day in challenges tasks
2016-01-09 21:02:40 +01:00
Matteo Pagliazzi
be0fe3eb4f
Merge pull request #6479 from HabitRPG/new-history-preening
...
New history preening
2016-01-09 20:12:33 +01: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
Matteo Pagliazzi
ae852f9a2e
complete preening and enable for challenges too
2016-01-08 17:47:08 +01: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
Blade Barringer
837c27ff4c
Merge pull request #6428 from GeorgeSG/fix-paypal-special-chars
...
Encode special characters when sending to paypal
2016-01-03 19:40:39 -06:00
Blade Barringer
874f319d95
fix: Corrects logic where it was possible to customize avatar
...
with gem purchasable items without purchasing them.
Closes #6427
Closes #6448
lint(common): Add unnecessary quotes to make object look less weird
2016-01-03 10:41:44 -06: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
Georgi Gardev
430bcd2652
Encode special characters when sending to paypal
2015-12-31 02:46:56 +02: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