Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,022 Commits 64 Branches 1,256 Tags
887399b8152976afeef0eb370eb4a71eac8c0edf
Commit Graph

88 Commits

Author SHA1 Message Date
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
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
Sabe Jones 9d1f1fa321 Correct GA unsub info (#7676) 
* fix(analytics): better GA category handling

* refactor(analytics): chained OR

* fix(analytics): prefer gaCategory
 2016-06-23 14:29:50 -05:00
Blade Barringer d5a354b499 fix(api): Only award participating members the quest rewards (#7706) 2016-06-23 07:10:56 -05: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
Blade Barringer e920734648 feat(api): Stop alerting about new messages for large groups 
closes #6706
closes #6762
 2016-06-19 20:54:30 -05: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
Blade Barringer b7b61e6251 Shortname (#7655) 
* feat: Add alias property to task model
 2016-06-16 12:28:45 -05:00
Travis 1de2c839c8 Adding ticks back into gifted gems receive message #7540 (#7671) 
* Adding ticks back into gifted gems receive message #7540

* Removing raw string concatenation and fixing tests
 2016-06-15 22:29:04 -05:00
Alys a03b1fc6cb prevents damage to quest participants with false or null values - partial fix for #7653 (#7665) 2016-06-16 09:36:58 +10:00
Shervin Sarain 539547b39e prevent sync from clearing selected tags (#7631) 
* prevent sync from clearing selected tags

* improved tag selection bugfix
 2016-06-11 19:57:20 +02:00
Alys 0bf7858d53 Fix apidocs error for /api/v3/challenges/group/:groupId. Change various descriptions to imperative mood 
e.g., change "Sets lastCron" to "Set lastCron"
 2016-06-11 08:15:07 +10:00
Blade Barringer 441fba2ad0 Merge pull request #7639 from eshapard/patch-1 
Closes #7637
 2016-06-10 07:51:46 -05:00
Matteo Pagliazzi efeb2c1c8e implement tips for loading screen (#7632) 
* implement tips for loading screen

* fix typo in tip 22
 2016-06-10 12:25:09 +02:00
eshapard ee581a1ab2 Update tasks.js 
Typo in code: url for getting a single task is  * @api {get} /api/v3/tasks/:taskId Get a task; not /api/v3/task/:taskId
 2016-06-09 21:16:05 -07:00
Shervin Sarain 8490b481f6 send email when admin unflags post (#7580) 
* send email when admin unflags post

* Improved email acquisition code, minor changes to sent email

* Refactor getGoupUrl into its own method

* added unit test for getGroupUrl

* improved test and getGroupUrl
 2016-06-07 22:22:33 -05:00
Matteo Pagliazzi f7be7205e7 Remove localstorage and add notifications (#7588) 
* move remaining files frm /common/script/public to website/public

* remove localstorage

* add back noscript template and put all javascript in the footer

* fixes client side tests

* remove double quotes where possible

* simplify jade code and add tests for buildManifest

* loading page with logo and spinner

* better loading screen in landscape mode

* icon on top of text logo

* wip: user.notifications

* notifications: simpler and working code

* finish implementing notifications

* correct loading screen css and re-inline images

* add tests for user notifications

* split User model in multiple files

* remove old comment about missing .catch()

* correctly setup hooks and methods for User model. Cleanup localstorage

* include UserNotificationsService in static page js and split loading-screen css in its own file

* add cron notification and misc fixes

* remove console.log

* fix tests

* fix multiple notifications
 2016-06-07 16:14:19 +02:00
Alys 0a10b2bd28 change user quest.progress.collect to quest.progress.collectedItems (#7612) 2016-06-05 20:47:45 -05:00
Blade Barringer ac24fb31fb chore: Remove temporary code 2016-06-05 08:56:57 -05:00
Blade Barringer 1915f8665c Merge pull request #7570 from crookedneighbor/WIP_7567_dont_rely_on_quest_key_on_user 
Use party's quest key in cron
 2016-06-05 06:18:08 -05:00
Alys 5ee28eabb5 fix user.party.quest.progress.up mistakes in skills/spells; make an unrelated typo in apidoc comment 2016-06-05 20:03:14 +10:00
Blade Barringer 840a90bbdf refactor: Make quest methods private instance methods 2016-06-04 22:11:54 -05:00
Blade Barringer 25cc01e7cd fix: Supply random value as seed so quest collection is random 2016-06-04 22:11:52 -05:00
Blade Barringer b3b437e593 chore: Add quest collection migration and temporary code to catch data inconsistencies 2016-06-04 22:11:52 -05:00
Blade Barringer 58cd634255 fix: Change quest collection to calculate items on the server only 2016-06-04 22:11:51 -05:00
Blade Barringer c04bac44e7 feat: Use party's quest key in cron 2016-06-04 22:11:50 -05:00
Sabe Jones 7f722269bd fix(subscription): correctly award 3mo bennies (#7596) 2016-06-03 22:40:04 -05:00
Blade Barringer 96e9b83ca3 Merge pull request #7583 from crookedneighbor/fix_quest_modal_not_being_cleaned_up 
fix: Cleanup quest progress for non-members when quest starts
 2016-06-03 21:52:14 -05:00
Blade Barringer 434cac944c fix: Cleanup quest progress for non-members when quest starts 2016-06-03 21:51:18 -05:00
Sabe Jones 7108b02f4d fix(profiles): public chairs 
(cherry picked from commit 83366fa3a6)
 2016-06-03 08:18:12 -05:00
Sabe Jones 6084ea2017 Fix mystery set award to new subscribers (#7586) 
* fix(mystery): flip da sign

* test(subscription): check mystery box
 2016-06-01 15:34:57 -05:00
Blade Barringer e8b1c937e4 Merge pull request #7568 from HabitRPG/fix_contributor_levels_watch 
fix: Remove unnecessary flags.contributor property from user
 2016-05-31 21:31:12 -05:00
Matteo Pagliazzi d7cd2ce329 do not run cron when getting a group 2016-05-31 21:30:13 -05:00
Matteo Pagliazzi e07ade5a4a cron: set lastCron at the beginning and misc fixes 2016-05-31 21:30:07 -05:00
Blade Barringer 52f0057c3d fix: Remove unnecessary flags.contributor property from user 
Closes #7550
 2016-05-31 21:10:58 -05:00
Shervin Sarain de21487038 Fix challenge sorting 
Closes #7543
Closes #7507
 2016-05-31 20:41:38 -05:00
Sabe Jones fcc14520c5 Don't $watch drops (#7547) 
* WIP(drops): get drops out of _tmp

* fix(notifications): no watch for drops/mystery

* fix(ops): only two response values

* fix(test): update op expectation
Also update API docs for modified route.

* fix(lint): remove trailing space

* fix(test): update integration check
 2016-05-31 14:56:33 -05:00
Blade Barringer b33505141b docs: Correct url for member routes 2016-05-31 13:03:45 -05:00
Matteo Pagliazzi ee836c76a4 log req.method 2016-05-31 16:37:34 +02:00
Matteo Pagliazzi d9de6282a4 increase number of concurrent users that are synced when editing a challenge 2016-05-31 11:27:21 +02:00
Matteo Pagliazzi 87066ef6c7 do not allow casting on challenge tasks in v2 2016-05-31 11:13:28 +02:00
Matteo Pagliazzi 6b214e4e3f sanitize task when updating in v2 2016-05-31 11:09:32 +02:00
Blade Barringer bbafe3d52d fix: Prevent user from inivting self to group 
fixes #7491
 2016-05-29 10:09:02 -05:00