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

13996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer b1c3b8e7e7 chore: Update res.json(code, json) to res.status(code).json(json) 2016-03-28 10:24:00 -05:00
Blade Barringer cf8153fd93 chore: Update res.send(code) to res.sendStatus(code) 2016-03-28 10:24:00 -05:00
Blade Barringer 2477507b2e chore: Set extended option for bodyParser 
See
https://github.com/expressjs/body-parser/blob/3f1b02247702c2966d33ee73610a98d54cf32fe8/lib/types/urlencoded.js#L41-L44
 2016-03-28 10:24:00 -05:00
Blade Barringer 41b961004a chore: upgrade express to version 4 2016-03-28 10:24:00 -05:00
Blade Barringer 6552f04b0c chore(i18n): update locales 2016-03-28 09:58:32 -05:00
Matteo Pagliazzi 1112d93b15 Merge pull request #6907 from HabitRPG/sabrecat/server-party-cheevos 
[v3] Add Party Up / Party On achievements to server in V3
 2016-03-27 20:53:15 +02:00
Sabe Jones 861a32f72a feat(achievements): move party cheevos to server 2016-03-27 14:51:39 -04:00
Matteo Pagliazzi c4bbfcf2f3 Merge pull request #6968 from HabitRPG/api-v3-buy-list 
v3: port getBuyList and shared.updateStore
 2016-03-26 16:39:52 +01:00
Matteo Pagliazzi 228ce7ca0d Merge pull request #6960 from HabitRPG/api-v3-content 
Api v3 Get Content
 2016-03-26 16:38:47 +01:00
Matteo Pagliazzi 67d49bc9fc v3: port getContent route caching responses to disk 2016-03-26 16:29:22 +01:00
Matteo Pagliazzi 3002c9b7fd v3: port getBuyList and shared.updateStore 2016-03-26 16:25:15 +01:00
Matteo Pagliazzi 93b80352c4 Merge branch 'piousbox-api-v3-get-user-anonymized' into api-v3 2016-03-25 16:05:01 +01:00
Matteo Pagliazzi 5ee33b08b9 Merge branch 'api-v3-get-user-anonymized' of https://github.com/piousbox/habitrpg into piousbox-api-v3-get-user-anonymized 2016-03-25 16:04:48 +01:00
Matteo Pagliazzi d89d1e50dd Merge branch 'develop' into api-v3 2016-03-25 15:58:04 +01:00
Matteo Pagliazzi 53b2743d94 Merge branch 'TheHollidayInn-api-v3-send-private-message' into api-v3 2016-03-25 15:56:37 +01:00
Matteo Pagliazzi 15e8f881fe Merge branch 'api-v3-send-private-message' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-send-private-message 2016-03-25 15:56:28 +01:00
Matteo Pagliazzi 55b0642523 Merge pull request #6934 from TheHollidayInn/api-v3-user-delete 
[v3] Ported user delete route and added initial tests
 2016-03-25 15:51:54 +01:00
Keith Holliday d7b6e0b760 Ported refPush and added tests 2016-03-25 08:33:55 -05:00
Keith Holliday 19a63e8128 Ported sendGift route and renamed it to transferGems. Refactored user.sendMessage logic. 2016-03-25 08:33:54 -05:00
Keith Holliday 95ea73d440 Fixed route namespace and added translation strings 2016-03-25 08:33:54 -05:00
Keith Holliday e9a9079c46 Ported sendPrivateMessage route and added initial tests 2016-03-25 08:33:54 -05:00
Keith Holliday 075b31c075 Added password requirement 2016-03-25 08:32:49 -05:00
Keith Holliday 7f65707ee4 Ported user delete route and added initial tests 2016-03-25 08:32:49 -05:00
Matteo Pagliazzi be9312deb0 Merge branch 'api-v3-equip-feed-hatch2' into api-v3 2016-03-25 12:23:12 +01:00
Matteo Pagliazzi 192409a0b5 Merge branch 'api-v3' into api-v3-equip-feed-hatch2 2016-03-25 12:22:55 +01:00
Blade Barringer cd6adf2421 fix: correct wheelchair spelling 2016-03-24 21:31:20 -05:00
Victor Piousbox 5aacd978c6 api-v3-get-user-anonymized 2016-03-24 18:23:43 +00:00
Matteo Pagliazzi 9452fd3128 Merge pull request #6945 from piousbox/api-v3-test-attach-local-to-social-auth 
[v3] working on attaching local to social auth
 2016-03-24 19:18:04 +01:00
Matteo Pagliazzi 0f1add62cf Merge pull request #6956 from HabitRPG/api-v3-shared-ops 
[Api v3] Port changeClass and disableClasses
 2016-03-24 19:17:48 +01:00
Matteo Pagliazzi 0a65e6a6f1 v3: port hatch, equip and feed ops 2016-03-24 18:59:09 +01:00
Victor Piousbox 528d805cda api-v3-test-attach-local-to-social-auth 2016-03-24 17:51:31 +00:00
Sabe Jones 2652de88ae Merge pull request #6940 from HabitRPG/sabrecat/mystery-201603 
Subscriber items 2016-03
 2016-03-24 12:33:06 -05:00
Matteo Pagliazzi 159b9eaa8d port disable classes and change class ops 2016-03-24 14:25:30 +01:00
Blade Barringer 2d55a2a31d chore: compile sprites 2016-03-24 07:57:57 -05:00
Blade Barringer c88f2ce580 refactor: Use resized version of wheelchair for selection 2016-03-24 07:57:57 -05:00
Blade Barringer f33469609c Adjust sprite task to not include wheelchair images in the customize-option handling 2016-03-24 07:57:50 -05:00
Nick Bunn 0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Blade Barringer 01a7132b0b refactor: Extract play reward sound logic into function 2016-03-23 17:55:44 -05:00
Kenny Carlsen 7b708f51ba Proposed bug fix, issue #6668 - erroneous reward purchase sound 2016-03-23 17:55:41 -05:00
Sabe Jones 17b02f2867 fix(news): missing promo 2016-03-23 15:47:22 -04:00
Sabe Jones ba1cc67654 chore(news): fill out remaining Bailey 2016-03-23 15:36:24 -04:00
Sabe Jones be159adf77 fix(event): pastel skin, not hair 2016-03-23 15:36:24 -04:00
Sabe Jones 1286b6fbee fix(event): make spring hair/skin available server side 2016-03-23 15:36:24 -04:00
Sabe Jones f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Blade Barringer 2a4a8466ca Merge pull request #6948 from MathWhiz/patch-1 
Fix ISSUE_TEMPLATE.md
 2016-03-23 11:48:13 -05:00
MathWhiz 802b8bed0a Fix ISSUE_TEMPLATE.md 
Added parentheses around two of the comments to hide them.
 2016-03-23 09:11:08 -05:00
Blade Barringer a958fefa6b Merge pull request #6946 from HabitRPG/update_pageres 
Update pageres
 2016-03-23 08:36:52 -05:00
Blade Barringer ef2a1f5929 chore: Update pageres 
Removes dependency on memoize-async, which was unpublished:
https://medium.com/@azerbike/i-ve-just-liberated-my-modules-9045c06be67c#.tlcdr5ieg
 2016-03-23 08:16:39 -05:00
Blade Barringer fd10422e0c tests: Add preliminary tests around send message and send gift 2016-03-22 21:49:27 -05:00
Blade Barringer f5d4eba292 fix: Default message to '' when not passed in sendGift route 2016-03-22 21:49:27 -05:00