Skip to content

Commit

Permalink
Merge branch 'release/6.0.30'
Browse files Browse the repository at this point in the history
* release/6.0.30:
  security updates
  • Loading branch information
austintoddj committed May 19, 2021
2 parents 31ccb01 + 5d43fd6 commit 9fc68dd
Show file tree
Hide file tree
Showing 8 changed files with 331 additions and 317 deletions.
2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"/js/app.js": "/js/app.js?id=a0c62bbdf91956aed9af",
"/js/app.js": "/js/app.js?id=12611dab434f5000f0f9",
"/css/app.css": "/css/app.css?id=17b9084a51cfbf270aa4"
}
8 changes: 7 additions & 1 deletion resources/js/components/modals/PublishModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@

<div class="row">
<div
class="col-sm-6 col-12 pb-sm-0 pb-3 pr-sm-0 d-flex justify-content-center justify-content-sm-start"
class="
col-sm-6 col-12
pb-sm-0 pb-3
pr-sm-0
d-flex
justify-content-center justify-content-sm-start
"
>
<div class="d-flex align-items-center">
<select
Expand Down
5 changes: 2 additions & 3 deletions resources/js/mixins/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ export default {
request() {
let instance = axios.create();

instance.defaults.headers.common['X-CSRF-TOKEN'] = document.head.querySelector(
'meta[name="csrf-token"]'
).content;
instance.defaults.headers.common['X-CSRF-TOKEN'] =
document.head.querySelector('meta[name="csrf-token"]').content;

instance.defaults.baseURL = store.state.settings.path;

Expand Down
5 changes: 2 additions & 3 deletions resources/js/ui/mixins/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ export default {
request() {
let instance = axios.create();

instance.defaults.headers.common['X-CSRF-TOKEN'] = document.head.querySelector(
'meta[name="csrf-token"]'
).content;
instance.defaults.headers.common['X-CSRF-TOKEN'] =
document.head.querySelector('meta[name="csrf-token"]').content;
instance.defaults.baseURL = '/canvas-ui';

const requestHandler = (request) => {
Expand Down
20 changes: 18 additions & 2 deletions resources/js/views/AllStats.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,15 @@
<div class="card-deck mt-4 pt-2">
<div class="card shadow-lg">
<div
class="card-header pb-0 bg-transparent d-flex justify-content-between align-middle border-0"
class="
card-header
pb-0
bg-transparent
d-flex
justify-content-between
align-middle
border-0
"
>
<p class="font-weight-bold text-muted small text-uppercase">{{ trans.views }}</p>
<p>
Expand All @@ -44,7 +52,15 @@
</div>
<div class="card shadow-lg">
<div
class="card-header pb-0 bg-transparent d-flex justify-content-between align-middle border-0"
class="
card-header
pb-0
bg-transparent
d-flex
justify-content-between
align-middle
border-0
"
>
<p class="font-weight-bold text-muted small text-uppercase">{{ trans.visitors }}</p>
<p>
Expand Down
604 changes: 299 additions & 305 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 9fc68dd

Please sign in to comment.