965c5dbaa7
Merge branch 'api-v3' into api-v3-groups
2016-01-16 19:46:47 -06:00
a44cf5e0fc
lint: Fix linting erros in test helpers
2016-01-16 19:27:03 -06:00
5dd2dcd6d8
Merge branch 'improve_tests' into api-v3
2016-01-16 19:24:39 -06:00
87d4c68bea
lint: Correct linting errors
2016-01-16 19:13:33 -06:00
ec9d0fd278
tests: Set up placeholder file for api test helpers
2016-01-16 18:13:11 -06:00
07f08de989
Merge branch 'improve_tests' into api-v3
2016-01-16 18:12:36 -06: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
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
28fc6dd4bd
tests: Convert helpers to use async/await
2016-01-15 20:36:54 -06: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
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
7d5a7503cb
fix access to user.tasksOrder
2016-01-14 20:55:13 +01:00
5206469e90
add unlinkTask route and refactor user.unlink (now user.unlinkChallengesTasks)
2016-01-14 19:46:43 +01:00
5ff54fa332
Merge branch 'api-v3-groups' into api-v3-groups-create-and-populate
2016-01-14 12:23:52 -06:00
0f5cf318d9
fix: Update member objects with guild info in test helper
2016-01-14 12:22:56 -06:00
01458574f9
Merge branch 'api-v3-challenges-tasks' into api-v3-groups
2016-01-14 18:27:22 +01:00
2b9aa11598
Merge branch 'api-v3-groups' into api-v3-challenges-tasks
2016-01-14 18:25:59 +01:00
42530b9a5f
refactor(tests): Adjust tests to use createAndPopulateGroup
2016-01-14 08:56:16 -06:00
2cc02ee1f1
refactor(test helper): Fix api v3 helper to be specific for v3
2016-01-14 08:55:44 -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
52eaecf653
Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups
2016-01-13 23:07:34 +01:00
9a908785c1
new history preening, save tasks after cron
2016-01-13 23:07:08 +01:00
1f4e58e5cc
tests(api): Port integration helper to v3 version for groups tests
2016-01-13 12:39:23 -06:00
799b3780b1
Merge branch 'api-v3' into api-v3-groups
2016-01-13 12:32:48 -06:00
b68861681c
tests(integration): Create separate helper for api integration tests
2016-01-13 12:32:36 -06:00
4afad11067
Merge branch 'api-v3' into api-v3-groups
2016-01-13 18:41:27 +01:00
771bc0c5b5
put back acceptablePUTPaths variable deleted in merge
2016-01-13 18:41:09 +01:00
e2edb974d7
Merge branch 'api-v3' into api-v3-groups
2016-01-13 18:40:04 +01:00
914b2eb008
Merge branch 'develop' into api-v3
2016-01-13 18:39:44 +01:00
6088b6da42
fix edge case where res.respond would not work, misc comments
2016-01-13 18:35:29 +01: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
7a8321ec36
Merge branch 'api-v3' into api-v3-groups
2016-01-12 18:10:48 -06:00
c9d378ab35
tests(api): bring in await format tests
2016-01-12 18:10:10 -06:00
0c30b56bb0
Merge pull request #6498 from TheHollidayInn/api-v3-groups-update
...
Added initial group update tests
2016-01-12 18:03:38 -06:00
a3fd838677
tests(api): Fix PUT /task test to be valid
2016-01-12 18:01:47 -06:00
ae67efd7ce
Merge branch 'GeorgeSG-api-v3-groups' into api-v3-groups
2016-01-12 17:47:21 -06:00
336d8c9916
tests(api): Clean up misc test styles
2016-01-12 17:36:14 -06:00
Blade Barringer