 Matteo Pagliazzi
|
4e5c4e9953
|
add missing test file
|
2016-01-16 16:18:29 +01:00 |
|
|
Matteo Pagliazzi
|
f447af19ae
|
add tests for getting challenge members and fix a lot of bugs
|
2016-01-16 16:18:06 +01:00 |
|
|
Matteo Pagliazzi
|
d7d63ad229
|
populate group.leader
|
2016-01-16 15:10:18 +01:00 |
|
|
Matteo Pagliazzi
|
96c523493a
|
fix missing semicolon
|
2016-01-15 22:08:51 +01:00 |
|
|
Matteo Pagliazzi
|
ad41037f59
|
finish tests for members controller
|
2016-01-15 21:47:20 +01:00 |
|
|
Matteo Pagliazzi
|
2ee75c1ad3
|
add tests for getMember
|
2016-01-15 19:44:45 +01:00 |
|
|
Matteo Pagliazzi
|
b0caf71641
|
fix several busg with tasks and challenges
|
2016-01-15 18:54:28 +01:00 |
|
|
Matteo Pagliazzi
|
3eb9d4b098
|
members controller: support challenges
|
2016-01-15 15:30:13 +01:00 |
|
|
Matteo Pagliazzi
|
50a85337a7
|
better access control for challenges
|
2016-01-15 15:29:50 +01:00 |
|
|
Matteo Pagliazzi
|
e0b10d44ca
|
Merge branch 'api-v3-groups' into api-v3-members
|
2016-01-15 11:22:11 +01: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 |
|
|
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 |
|
|
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 |
|