c27f98075c
Merge branch 'api-v3-groups' into api-v3-members
2016-01-17 11:24:10 +01:00
38cdf07a4d
Merge branch 'api-v3' into api-v3-groups
2016-01-16 21:56:55 -06:00
5de2503039
Merge branch 'develop' into api-v3
2016-01-16 21:54:13 -06:00
96f6bbfb0c
tests(api): Add sync method to api objects
2016-01-16 21:50:54 -06:00
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
f8f591e521
do not use wait inside for loop
2016-01-16 16:37:21 +01:00
a59da8607b
add tests for getting invites to a group
2016-01-16 16:32:46 +01:00
4e5c4e9953
add missing test file
2016-01-16 16:18:29 +01:00
f447af19ae
add tests for getting challenge members and fix a lot of bugs
2016-01-16 16:18:06 +01:00
d7d63ad229
populate group.leader
2016-01-16 15:10:18 +01:00
28fc6dd4bd
tests: Convert helpers to use async/await
2016-01-15 20:36:54 -06:00
96c523493a
fix missing semicolon
2016-01-15 22:08:51 +01:00
ad41037f59
finish tests for members controller
2016-01-15 21:47:20 +01:00
2ee75c1ad3
add tests for getMember
2016-01-15 19:44:45 +01:00
b0caf71641
fix several busg with tasks and challenges
2016-01-15 18:54:28 +01:00
3eb9d4b098
members controller: support challenges
2016-01-15 15:30:13 +01:00
50a85337a7
better access control for challenges
2016-01-15 15:29:50 +01:00
e0b10d44ca
Merge branch 'api-v3-groups' into api-v3-members
2016-01-15 11:22:11 +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
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
Matteo Pagliazzi