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

1900 Commits

Author SHA1 Message Date
Sabe Jones de0c62a37f Merge branch 'release' into develop 2018-11-30 20:28:23 +00: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 ac0601630e Merge branch 'develop' into payments/paypal-amazon-checkout 2018-11-30 16:11:55 +01:00
Matteo Pagliazzi 3239491144 fix(lint): remove unused params 2018-11-30 16:04:56 +01:00
negue b912a83f22 refactor "formatUser" to show the correct user and displayname 2018-11-29 20:15:47 +01:00
negue fb3a9740bd add display name to the email variables 2018-11-29 20:00:05 +01:00
negue 817c943860 Merge remote-tracking branch 'origin/develop' into negue/flagpm 2018-11-29 19:02:01 +01:00
negue 0aba448c48 fix sentence 2018-11-29 19:01:26 +01:00
Sabe Jones b218eb2c00 Merge remote-tracking branch 'origin/greenkeeper/update-to-node-10' into release 
also remove Kafka
 2018-11-29 14:51:40 +00:00
Matteo Pagliazzi 7f2e12ba23 remove memwatch-next, try/catch 2018-11-29 14:35:22 +01:00
Sabe Jones 357b48dc8f fix(server): update package lock, attempt to log crashes 2018-11-29 12:11:03 +00: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
Sabe Jones e6807d36b5 fix(analytics): record usernames 2018-11-28 13:02:48 -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 8641a98107 Merge branch 'develop' into phillip/autocomplete-username 2018-11-28 14:02:35 +01:00
Matteo Pagliazzi bf7fabb20a fix(amazon): add new env variable to specify environment 2018-11-28 11:07:06 +01:00
Phillip Thelen 664a457b47 Merge branch 'develop' into phillip/autocomplete-username 2018-11-27 15:47:00 +01:00
Sabe Jones 8c1208031d chore(event): end Thanksgiving tweaks 2018-11-27 15:42:28 +01:00
Phillip Thelen aac23f30cf Attach client to chat messages (#10845) 
* Attach client to chat messages

* Word

* Design tweaks

* Fix potential error
 2018-11-27 15:42:28 +01:00
Sabe Jones 916d930a83 feat(content): Turkey Day 2018 2018-11-27 15:41:42 +01:00
Alys 21f14d55b7 add two slurs - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc 2018-11-27 15:41:42 +01:00
Sabe Jones d661c7260e feat(content): Frost Hatching Potions 2018-11-27 15:41:41 +01:00
Matteo Pagliazzi 1ccb700b3f Fix for #10814, prevent ParallelSave errors (#10852) 
* fix(group leave): prevent ParallelSave errors while leaving a group with multiple group or challenge tasks

* fix typo
 2018-11-27 15:41:41 +01:00
Nathanael Farley f5a2cf6726 groupChatReceived webhook fix (#10802) 
* Moved sendGroupChatReceivedWebhooks to group.sendChat function.

* Added test for new functionality.
 2018-11-27 15:40:41 +01:00
Sabe Jones 62bcd878a0 feat(content): Oddballs Bundle 
Also includes one more tweak to @mention text highlighting
 2018-11-27 15:40:40 +01:00
Sabe Jones e548074bc1 chore(news): Bailey 2018-11-27 15:40:40 +01:00
Phillip Thelen f65240c217 Fix issue with username highlighting 2018-11-27 13:20:45 +01:00
Phillip Thelen 0271d98b91 Add Test to opt out of username being searchable 2018-11-27 13:20:26 +01:00
Sabe Jones 7b687280d7 Merge branch 'release' into develop 2018-11-26 19:10:05 +00:00
Sabe Jones 33e0892e95 chore(event): end Thanksgiving tweaks 2018-11-26 12:59:23 -06:00
Phillip Thelen e9c86622c5 Begin adding server-side autocomplete to web client 2018-11-26 15:47:22 +01: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
Alys a2b38ffb02 add two slurs - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc 2018-11-21 19:48:50 +10: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
negue 52a7112591 some ui fixes / requested changes 2018-11-20 17:20:58 +01:00
negue 3203bffeaa refactor update the message to use .save - fix test 2018-11-18 22:37:09 +01:00
negue 8b15d94ae1 Merge remote-tracking branch 'origin/develop' into negue/flagpm 
# Conflicts:
#	website/client/components/chat/chatCard.vue
#	website/client/components/chat/chatMessages.vue
#	website/common/locales/en/messages.json
 2018-11-18 22:04:33 +01:00
Matteo Pagliazzi e76bdbd62d Fix for #10814, prevent ParallelSave errors (#10852) 
* fix(group leave): prevent ParallelSave errors while leaving a group with multiple group or challenge tasks

* fix typo
 2018-11-18 20:48:16 +01: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
Phillip Thelen aae2fb1cb9 Create links to users profile in chat messages 2018-11-15 14:27:14 +01:00
Phillip Thelen 39761bdc04 Add API Call to retrieve auto-complete options for usernames 2018-11-15 12:01:26 +01:00
Sabe Jones d406da4081 chore(news): Bailey 2018-11-14 08:30:34 -06:00