Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,207 Commits 64 Branches 1,256 Tags
3c784e869a35db04513af3f91c99bf022b0f4eec
Commit Graph

13207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Piousbox 3c784e869a shared-code-percent 2016-04-09 21:13:16 +00:00
Matteo Pagliazzi f4d2184f34 Merge pull request #7010 from HabitRPG/api-v3-adapt-v2 
[API v3] Adapt v2
 2016-04-09 17:42:44 +02:00
Matteo Pagliazzi 6f1dde4beb v3 adapt v2: port challenge.update 2016-04-09 17:25:41 +02:00
Matteo Pagliazzi aa8fb81b26 v3 adapt v2: port res.respond, challenge.getMember and challenge.csv 2016-04-09 17:16:00 +02:00
Matteo Pagliazzi 6b2d1a1416 v3 adapt v2: adapt common ops 2016-04-09 16:45:43 +02:00
Blade Barringer 231cfc176a Merge branch 'develop' into api-v3 2016-04-09 09:12:53 -05:00
Matteo Pagliazzi 910ea836ba Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-09 15:31:09 +02:00
Matteo Pagliazzi 06db7e6353 v3 adapt v2: port leave, join and unlink for challenges 2016-04-09 15:29:37 +02:00
Matteo Pagliazzi 81fa689a11 Merge pull request #7042 from TheHollidayInn/api-v3-ops-reroll 
Ported reroll. Added unit tests. Added reroll route. Added integration tests
 2016-04-09 15:14:04 +02:00
Blade Barringer db62d1add0 fix: correct coupon generation code 2016-04-09 08:03:32 -05:00
Blade Barringer fd1f42af24 Merge pull request #7047 from HabitRPG/merge_in_develop 
[v3] Merge in develop
 2016-04-08 22:19:53 -05:00
Blade Barringer 1ab78f1c9a refactor: Port v2 flag report change to v3 2016-04-08 21:49:16 -05:00
Blade Barringer 60f99a29ed Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-04-08 21:31:53 -05:00
Blade Barringer 8a42a3a51e Merge branch 'develop' into api-v3 2016-04-08 21:31:41 -05:00
Blade Barringer 1bc1968f3a chore: Upgrade winston dependency and remove unused modules 2016-04-08 17:35:03 -05:00
Blade Barringer 3a63896e40 chore: Upgrade dependencies to v3 versions 2016-04-08 17:35:03 -05:00
Blade Barringer 3250d9d064 chore: Remove unused qs dependency 2016-04-08 17:35:03 -05:00
Blade Barringer 46681d9a1a chore: Update nodemailer to v1 2016-04-08 17:35:03 -05:00
Blade Barringer e6b5a6820f Merge pull request #7044 from HabitRPG/flag_email_refactor 
refactor: Simplify flag_report_email load
 2016-04-08 17:31:13 -05:00
Blade Barringer 2bbae8c5f5 refactor: Simplify flag_report_email load 2016-04-08 17:14:14 -05:00
Sabe Jones b7d801a603 fix(news): typo 2016-04-08 16:17:51 -05:00
Keith Holliday 1685b7285f Ported reroll. Added unit tests. Added reroll route. Added integration tests 2016-04-08 15:56:11 -05:00
Ubuntu 7118e68cf0 chore(news): Beguilement Strike Bailey 2016-04-08 19:06:09 +00:00
Matteo Pagliazzi 83fa30fd0a v3 adapt v2: port challenges closing and fix create 2016-04-08 18:45:50 +02:00
Matteo Pagliazzi 70fd869934 Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-08 12:03:50 +02:00
Matteo Pagliazzi 276cbc58bb v3: fix cron middleware, remove unused code from shared 2016-04-08 11:56:51 +02:00
Matteo Pagliazzi 116839ca81 Merge pull request #7018 from piousbox/shared-code-webhooks 
Shared code webhooks
 2016-04-08 11:04:57 +02:00
Victor Piousbox 9704c47293 Merge branch 'api-v3' into shared-code-webhooks 2016-04-07 21:23:38 +00:00
Victor Piousbox 4c0f9ed1c8 resolving conflicts 2016-04-07 21:23:16 +00:00
Matteo Pagliazzi 4d28eea6e2 Merge pull request #7037 from TheHollidayInn/api-v3-ops-rebirth 
Ported rebirth. Add unit tests. Added rebirth route. Added integration tests
 2016-04-07 23:18:15 +02:00
Keith Holliday fec9ce3dbe Ported rebirth. Add unit tests. Added rebirth route. Added integration tests 2016-04-07 15:02:55 -05:00
Matteo Pagliazzi 5a259e7a25 v3 adapt v2: port quests 2016-04-07 16:11:17 +02:00
Matteo Pagliazzi 2d3fbe9f13 v3 adapt v2: lint client only shared ops and enable members integration tests 2016-04-07 11:54:36 +02:00
Matteo Pagliazzi d49847688e v2 adapt to v3: port challenges create, get and list 2016-04-07 11:22:10 +02:00
Matteo Pagliazzi 12255181d8 Merge branch 'TheHollidayInn-api-v3-ops-revive' into api-v3 2016-04-06 23:24:27 +02:00
Matteo Pagliazzi 81d665513c Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive 2016-04-06 23:24:14 +02:00
Matteo Pagliazzi cc4ade2e6d Merge pull request #7029 from TheHollidayInn/api-v3-ops-unlock 
Ported unlock. Add unit tests. Create unlock route. Add integration tests
 2016-04-06 23:08:17 +02:00
Keith Holliday 621bf9609e Ported revive. Added unit tests. Add revive route. Added integration tests 2016-04-06 15:59:42 -05:00
Keith Holliday 2bd710a882 Ported unlock. Add unit tests. Create unlock route. Add integration tests 2016-04-06 15:53:32 -05:00
Matteo Pagliazzi 884493f165 fix(delete tags): correctly import Tasks module 2016-04-06 19:41:38 +02:00
Matteo Pagliazzi b431b02012 v3 adapt v2: port tags, cast, cron, deletUser and removeMember. Fix a few bugs in v3 2016-04-06 19:28:43 +02:00
Matteo Pagliazzi a72c6c782d Merge pull request #7026 from TheHollidayInn/api-v3-ops-sell 
Ported sell function. Add unit tests. Create sell route. Add integration tests
 2016-04-06 18:42:06 +02:00
Keith Holliday 05b41bb41c Ported sell function. Add unit tests. Create sell route. Add integration tests 2016-04-06 08:27:18 -05:00
Blade Barringer 7e9163a17f chore: Remove apdex check from new relic monitoring 2016-04-05 20:08:44 -05:00
Blade Barringer 74dace9b5a chore: Re-enable New Relic 
closes #7011
 2016-04-05 20:08:31 -05:00
Blade Barringer ae14d405cb fix(css): Scope textarea z-index to just task boxes 2016-04-05 20:07:11 -05:00
Sabe Jones 1f6eef0082 Sabrecat/armoire 201604 
* WIP(content): add sprites

* feat(content): Armoire and Backgrounds 2016-04
 2016-04-05 15:30:01 -05:00
Blade Barringer 7425af4fb4 Merge pull request #7013 from Hus274/develop 
Splitting party and boss damage notifications into two code blocks.
 2016-04-05 09:01:36 -05:00
Blade Barringer 7d17921621 Merge pull request #7020 from MathWhiz/patch-2 
fix: Allow task notes textarea to rest above other elements when expanded
 2016-04-05 08:56:39 -05:00
Matteo Pagliazzi 08239345b5 v3 adapt v2: port leave, join and invite for groups controller 2016-04-05 13:03:20 +02:00