Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,783 Commits 64 Branches 1,256 Tags
8cd4c502bc615af65468987c162fc666751205ba
Commit Graph

6007 Commits

Author SHA1 Message Date
Sabe Jones 8cd4c502bc chore(i18n): update locales 2018-10-25 21:35:58 +00:00
Sabe Jones d8cacb653e chore(sprites): compile 2018-10-25 16:31:13 -05:00
Sabe Jones 59436a8bf7 feat(content): Mystery Items Oct 2018 2018-10-25 16:31:00 -05:00
Sabe Jones 15d028a281 chore(i18n): update locales 2018-10-25 20:31:20 +00:00
Sabe Jones e028232527 Merge branch 'release' into develop 2018-10-24 18:35:55 +00:00
Sabe Jones fceeacec3b chore(i18n): update locales 2018-10-24 18:35:27 +00:00
Matteo Pagliazzi f93c67e57c fix(amazon gift): do not reset the gift amount when opening the amazon modal 2018-10-24 20:29:27 +02:00
Sabe Jones 192dc26fbe Merge branch 'release' into develop 2018-10-23 22:50:49 +00:00
Sabe Jones 483768f4a7 chore(i18n): update locales 2018-10-23 22:49:30 +00:00
SabreCat 65031cef3a chore(sprites): compile 2018-10-23 22:45:47 +00:00
Sabe Jones 2fc1f46359 Veteran Pet ladder award for users affected by username changes (#10765) 
* feat(usernames): Veteran Pet ladder award for affected users

* feat(content): Vet Pet Bailey etc.
 2018-10-23 17:38:30 -05:00
Tressley Cahill 90d6e443ba Corrects the white bar above the header and updates the text styling (#10772) 2018-10-23 13:50:02 +02:00
Derek Kim 4ed1082558 fix for #10496: Newly subscribed accounts receive erroneous notification that they have Mystery Items (#10759) 
* fix
Newly subscribed accounts receive erroneous notification that they have Mystery Items

* Added unit test for #10496

* Restored a previous unit test
 2018-10-23 13:47:15 +02:00
Matteo Pagliazzi d1b86e6c14 Remove code for Pusher (#10774) 
* remove pusher

* fix linting
 2018-10-23 13:25:52 +02:00
Matteo Pagliazzi c813afba44 Upgrade mongoose (#10767) 
* fix mongoose and upgrade

* fix more validations
 2018-10-23 13:25:14 +02:00
Matteo Pagliazzi 6e21d154ae Do not throw an error when adding the same push device twice (#10770) 
* do not throw an error when adding the same push device twice

* fix spelling

* fix linting
 2018-10-20 14:52:02 +02:00
Tressley Cahill fe5beac91b Custom reward action background and font-color updates (#10769) 
* fixes custom reward action background and font-color

* update to -10
 2018-10-19 10:01:02 -05:00
Sabe Jones ae445555e9 fix(groups): don't show add manager for non-groups and non-leaders 2018-10-18 18:08:30 -05:00
Sabe Jones e7a096158e chore(i18n): update locales 2018-10-18 20:05:15 +00:00
Sabe Jones 98473fcfaa chore(news): Bailey 2018-10-18 15:00:21 -05:00
Sabe Jones e4300fc714 fix(registration): localize reg form placeholders 2018-10-18 14:48:46 -05:00
Matteo Pagliazzi ffba435923 fix #10756: do not show push notification settings for email only notifications 2018-10-18 14:21:35 +02:00
Matteo Pagliazzi 1f44444a50 Fix subcriptions remaining time disappearing after cancelling (#10761) 
* add hasCancelled method for group/user, prevent cancelling a subscription twice

* wip

* paypal: do not cancel a subscription twice

* make sure hasCancelled and hasNotCancelled return a boolean result
 2018-10-18 12:14:07 +02:00
Sabe Jones 061d990e39 Merge branch 'release' into develop 2018-10-15 20:20:55 +00:00
Sabe Jones 659f160e22 chore(i18n): update locales 2018-10-15 20:20:25 +00:00
Trevor Ford 5f27bc5f90 Issue 10728: sort equipment by stat descending on Market page (#10734) 
* sort equipment by stat descending in Market (issue #10728)

* fix sorting equipment by PER in Market (new issue?)

* move filter logic into method when sorting equipment in Market

* consolidate sorting in sortedGearItems() into one _orderBy call
 2018-10-15 21:12:53 +02:00
negue 074837b274 check every armoire gear 'canOwn' method (#10760) 2018-10-15 20:11:28 +02:00
Matteo Pagliazzi 5ca489dee7 Merge branch 'develop' into negue/modal-notifications 2018-10-13 21:18:16 +02:00
Rene Cordier fe39ef72ff Show accurate experience notifications (#10676) 
* Show accurate experience notifications

Add unit tests for exp notifications

* use array to compute exp and lvl values for notification changes

* Add tests for user loosing xp cases
 2018-10-13 20:24:23 +02:00
Carl Vuorinen eee5f2f1df No matching Guilds/Challenges message (#10744) 
* Display message on My Guilds page when filters dont' match anything

* Display message on Discover Guilds page when filters dont' match anything

* Display message on My Challenges page when filters dont' match anything

* Display message on Discover Challenges page when filters dont' match anything

* Don't show Load More button when there is nothing to load

* Fix Guild search

Previously was not possible to clear after searching
 2018-10-13 20:19:03 +02:00
Sabe Jones fd8572c28a Group Management Menu Fixes (#10704) 
* fix(groups): more intelligent member actions

* fix(groups): further member action improvements

* fix(groups): don't show "Remove Manager" if user doesn't have authority

* fix(lint): bad if syntax

* fix(groups): unnecessary if on icon
 2018-10-13 20:15:46 +02:00
Kirsty f161987e1e check officialPinnedItems for gala gear in market (#10745) 2018-10-13 20:07:30 +02:00
aszlig 2304d970a5 api: Fix a few API documentation typos (#10749) 
Just fixes a few syntactic errors and typos.

Signed-off-by: aszlig <aszlig@nix.build>
 2018-10-13 20:03:40 +02:00
Sabe Jones 25ed05ab0a Analytics: clean up old A/B test code & add username verify flag (#10754) 
* chore(analytics): clean up old A/B test code & add username verify

* fix(lint): more AB cleanup
 2018-10-13 13:03:20 -05:00
Sabe Jones 2e36b896d4 chore(i18n): update locales 2018-10-11 21:04:30 +00:00
Sabe Jones 6fe73d431e Merge branch 'develop' into release 2018-10-11 16:01:56 -05:00
Sabe Jones 998621cefe feat(content): fall avatar customization 2018-10-11 16:01:32 -05:00
Matteo Pagliazzi 67bb179c25 gifts: prevent users from sending the same gift twice by clicking many times on the Send button 2018-10-11 19:01:15 +02:00
Sabe Jones c875861dab Merge branch 'release' into develop 2018-10-10 16:26:28 +00:00
Sabe Jones 0caab5c8d0 fix(news): missing footnote 2018-10-09 23:39:48 -05:00
Sabe Jones 218e65b04b Merge branch 'release' into develop 2018-10-09 21:33:49 -05:00
Sabe Jones b0d177643c chore(sprites): compile 2018-10-09 21:32:38 -05:00
Sabe Jones c0e0b10a95 Merge branch 'release' into develop 2018-10-10 01:20:18 +00:00
Sabe Jones e56d097b3a chore(i18n): update locales 2018-10-10 01:16:28 +00:00
Sabe Jones 8c63a9e31f feat(content): Alligator Pets and Spoopy Sporples 2018-10-09 20:12:12 -05:00
Matteo Pagliazzi 36ead77e0c Fixes group plan verify username (#10747) 
Misc fixes
 2018-10-09 20:07:50 +02:00
Robert Kojima e7969987ec Guild textarea at list positioning (#10663) 
* autocomplete dialog now has ternary operator to determine placement

* added min height to textbox

* fixed spacing according to travisCI

* heightToUse function now retrieves argument from props
 2018-10-08 22:25:49 +02:00
titchimoto 97021e3422 Issue 10414 - Remove Member Option from View Party link. (#10639) 
* Add remove member option from main task page

* Code refactor for remove member options

* code refactor to avoid loading party multiple times

* fix dispatch to ensure only pulling once from server
 2018-10-08 22:22:09 +02:00
Carl Vuorinen 218d47d64a Don't show "no guilds" texts while loading (#10665) 
* Don't show "no guilds" texts while loading

Unified styling of "no guilds" message with my challenges page
Fixes #10662

* Don't show "no challenges" texts while loading

Add loading indicator (similar to find challenges & my guilds pages)

* Change gray color

* Set challenge icon color
 2018-10-08 22:18:11 +02:00
Rene Cordier bdfc23717e Css font home page update (#10672) 
* css font home page update

finish home page font change

* Small fixes on css font update on home page
 2018-10-08 22:16:14 +02:00