 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
|
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 |
|
|
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 |
|
|
Keith Holliday
|
e4fd37f3d0
|
Cleaned up code style and abstracted variables that are reused.
|
2016-01-12 13:08:13 -06:00 |
|
|
Matteo Pagliazzi
|
45aacc1e6f
|
challenge.group -> challenge.groupId
|
2016-01-12 19:43:41 +01:00 |
|
|
Keith Holliday
|
da02f8ca0f
|
Removed pending status on test
|
2016-01-12 11:48:07 -06:00 |
|
|
Keith Holliday
|
99217e865c
|
Added initial group update tests
|
2016-01-12 11:44:44 -06:00 |
|
|
Georgi Gardev
|
ac6a0276ab
|
Refactor Tasks tests to use await syntax
|
2016-01-12 19:11:59 +02:00 |
|
|
Georgi Gardev
|
2e3bee08d8
|
Refactor User tests to use await expect instead of return expect
|
2016-01-12 19:00:16 +02:00 |
|
|
Georgi Gardev
|
eaddf5a393
|
Refactor notFound test to use await expect syntax
|
2016-01-12 18:59:53 +02:00 |
|
|
Georgi Gardev
|
98b0db749b
|
Refactor User tests to use await syntax
|
2016-01-12 18:02:09 +02:00 |
|
|
Matteo Pagliazzi
|
baf0179eb7
|
Merge branch 'TheHollidayInn-api-v3-groups-invites' into api-v3-groups
|
2016-01-12 15:48:59 +01:00 |
|
|
Matteo Pagliazzi
|
b102ff7cae
|
Merge branch 'api-v3-groups-invites' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-groups-invites
|
2016-01-12 15:48:47 +01:00 |
|
|
Keith Holliday
|
1b395b39f8
|
Added invite limit and tests for when multiple users with an error
|
2016-01-12 08:43:11 -06:00 |
|
|
Keith Holliday
|
9141598a34
|
Updated invite route and function for new standards, and added tests.
|
2016-01-12 08:43:11 -06:00 |
|
|
Blade Barringer
|
36cd9e9430
|
tests(api): Increase test coverage for group post tests
|
2016-01-12 08:14:50 -06:00 |
|
|
Blade Barringer
|
88755e69ae
|
tests(api): Simplify tests
|
2016-01-12 08:14:12 -06:00 |
|
|
Georgi Gardev
|
ddd0709b12
|
Refactor Tags tests to use await syntax
|
2016-01-12 16:12:35 +02:00 |
|
|
Blade Barringer
|
fffa95ca09
|
refactor: Test against party not being private, instead of public
|
2016-01-12 08:11:19 -06:00 |
|
|
Sabe Jones
|
dba620ee7a
|
Merge pull request #6417 from GeorgeSG/reverse-chat-option
Add option to reverse chat order
|
2016-01-11 12:55:28 -06:00 |
|
|
Sabe Jones
|
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 |
|
|
Keith Holliday
|
ffbd4696e3
|
Converted posts tests to async/await syntax and updated tests
|
2016-01-11 12:35:46 -06:00 |
|
|
Matteo Pagliazzi
|
9e61137e8e
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
|
2016-01-11 18:30:10 +01:00 |
|
|
Matteo Pagliazzi
|
5244702e48
|
perf improvements for challenges history and migration
|
2016-01-11 18:29:39 +01:00 |
|