Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix markdown not being applied for a phone call description #3537

Merged
merged 3 commits into from
Feb 1, 2020
Merged

fix: fix markdown not being applied for a phone call description #3537

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d58bc3
fix: markdown is now properly applied for a phone call description
djaiss Feb 1, 2020
639c0fc
wip
djaiss Feb 1, 2020
3d03610
merge master
djaiss Feb 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
* Add vue data validations
* Add ability to edit activities
* Associate a photo to a gift
* New API method: get all the contacts for a given tag
* New API method: get all the contacts for a given tag

### Enhancements:

* Gift are now added and updated inline

### Fixes:

* Markdown is now properly applied for a phone call description
* Fix contacts list UX with 2 tabs opened
* Fix activity mock data seeder

Expand Down
2 changes: 1 addition & 1 deletion public/js/app.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
"/js/vendor.js": "/js/vendor.js?id=991c16db562427065447",
"/js/app.js": "/js/app.js?id=eced6ade2c2540152b18",
"/js/app.js": "/js/app.js?id=a5e4e9900f5031f30e20",
"/css/app-ltr.css": "/css/app-ltr.css?id=d7af037d2c663a04542f",
"/css/app-rtl.css": "/css/app-rtl.css?id=561a37d456b9d3e90c02",
"/css/stripe.css": "/css/stripe.css?id=76c70a7b11ae5f38a725",
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/people/calls/PhoneCallList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<span v-if="!call.content">
{{ $t('people.call_blank_desc', { name: call.contact.first_name }) }}
</span>
<span v-if="call.content" dir="auto" v-html="compiledMarkdown(call.content)"></span>
<span v-if="call.content" dir="auto" class="markdown" v-html="compiledMarkdown(call.content)"></span>
</div>

<!-- INLINE UPDATE DIV -->
Expand Down