sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-04 13:09:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14142 commits 1 branch 0 tags 1.6 GiB
Commit graph

3185 commits

Author SHA1 Message Date
Husman
6543ff89e1 refactor(api): Remove prod check in payments library. Fill out tests 
Wasn't able to mock out pushNotifications correctly and left two tests unfinished.

closes #7728
closes #7770
 2016-07-12 12:43:17 -05:00
Ross Hardy
2b30c63448 Adding new basic audio theme rosstavoTheme (#7766) 2016-07-12 12:30:44 +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
1ab8dab9a3 pusher: onlkeopenaximum 1 connection per brorowser 2016-07-08 17:48:39 +02:00
Sabe Jones
52ae23e9bf chore(news): misc Bailey 2016-07-07 22:40:50 +00:00
Sabe Jones
ff3f339c2e feat(content): Armoire and BGs 2016-07 (#7762) 
* feat(content): Armoire and BGs 2016-07

* fix(backgrounds): resize Dilatory Castle
Also fixes a long-overlooked issue where the Egg Hunt quest remained available long after its event ended.
 2016-07-05 15:49:21 -05: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
dff9356778 remove redundant export for iap 2016-07-04 15:50:40 +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
f8760a337a parse receipt object 2016-07-04 15:06:35 +02:00
Matteo Pagliazzi
e19657b8ac more logging 2016-07-04 14:58:50 +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
Sabe Jones
986d583ff9 fix(news): typo 2016-07-01 19:40:05 -05:00
Sabe Jones
54c841da61 chore(news): Take This Bailey 2016-07-02 00:15:22 +00:00
Matteo Pagliazzi
32714e5d26 added some logging 2016-07-01 13:41:52 +02: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
Blade Barringer
39f014c059 chore(client): Remove unused server error page 
closes #7745
 2016-06-30 21:41:12 -05:00
Sabe Jones
723bf7358b feat(customization): enable Splashy Skins (#7740) 2016-06-29 13:31:37 -05:00
Blade Barringer
f8e1e51c21 fix(client): Prevent group from freezing up when sending a chat message 2016-06-28 08:13:09 -05:00
Blade Barringer
24287df702 fix(client): msg notification properly leaves after visiting party page 
closes #7393
closes #7735
closes #7445
 2016-06-28 07:37:27 -05:00
Matteo Pagliazzi
1492a8af0d use correct identifier for apple 2016-06-27 14:32:29 +02: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
Travis
30cf4f5a96 fix(client): Stop duplicating completed todos (#7709) 
* Deduping completed tasks on load. closes #7708

* Addressing paglias' comment
 2016-06-24 07:57:15 -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
Sabe Jones
cfe688daa5 feat(mystery): subscriber items 201606 (#7707) 
* feat(mystery): subscriber items 201606

* chore(news): announce Android
 2016-06-23 14:01:11 -05:00
Blade Barringer
1484090d27 Merge branch 'Hus274-7701' into develop 2016-06-23 07:55:56 -05:00
Travis
0af1ced462 fix(client): Sort gear by stat from class bonus (#7710) 
* Accounting for class bonus when sorting equipment by stats. closes #7701

* Fixing unintended impact on last page and including special classes

* Addressing comments
 2016-06-23 07:55:00 -05:00
Blade Barringer
2d3e5f86f7 feat(client): Display if gear gets class multiplier in notes 2016-06-23 07:53:01 -05:00
Blade Barringer
d5a354b499 fix(api): Only award participating members the quest rewards (#7706) 2016-06-23 07:10:56 -05:00
Husman
c7b54a0abf Addressing comments 2016-06-22 20:19:48 -07: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
Husman
2d327ca6ea Fixing unintended impact on last page and including special classes 2016-06-22 19:58:36 -07:00
Husman
cc476a0dee Accounting for class bonus when sorting equipment by stats. closes #7701 2016-06-22 19:28:44 -07: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
Sabe Jones
cf258676a2 feat(event): Summer Splash 2016 (#7705) 2016-06-21 19:22:50 -05:00
Kaitlin Hipkin
b94872a69f fix copypasta mistake 2016-06-21 20:10:25 +02:00
Blade Barringer
cfacf039df refactor(client): assign tasks data to tasks variable on initial sync 2016-06-21 07:34:44 -05:00
Blade Barringer
138217fe6a fix(client): Load completed todos on sync 
closes #7392
closes #7673
 2016-06-21 07:31:19 -05:00
Blade Barringer
d18f42fe7a fix(client): Use $state on $rootScope 2016-06-20 06:35:21 -05: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
Blade Barringer
a4dba82d14 fix(client): Refresh party page when inviting users 2016-06-19 09:41:43 -05:00
Blade Barringer
851ad59fb8 fix(client): Display message about needing a party in quest modal 
closes #7684
closes #7686
 2016-06-19 09:25:57 -05:00
Blade Barringer
7fd3ad3731 fix: Do a hard redirect after creating party 
closes #7694
 2016-06-19 09:06:21 -05:00
Blade Barringer
ef2535aadc fix: Use translatable string for mana in header 
closes #7695
 2016-06-19 09:00:59 -05:00
Blade Barringer
09ecc0eada Merge branch 'Hus274-7689' into develop 2016-06-19 08:38:37 -05:00
Blade Barringer
941ff10cdc fix: Prevent message from displaying if no new messages exist 2016-06-19 08:38:07 -05:00
Husman
b62fbab6f8 Mark private messages as read when entering the inbox and syncing while in the inbox. closes #7689 2016-06-18 19:42:11 -07:00
Blade Barringer
e28946bcfb fix(client): Allow users to reject invites to new parties 
closes #7691
 2016-06-18 20:21:27 -05:00
Blade Barringer
813aa2cf38 chore(client): Remove unused clearCompleted user.ops function 2016-06-18 12:23:40 -05:00
Husman
1a19605ee6 fix: Update client to remove completed todos immediately 
closes #7549
closes #7685
 2016-06-18 12:23:28 -05:00
Sabe Jones
8cb0d91f77 chore(news): misc announce 2016-06-17 23:35:23 +00: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
Matteo Pagliazzi
a424892dd3 Fix auth if localStorage is missing or corrupted (#7674) 
* fix(auth): correctly redirect to logout page if localstorage is corrupted

* fix(auth): do not break site if localStorage has invalid JSON

* fix(karma): use $window instead of windo

* disable failing karma tests

* fix(tests): Provide mockwindow for tests

* fix(tests): Call habitrpgShared without $window
 2016-06-17 12:14:41 +02: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
Blade Barringer
c34c21192b Merge pull request #7657 from Hus274/7600 
Removing accepted guild invitations from the local copy of the user o…
 2016-06-16 07:20:43 -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
Sabe Jones
28e45aea4d June Pet: Axolotl (#7663) 
* feat(quests): Axolotl pet

* feat(pets): finish axolotl build
 2016-06-15 12:14:25 -05:00
Husman
4a3e0eb884 Removing accepted guild invitations from the local copy of the user object so the notification goes away without having to refresh. #7600 2016-06-12 16:03:44 -07:00
Husman
9b12d46741 feat: Add group by button to equipment page 
Closes #7636
Closes #7651

This commit creates a new button on the equipment page that allows the user to group their equipment type (body location) instead of simply by class.
 2016-06-12 09:40:25 -05: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
MathWhiz
57bb4d8c10 Fix webhooks (#7622) 
* fix userServices.js

* comply with eslint

* Remove conversion to string
 2016-06-10 12:42:48 +02: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
Sabe Jones
e3c0d7d214 chore(news): blog announcements 2016-06-10 00:59:50 +00:00
Blade Barringer
b97d7cc9f9 feat: Disable spells on client when they cannot be cast 
Closes #7110
Closes #6867
 2016-06-09 08:58:57 -05:00
Alys
a941ee8b84 allow "Your password" to be translated in account deletion confirmation (#7624) 
* allow "Your password" to be translated in account deletion confirmation

* rename string for deleting local account confirmation step
 2016-06-09 07:28:41 -05: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
Blade Barringer
17b6999c81 Merge pull request #7621 from crookedneighbor/party_page 
Fetch Party when going to party page
 2016-06-07 21:43:38 -05:00
Sabe Jones
9df3e88842 fix(coupons): POST apply, not GET 2016-06-08 01:52:21 +00:00
Matteo Pagliazzi
5e01b3d129 fix sticky header not working 2016-06-07 21:12:31 +02:00
Blade Barringer
5beb6106c9 fix: Go to loaded party page when inviting friends to party 2016-06-07 12:36:07 -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
Blade Barringer
48957369f3 fix: Prevent group not found message when reloading party page 2016-06-07 08:52:28 -05:00
Blade Barringer
3f8ab017ce fix: Prevent tavern from syncing every time a user goes to the tavern page 2016-06-07 08:52:01 -05:00
Blade Barringer
006b074ac2 Merge branch 'develop' into party_page 2016-06-07 07:59:59 -05:00
Blade Barringer
453540e85d fix: Display flower when not buffed 
closes #7613
 2016-06-05 22:06:09 -05: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
39aa0b489f refactor: Reduce duplication of stat setting 2016-06-05 07:23:54 -05:00
MathWhiz
0e5f748c9a Change attribute names and popups 
Closes #2044
Closes #7606
 2016-06-05 07:23:26 -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