Commit Graph

597 Commits

Author SHA1 Message Date
Keith Holliday c916c74775 Ported release both, added unit tests, add release both route with integration tests 2016-04-03 14:44:00 -05:00
Matteo Pagliazzi de74fae0b4 v3: port coupons 2016-04-02 16:37:55 +02:00
Matteo Pagliazzi e95837f69f Merge branch 'develop' into api-v3 2016-04-02 11:34:04 +02:00
Alys 0ba47de43d adjust cron so that it prevents a double cron when timezone decreases (timezoneOffset increases)
* start to fix cron for when timezones change

* add some incomplete code

* change cron to identify when timezone changes and run only if both zones agree it should run - BAD - does cron an hour early one day later

* change timezone offset variable names

* improve handling of each individual timezone change possibility

* remove unnecessary casting to number

* remove duplicated code

* finish code for dangerous timezone change

* fix linting errors

* remove console.log lines and other testing code

* add a TODO comment for further actions for timezone changes in the "safe" direction
2016-04-02 11:42:15 +10:00
Matteo Pagliazzi 843dd09d35 Merge pull request #6986 from HabitRPG/api-v3-one-app
[Api v3] Consolidate server code and share middlewares where possible
2016-04-01 19:30:52 +02:00
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 238dee7608 Merge pull request #6962 from piousbox/shared-code-user-score-task
shared-code-user-score-task
2016-04-01 18:28:55 +02:00
Victor Piousbox e6e2c26a12 shared-code-user-score-task 2016-04-01 16:11:37 +00: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 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 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
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 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
Matteo Pagliazzi bf93275693 v3: port updateUser 2016-03-30 16:18:22 +02: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 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
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
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
Matteo Pagliazzi 159b9eaa8d port disable classes and change class ops 2016-03-24 14:25:30 +01:00
Nick Bunn 0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -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 f5d4eba292 fix: Default message to '' when not passed in sendGift route 2016-03-22 21:49:27 -05:00
Brian Murray eaea55687b Make change regarding pluralization of gem gift message easier to read and not one long line 2016-03-22 21:49:27 -05:00
Brian Murray 369386e370 Only add an 's' to months of subscription or gems given if they are not 1. 2016-03-22 21:49:22 -05:00
Matteo Pagliazzi 23f92e2d28 Merge pull request #6923 from TheHollidayInn/api-v3-groups-reject-invite
[v3] Added group reject invite route and initial tests
2016-03-22 22:46:12 +01:00
Keith Holliday da08b6c814 Removed group query from route 2016-03-22 16:10:17 -05:00
Matteo Pagliazzi 0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00