87d4c68bea
lint: Correct linting errors
2016-01-16 19:13:33 -06:00
1d7c30a06d
Fixes for the profile modal
...
This commit fixes the following:
1. Unintented scrollbar was being created on the .modal container element
2. 15px gap between the footer and scrollable content, creating an odd visual lapse
3. Modal was too wide between 768px and 900px, bleeding off the page.
2016-01-16 16:14:20 -08:00
91ffe5c402
tests(api): Reorganize integration helper for v2
2016-01-16 17:28:36 -06:00
ef5064f351
Move generators to own file
2016-01-16 17:23:30 -06:00
e98dc1405b
Fix rendering of front page news icons
...
Rendering was 'pixelated', is now 'auto'.
2016-01-16 22:43:29 +00:00
c85f994f4c
Make .img-rendering-auto apply to descendants
2016-01-16 22:39:40 +00:00
6287ae6776
tests(api): Outsource mongo updates to mongo module in api helper
2016-01-16 14:33:53 -06:00
80224adafa
tests: Extract mongo functions into separate file
2016-01-16 14:12:26 -06:00
54159c069d
tests: Move api translation checkout out into separate file
2016-01-16 14:09:20 -06:00
e9f618da5e
tests: Extract api objects to separate files
2016-01-16 14:06:47 -06:00
29415441f7
tests: Create base class that ApiUser and ApiGroup inherit from
2016-01-16 09:48:51 -06:00
9f2a8c03b2
tests: Remove references to different api routes in helper
2016-01-16 09:45:02 -06:00
4d1daf1c41
Uses a const instead of a variable
2016-01-16 11:11:48 +01:00
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
28fc6dd4bd
tests: Convert helpers to use async/await
2016-01-15 20:36:54 -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
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
b6b2c25358
style(modal): text and visual tweaks for Gems
2016-01-14 15:58:14 -05: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
37cabedecb
Use nvm to install node 4 to vagrant env
2016-01-11 22:29:23 +02: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
1a1823bd43
fixup
2016-01-11 05:17:20 +00:00
67f184c0f4
docker maintenance
...
- added docker-compose.yml for quick one-command spinup
- added docker-compose.dev.yml to override /habitrpg mount
- modified Dockerfile to accept /habitrpg mount
2016-01-11 05:04:22 +00:00
Blade Barringer