krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,343 Commits 64 Branches 1,226 Tags
a63d5ae97ff8ff58151bbcf2b51aef151e5aa4f5
Commit Graph

2671 Commits

Author SHA1 Message Date
Keith Holliday
6d9617e345 Ported read card, added unit tests, added read card route and integration tests 2016-04-01 09:17:40 -05:00
Keith Holliday
3fe88fd8d0 Ported open mystery item, added unit tests, added route, and integration tests 2016-04-01 08:23:40 -05:00
Keith Holliday
ad0bc58028 Ported purchase, add unit tests, created new user purchase route, and added tests 2016-04-01 08:14:15 -05:00
Keith Holliday
dd12443166 Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests 2016-04-01 08:11:26 -05:00
Matteo Pagliazzi
c5f17b4011 Merge branch 'develop' into api-v3 2016-04-01 11:50:41 +02:00
Sabe Jones
3281894d83 chore(news): World Boss Bailey 2016-03-31 19:54:13 -04:00
Sabe Jones
a07aed331c fix(world-boss): add chat message, Bailey handling, animation 2016-03-31 19:38:43 -04:00
Sabe Jones
f51653b7a5 WIP(world-boss): partial build 2016-03-31 17:29:21 -04:00
Matteo Pagliazzi
3089658cc7 Merge branch 'develop' into api-v3 2016-03-30 23:40:00 +02:00
Matteo Pagliazzi
d0383766e3 Merge pull request #6985 from HabitRPG/api-v3-update-user 
[Api v3] update user
 2016-03-30 23:16:28 +02:00
Sabe Jones
4fa8c6dfbd chore(news): Bailey 2016-03-30 2016-03-30 15:39:12 -04:00
Sabe Jones
95fa91522a Merge pull request #6955 from HabitRPG/wheelchair 
Wheelchair
 2016-03-30 14:25:12 -05:00
Matteo Pagliazzi
bf93275693 v3: port updateUser 2016-03-30 16:18:22 +02:00
Alys
ae9e6fbe30 allow cron to record user's current timezone offset in preferences.timezoneOffsetAtLastCron (initial stage of cron timezone fix for https://github.com/HabitRPG/habitrpg/issues/3806 ) 2016-03-29 22:34:23 +10:00
Blade Barringer
a9d227b490 Merge branch 'develop' into wheelchair 2016-03-28 21:12:52 -05:00
Blade Barringer
02a60d90d8 Merge branch 'develop' into api-v3 2016-03-28 16:02:04 -05:00
Blade Barringer
f4b43f55f0 refactor: Remove express-csv dependency 2016-03-28 10:24:29 -05:00
Blade Barringer
cb5a79b1bf chore: Set express session options 2016-03-28 10:24:01 -05:00
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
3f1b022477/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
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
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
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
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
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
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
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
c88f2ce580 refactor: Use resized version of wheelchair for selection 2016-03-24 07:57:57 -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
f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00