Matteo Pagliazzi
e0b10d44ca
Merge branch 'api-v3-groups' into api-v3-members
2016-01-15 11:22:11 +01: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
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
Blade Barringer
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
Blade Barringer
d02c3d321e
refactor: Remove compiled spritesheet from source control
2016-01-14 18:03:14 -06:00
Blade Barringer
2a6241d549
Merge pull request #6520 from HabitRPG/api-v3-groups-create-and-populate
...
Add createAndPopulate group helper for v3
2016-01-14 17:26:35 -06:00
Sabe Jones
b6b2c25358
style(modal): text and visual tweaks for Gems
2016-01-14 15:58:14 -05:00
Matteo Pagliazzi
7d5a7503cb
fix access to user.tasksOrder
2016-01-14 20:55:13 +01:00
Matteo Pagliazzi
5206469e90
add unlinkTask route and refactor user.unlink (now user.unlinkChallengesTasks)
2016-01-14 19:46:43 +01:00
Blade Barringer
5ff54fa332
Merge branch 'api-v3-groups' into api-v3-groups-create-and-populate
2016-01-14 12:23:52 -06:00
Blade Barringer
0f5cf318d9
fix: Update member objects with guild info in test helper
2016-01-14 12:22:56 -06:00
Matteo Pagliazzi
01458574f9
Merge branch 'api-v3-challenges-tasks' into api-v3-groups
2016-01-14 18:27:22 +01:00
Matteo Pagliazzi
2b9aa11598
Merge branch 'api-v3-groups' into api-v3-challenges-tasks
2016-01-14 18:25:59 +01:00
Blade Barringer
42530b9a5f
refactor(tests): Adjust tests to use createAndPopulateGroup
2016-01-14 08:56:16 -06:00
Blade Barringer
2cc02ee1f1
refactor(test helper): Fix api v3 helper to be specific for v3
2016-01-14 08:55:44 -06:00
Sabe Jones
b0a9425cee
Merge pull request #6512 from HabitRPG/sabrecat/pets-201601
...
feat(quests): January 2016 pet
2016-01-13 17:01:57 -06:00
Sabe Jones
14a6d0dabf
feat(quests): January 2016 pet
2016-01-13 17:15:02 -05:00
Matteo Pagliazzi
52eaecf653
Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups
2016-01-13 23:07:34 +01:00
Matteo Pagliazzi
9a908785c1
new history preening, save tasks after cron
2016-01-13 23:07:08 +01:00
Blade Barringer
1f4e58e5cc
tests(api): Port integration helper to v3 version for groups tests
2016-01-13 12:39:23 -06:00
Blade Barringer
799b3780b1
Merge branch 'api-v3' into api-v3-groups
2016-01-13 12:32:48 -06:00
Blade Barringer
b68861681c
tests(integration): Create separate helper for api integration tests
2016-01-13 12:32:36 -06:00
Matteo Pagliazzi
6f6d4edcec
Merge branch 'api-v3-groups' into api-v3-members
2016-01-13 18:41:53 +01:00
Matteo Pagliazzi
4afad11067
Merge branch 'api-v3' into api-v3-groups
2016-01-13 18:41:27 +01:00
Matteo Pagliazzi
771bc0c5b5
put back acceptablePUTPaths variable deleted in merge
2016-01-13 18:41:09 +01:00
Matteo Pagliazzi
e2edb974d7
Merge branch 'api-v3' into api-v3-groups
2016-01-13 18:40:04 +01:00
Matteo Pagliazzi
914b2eb008
Merge branch 'develop' into api-v3
2016-01-13 18:39:44 +01:00
Matteo Pagliazzi
6088b6da42
fix edge case where res.respond would not work, misc comments
2016-01-13 18:35:29 +01:00
Matteo Pagliazzi
7c15472fab
wip on members controllers
2016-01-13 18:29:02 +01: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
Blade Barringer
7a8321ec36
Merge branch 'api-v3' into api-v3-groups
2016-01-12 18:10:48 -06:00
Blade Barringer
c9d378ab35
tests(api): bring in await format tests
2016-01-12 18:10:10 -06:00
Blade Barringer
0c30b56bb0
Merge pull request #6498 from TheHollidayInn/api-v3-groups-update
...
Added initial group update tests
2016-01-12 18:03:38 -06:00
Blade Barringer
a3fd838677
tests(api): Fix PUT /task test to be valid
2016-01-12 18:01:47 -06:00
Blade Barringer
ae67efd7ce
Merge branch 'GeorgeSG-api-v3-groups' into api-v3-groups
2016-01-12 17:47:21 -06:00
Blade Barringer
336d8c9916
tests(api): Clean up misc test styles
2016-01-12 17:36:14 -06:00
Blade Barringer
fdfc8fb2f5
Merge branch 'api-v3-groups' into GeorgeSG-api-v3-groups
2016-01-12 17:20:55 -06:00
Sabe Jones
9887fe58c4
fix(Stripe): zoom out so gryphon is visible
2016-01-12 16:12:44 -05:00
Sabe Jones
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
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
AnitaYCheng
2a8eb9f476
Added translation strings for conditional buy-gems modal
2016-01-12 14:58:39 -05:00
