a716ce3fa7
Adds a variable to manage user count
2016-01-16 11:11:48 +01:00
5931ddf2ba
Decrease margin for the new logo to fit in social pages
2016-01-16 11:11:48 +01:00
ffe1dd6c6a
Upgrade amount of users where I missed and add Discover logo on social pages
2016-01-16 11:11:48 +01:00
a9f10380b9
Upgrades amount of users on static page
2016-01-16 11:11:48 +01:00
de3d4ae8e7
Adds Discover magazine logo
2016-01-16 11:11:48 +01: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
24e08676db
Add icon for pinned Safari tabs
...
Fixes #6451
Closes #6522
2016-01-14 20:32:51 -06:00
e761315c74
Remove tooltip for 'reverse chat messages' checkbox
...
Fixes #6517
Closes #6525
2016-01-14 20:28:08 -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
c084b6b7cd
Merge pull request #6526 from HabitRPG/no_sprite_sheets_css
...
refactor: Remove compiled spritesheet from source control
2016-01-14 18:10:31 -06:00
d02c3d321e
refactor: Remove compiled spritesheet from source control
2016-01-14 18:03:14 -06:00
b0a9425cee
Merge pull request #6512 from HabitRPG/sabrecat/pets-201601
...
feat(quests): January 2016 pet
2016-01-13 17:01:57 -06:00
14a6d0dabf
feat(quests): January 2016 pet
2016-01-13 17:15:02 -05:00
fc01104a0d
change habitrpg to habitica for PayPal subscription config
2016-01-14 03:08:16 +10:00
f83b271b30
rever new history preening
2016-01-13 11:07:52 +01:00
9887fe58c4
fix(Stripe): zoom out so gryphon is visible
2016-01-12 16:12:44 -05:00
6247d5e365
Merge pull request #6346 from HabitRPG/sabrecat/conditional-buy-gem
...
(WIP) Conditional Buy Gem modal, cont'd
2016-01-12 14:47:31 -06:00
81842bbee1
fix(subscription): visual and wording tweaks
2016-01-12 15:29:10 -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
bf6ebd88f6
Modifications to settings mixin and misc last changes.
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
313a18971e
Add CSS changes for conditional buy-gem modal
2016-01-12 14:58:39 -05:00
2a8eb9f476
Added translation strings for conditional buy-gems modal
2016-01-12 14:58:39 -05:00
dba620ee7a
Merge pull request #6417 from GeorgeSG/reverse-chat-option
...
Add option to reverse chat order
2016-01-11 12:55:28 -06: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
9e61137e8e
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2016-01-11 18:30:10 +01:00
5244702e48
perf improvements for challenges history and migration
2016-01-11 18:29:39 +01:00
0d47f8d116
allow purchase of Find the Cub evilsanta2 quest scroll before completing previous quest - fixes https://github.com/HabitRPG/habitrpg/issues/6405
2016-01-12 02:58:33 +10:00
193e89a79e
fix index when marking task as modified after history preening
2016-01-10 15:57:22 +01:00
c5ad006007
chore(i18n): update locales
2016-01-09 23:46:53 -06:00
980bec9be3
Merge pull request #6456 from querry43/use-example-dot-com
...
use example.com in the example json so as not to spam legit servers
2016-01-09 23:38:38 -06:00
502ba27b47
chore(sprites): Compile sprites
2016-01-09 23:32:17 -06:00
b26d3bef40
replaced collars
2016-01-09 23:29:54 -06:00
1d0b05a6df
fix typo in history preening
2016-01-09 21:17:17 +01:00
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
b1a7e44722
fixes for new history preening, allow only 1 history entry per day in challenges tasks
2016-01-09 21:02:40 +01:00
be0fe3eb4f
Merge pull request #6479 from HabitRPG/new-history-preening
...
New history preening
2016-01-09 20:12:33 +01:00
2fff34cff4
finalize tests
2016-01-09 19:47:18 +01:00
58a92f626d
Merge pull request #6464 from HabitRPG/fix_stat_allocation_bug
...
fix: Corrects stat allocation bug where it was possible to receive more points than 100
2016-01-09 23:00:06 +10:00
dec08955ac
fix tests
2016-01-08 23:02:18 +01:00
1b7f17cbd2
chore(news): Bailey 2016-01-08
2016-01-08 16:28:49 -05:00
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
82651cf1ed
initial tests
2016-01-08 18:58:54 +01:00
ae852f9a2e
complete preening and enable for challenges too
2016-01-08 17:47:08 +01:00
243b839392
wip: new history preening, delineate process and differentiate between subscribers and non
2016-01-07 20:07:13 +01:00
fdd5ab724a
begin implementing new preenUserHistory method: port current code to es6 and setup tests
2016-01-07 18:44:25 +01:00
44dd6674d1
Merge branch 'TayHobbs-develop' into develop
2016-01-06 20:52:53 -06:00
8a19a84f3f
lint(tests): Add e2e tests to linter
2016-01-06 20:52:24 -06:00
Sighne