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

13124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi 6cbbdcdcbe v3: port static pages, make routes lib more flexible, share middlewares between v2 and v3, port v1, simplify server.js 2016-04-01 19:07:03 +02:00
Matteo Pagliazzi e54bd0f364 Merge branch 'TheHollidayInn-api-v3-open-mystery-item3' into api-v3 2016-04-01 16:40:08 +02:00
Matteo Pagliazzi aae94bf1b4 Merge branch 'api-v3-open-mystery-item' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-open-mystery-item3 2016-04-01 16:39:52 +02:00
Matteo Pagliazzi ad0f1ee0f4 Merge branch 'TheHollidayInn-api-v3-ops-read-card' into api-v3 2016-04-01 16:30:59 +02:00
Matteo Pagliazzi 82afc1971d Merge branch 'api-v3-ops-read-card' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-read-card 2016-04-01 16:30:48 +02:00
Matteo Pagliazzi 4b77dd171d Merge branch 'TheHollidayInn-api-v3-hourglass-purchase2' into api-v3 2016-04-01 16:28:30 +02:00
Matteo Pagliazzi 7e093f1622 Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2 2016-04-01 16:28:20 +02:00
Matteo Pagliazzi 519b3a1e4f Merge pull request #6988 from TheHollidayInn/api-v3-ops-purchase 
Ported purchase, add unit tests, created new user purchase route, and added tests
 2016-04-01 16:20:33 +02:00
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 41b3ee1df0 fix(world-boss): Correct generic Tavern text 2016-03-31 23:45:34 -05:00
Sabe Jones a90562e3ad Merge pull request #6992 from HabitRPG/sabrecat/spring-boss 
Spring Fling 2016 World Boss
 2016-03-31 21:51:10 -05:00
Sabe Jones 3281894d83 chore(news): World Boss Bailey 2016-03-31 19:54:13 -04:00
Sabe Jones 7aa668be4e chore(gulp): compile sprites 2016-03-31 18:41:10 -05:00
Sabe Jones a07aed331c fix(world-boss): add chat message, Bailey handling, animation 2016-03-31 19:38:43 -04:00
Sabe Jones def6b6cd5c chore(gulp): compile sprites 2016-03-31 17:20:30 -05: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 7e9520b920 fix(test): make sure error is catched using done() callback 2016-03-30 23:32:12 +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
Blade Barringer 5c34f7586d Merge pull request #6984 from lbraun/develop 
Remove extra 'it' from spec description
 2016-03-29 23:29:12 -04:00
Lucas Braun ee9dc7c196 Remove extra 'it' from spec description 2016-03-29 22:11:36 -04:00
Alys 9a1e7a0ad7 Merge pull request #6981 from Alys/develop 
cron timezone fix (stage 1): cron records current timezone in preferences.timezoneOffsetAtLastCron
 2016-03-29 23:05:50 +10: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
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