Commit Graph

89 Commits

Author SHA1 Message Date
Phillip Thelen 679378331d add client and OS info to amplitude events
closes #7865
2016-08-11 08:58:13 -05:00
Alys 4df2b723fa fix errors in apidocs for coupons/enter/:code and tasks/:taskId 2016-08-10 12:50:07 +10:00
Husman bba56b8c29 fix: remove guild or party when user looks it up if it does not exist
closes #7878
fixes #7724
2016-08-07 10:41:07 -05:00
Blade Barringer 05eacc32ba Merge branch 'develop' into Hus274-7793 2016-08-05 12:55:00 -05:00
Blade Barringer 626b87eb79 Merge pull request #7849 from Hus274/7653-3
booting a member from party removes member from quest
2016-08-05 12:35:45 -05:00
Travis d7c5d05f13 Clear invites from user when the request fails because the invite is invalid (#7852)
* making requests to accept or reject a request fail because the invite is invalid clear the invite from the user so it doesn't require admin intervention. part of #7653

* Adding await
2016-08-05 12:34:06 -05:00
Matteo Pagliazzi ae5b66e248 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2016-08-04 20:00:19 +02:00
Matteo Pagliazzi 725ed22704 added apidoc info about data.newUser in login response 2016-08-04 19:59:48 +02:00
Matteo Pagliazzi d1bd63289b Merge branch 'facebook-login-add-newuser-flag' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-facebook-login-add-newuser-flag 2016-08-04 19:58:09 +02:00
Matteo Pagliazzi d7ccf2bbe1 API: return computed stats for members routes (#7870)
* api: return computed stats for members responses

* add integration tests for computed stats

* add unit tests for computed stats

* clarify test name

* add missing query parameter to test case

* reset test database before running API tests for the Hall
2016-08-04 19:56:00 +02:00
Sabe Jones 29498976ee feat(content): Armoire and BGs 201608 (#7868)
Plus: beta shops API fixes and front page user count update
2016-08-03 14:55:12 -05:00
Matteo Pagliazzi 60f34dafb0 Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)
* Revert "Revert "Deprecate API v2""

* fix path in shops controller
2016-08-01 22:36:10 +02:00
Husman 6859cf1f73 booting a member from party removes member from quest whether the quest is started or not. part of #7653 2016-07-30 09:44:21 -07:00
Ryan Castner 7c579bf850 7837-Update API Docs (#7839)
* Updated API Docs for api-v3

* Updated API Docs for top-level

* Updates relating to @crookedneighbor comments

* Updated type and field of 'to' param.
2016-07-27 18:48:03 -05:00
Keith Holliday e6dd8cc03a Added tests for Facebook auth 2016-07-27 14:27:21 -05:00
Sabe Jones 40eb74ea1b fix(path): common import 2016-07-26 22:30:43 +00:00
Phillip Thelen 24d25026cf Add API calls for shop inventories (#7810)
* Add API call for market inventory

* changes to shop api calls

* optimize shop categories

* add API call for quests

* add api call for time travelers shop

* fic buying items in shops

* fix linting errors

* shop adjustments for iOS app

* add tests to shops

* fix syntax issues

* Code formatting

* correct indentation

* add tests for api routes

* fix time travelers and seasonal

* Increase test coverage for shop routes

* refactor: Pull out trinket count in time traveler route

* refactor: Clarify instructions for seasonal shop script

* lint: Remove extra new line

* Adjust shops common test
2016-07-26 14:36:55 -05:00
Keith Holliday 9d4fa6fd4e Added new user flag when user registers with facebook 2016-07-24 17:23:19 -05:00
Husman bcd0915c60 Fixing up commit according to review 2016-07-19 19:23:21 -07:00
Husman a798c4ef08 fix: removing party invitations 2016-07-18 19:25:02 -07:00
Matteo Pagliazzi 590adb3438 Revert "Deprecate API v2" (#7801) 2016-07-17 18:15:25 +02:00
Matteo Pagliazzi 45c31a2bcf Deprecate API v2 (#7761)
* deprecate api-v2

* remove v2 test helpers

* remove unused string
2016-07-16 19:56:18 +02:00
Alys ee01788647 "allCompletedTodos" option in API for returning all completed To-Dos for when 30 isn't enough (#7773)
* add new "allCompletedTodos" option to API for returning all completed To-Dos at once - fixes #7301

* make minor fixes to allCompletedTodos option

* change allCompletedTodos option to _allCompletedTodos and add a BETA comment
2016-07-14 08:34:48 +10:00
Alys 76b51b8b65 fix apidoc typo: change clear-flags to clearflags 2016-07-13 19:57:29 +10:00
Husman 694cd8e555 feat: allowing the flagging of system messages
closes #7767
closes #7771
2016-07-11 21:28:43 -05:00
Alys 0631e9ba15 delete ancient code for hiding a the huge Spread the Word challenge, which has now been closed 2016-07-10 11:41:28 +10:00
Matteo Pagliazzi 6120a29158 remove console.log 2016-07-04 17:42:33 +02:00
Matteo Pagliazzi 8be5ba76dd add some logging 2016-07-04 16:46:41 +02:00
Matteo Pagliazzi d4cff995e8 fix isValidated and port iOS iap code 2016-07-04 16:12:43 +02:00
Matteo Pagliazzi 0caeb518af Merge branch 'develop' into iap-fix 2016-07-04 15:45:56 +02:00
Matteo Pagliazzi a2da583db8 port android iap code to v3 2016-07-04 15:45:52 +02:00
Matteo Pagliazzi e933914548 more logging 2016-07-04 14:43:15 +02:00
Matteo Pagliazzi 0880850408 Real-time Chat (#7664)
* feat(realtime-chat): add Pusher library to the server

* feat(realtime-chat): only for private groups

* feat(realtime-chat): add authentication endpoint for Pusher

* feat(realtime-chat): client proof of concept

* fix typo in apidoc

* feat(realtime-chat): redo authentication and write integration tests

* remove firebase code

* fix client side tests

* fix line ending in bower.json

* feat(realtime chat): use presence channels for parties, send events & disconnect clients if user leaves or is removed from party, automatically update UI

* pusher: enable all events in the background

* fix pusher integration tests
2016-07-02 15:17:24 +02:00
Blade Barringer 9602a398b2 feat(api): Allow admins to revoke chat priveleges from website 2016-07-01 20:24:37 -05:00
Sabe Jones c871d8877c Corrected transaction descriptions (#7744)
* fix(subscriptions): Habitica not HabitRPG

* fix(subscriptions): Habitica in Amazon
2016-07-01 19:40:23 -05:00
Matteo Pagliazzi 75df284967 better error handling and fix typo 2016-07-01 12:37:29 +02:00
Blade Barringer 1bf96f9a33 fix(docs): Correct typo in chat docs 2016-06-30 22:09:30 -05:00
eshapard 887399b815 update documentation for marking chat seen
Documentation included the chatId in the url, but the api does not use it. Adding the chatId will cause a 404 error. The api marks all chats in the guild as read; not individual chats.

closes #7742
2016-06-30 22:09:30 -05:00
Matteo Pagliazzi 893b4d8def fix(iap): rewrite iap library code 2016-06-27 14:26:20 +02:00
Matteo Pagliazzi c630bb9f96 fix(iap): wip 2016-06-26 17:04:16 +02:00
Blade Barringer 81ac45f2a7 fix(api): Grant remaining perks when canceling an Amazon subscription
* Add tests for payments lib
* Add placeholder it blocks to be filled in

closes #7660
closes #4840
2016-06-26 08:08:49 -05:00
Alys 3d94c2e7f1 fix error in comment in apidoc for ExportUserAvatarPng 2016-06-24 20:13:22 +10:00
Blade Barringer b27b18b323 Merge pull request #7703 from khipkin/small_api_typo
fix mistake in apidoc for Feed a pet
2016-06-22 22:04:46 -05:00
Matteo Pagliazzi 08d7727881 Push notifications (#7682)
* Fix Social Push notifications

* Fix code formatting issues

* Fix commented issues

* Fix Syntax errors

* update push notify dependency

* specify push-notify version

* change how apn key is loaded

* feat(push-notifications): improve logging

* feat(push-notifications): disable v2 push notifications

* test(push-notifications): add unit tests and improve integration ones

* fix(push-notifications): throw when required params are missing

* fix(tests): correct descriptions and remove wrong comment

* fix(push-notifications): trim APN key

* fix(apn): log feedback only if it has data

* fix(apn): load cert and key differently

* fix(tests): correctly load apn during tests

* download creds from S3 and create AWS lib

* convert s3 buffer to a string

* fix(apn): remove console.log and do not use cert twice

* invert key and cert, disable failing test

* invert key and cert
2016-06-23 00:19:37 +02:00
Matteo Pagliazzi 09c7c45cd5 fix trailing spaces 2016-06-22 12:18:42 +02:00
Matteo Pagliazzi 3924bdc7c5 Fetch entire user when resetting password 2016-06-22 11:56:39 +02:00
Kaitlin Hipkin b94872a69f fix copypasta mistake 2016-06-21 20:10:25 +02:00
Alys 7a10d61281 fix inconsistencies in apidoc for member routes (#7679) 2016-06-17 13:10:49 +02:00
Alys 76e86bda86 fix error in API docs - flag chat had been documented as like 2016-06-17 20:25:14 +10:00
Blade Barringer 5a3082bd88 fix(docs): correct apidoc param for task alias|id 2016-06-16 12:55:56 -05:00