Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,018 Commits 64 Branches 1,256 Tags
bb01475e0219c7fa67e86d710f1663b50a49a6cb
Commit Graph

619 Commits

Author SHA1 Message Date
Sabe Jones bb01475e02 Merge branch 'release' into develop 2018-12-03 22:54:08 +00:00
Sabe Jones 3ba5ea1d2d chore(news): Bailey 2018-12-03 16:50:02 -06:00
Matteo Pagliazzi d2f7cba43d Merge branch 'develop' into payments/paypal-amazon-checkout 2018-12-02 14:47:56 +01:00
Matteo Pagliazzi 7873800f87 fix(kafka queue): remove leftover code 2018-12-01 12:16:34 +01:00
Sabe Jones b91ef9f539 chore(news): Last Chance Bailey 
also give a few more days for items
 2018-11-30 14:21:12 -06:00
Matteo Pagliazzi 2cbd78b139 Merge branch 'develop' into payments/paypal-amazon-checkout 2018-11-29 10:55:13 +01:00
Sabe Jones b82660823d Merge branch 'release' into develop 2018-11-28 20:57:37 +00:00
Sabe Jones f19e69948a feat(content): mystery items 2018-11 2018-11-28 14:50:43 -06:00
Phillip Thelen 1ece230621 remove console call 2018-11-28 12:52:08 -06:00
Phillip Thelen d934d9d759 Move group chat analytics event to server 2018-11-28 12:52:00 -06:00
Phillip Thelen 42b146d5d0 Attach client to chat messages (#10845) 
* Attach client to chat messages

* Word

* Design tweaks

* Fix potential error
 2018-11-26 10:45:42 +01:00
Sabe Jones 2cd66436bc Merge branch 'release' into develop 2018-11-22 18:05:28 -06:00
Sabe Jones 9cea86f4e0 feat(content): Turkey Day 2018 2018-11-22 15:05:03 -06:00
Matteo Pagliazzi 680c2162a7 paypal: new redirects 2018-11-21 11:19:55 +01:00
Sabe Jones 9562ba432f Merge branch 'release' into develop 2018-11-20 21:02:17 +00:00
Sabe Jones 37ae467fff feat(content): Frost Hatching Potions 2018-11-20 14:55:45 -06:00
Nathanael Farley ff81e55839 groupChatReceived webhook fix (#10802) 
* Moved sendGroupChatReceivedWebhooks to group.sendChat function.

* Added test for new functionality.
 2018-11-17 10:48:41 +01:00
Sabe Jones c2fe04367f feat(content): Oddballs Bundle 
Also includes one more tweak to @mention text highlighting
 2018-11-15 15:58:07 -06:00
Sabe Jones d406da4081 chore(news): Bailey 2018-11-14 08:30:34 -06:00
Sabe Jones d74786ef85 Merge branch 'sabrecat/usernames-master' into develop 2018-11-14 08:21:49 -06:00
Matteo Pagliazzi 1a7461a8a2 move the update username route to v3 (#10836) 2018-11-14 10:40:27 +01:00
Sabe Jones d691dee2ca fix(usernames): filter @ on server side for username lookup 2018-11-13 15:34:50 -06:00
Sabe Jones 481bd6727d fix(usernames): exclude unverified users during query 2018-11-13 15:13:41 -06:00
Sabe Jones 7484ecf729 Merge branch 'develop' into sabrecat/usernames-master 2018-11-08 15:13:28 -06:00
Sabe Jones 2789d44dbf chore(news): Bailey 2018-11-08 12:43:50 -06:00
Sabe Jones 1ac4dd8171 feat(usernames): invite by username 2018-11-07 15:00:22 -06:00
Sabe Jones 4f86abd6b2 Merge branch 'develop' into sabrecat/usernames-master 2018-11-07 08:39:57 -06:00
Sabe Jones 2dadd74097 Merge branch 'release' into develop 2018-11-06 16:53:35 -06:00
Sabe Jones ccc3b4d337 feat(content): Armoire and Backgrounds 2018/11 2018-11-06 14:31:50 -06:00
Sabe Jones 112e4e1d76 Merge branch 'develop' into sabrecat/usernames-master 2018-11-01 21:51:33 -05:00
Sabe Jones 830c8d3104 chore(event): end Habitoween/Fall Fest 
Also announce November challenges
 2018-11-01 21:44:00 -05:00
Sabe Jones 3922415314 fix(inbox): more UN display fixes 2018-11-01 17:41:27 -05:00
Sabe Jones 6ab08a7d52 fix(usernames): don't supply username in public fields if unverified 2018-11-01 15:32:40 -05:00
Sabe Jones eafa2f8cdd Merge branch 'release' into sabrecat/usernames-master 2018-11-01 14:51:28 -05:00
Sabe Jones 5792bc0000 feat(content): Habitoween 2018 2018-10-30 16:21:42 -05:00
Sabe Jones 8e05a1b489 Merge branch 'develop' into sabrecat/usernames-master 2018-10-26 15:45:55 -05:00
Sabe Jones 59436a8bf7 feat(content): Mystery Items Oct 2018 2018-10-25 16:31:00 -05:00
Sabe Jones 192dc26fbe Merge branch 'release' into develop 2018-10-23 22:50:49 +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
Matteo Pagliazzi d1b86e6c14 Remove code for Pusher (#10774) 
* remove pusher

* fix linting
 2018-10-23 13:25:52 +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
Sabe Jones 98473fcfaa chore(news): Bailey 2018-10-18 15:00:21 -05:00
Sabe Jones 273590716c Merge branch 'sabrecat/veteran-verified' into sabrecat/usernames-master 2018-10-17 15:29:44 -05:00
Sabe Jones c99855cef4 Merge branch 'sabrecat/force-username-modal' into sabrecat/usernames-master 2018-10-17 15:29:23 -05:00
Sabe Jones 044fe17757 feat(usernames): Veteran Pet ladder award for affected users 2018-10-17 14:43:33 -05:00
Sabe Jones 061d990e39 Merge branch 'release' into develop 2018-10-15 20:20:55 +00:00
Sabe Jones cfd19ac694 fix(usernames): various 
Better modal positioning
Correct text colors for input field
Don't show "already taken" if username has other errors
 2018-10-15 11:27:49 -05: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 fa1fef11d6 feat(usernames): modal to force verification 2018-10-13 12:53:16 -05:00