TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2026-02-04 01:31:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-230' into 'master'

Browse Source 
Version 230

See merge request mohit.panjvani/crater-web!620
This commit is contained in:
Mohit Panjwani
2020-12-01 06:44:00 +00:00
parent 88bcb1c2b4 61fe16cab4
commit 805a287129
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Space/Updater.php
View File

@@ -30,7 +30,7 @@ class Updater
$data = json_decode($data); $data = json_decode($data);
if ($data->success && $data->version) { if ($data->success && $data->version && $data->version->extensions) {
$extensions = $data->version->extensions; $extensions = $data->version->extensions;
$extensionData = []; $extensionData = [];
foreach (json_decode($extensions) as $extension) { foreach (json_decode($extensions) as $extension) {

2
public/assets/css/crater.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/assets/js/app.js
View File

File diff suppressed because one or more lines are too long

4
public/mix-manifest.json
View File

@@ -1,4 +1,4 @@
{ {
"/assets/js/app.js": "/assets/js/app.js?id=1783cc4eb981af6b4a06", "/assets/js/app.js": "/assets/js/app.js?id=4b0accf5cfab2addac60",
"/assets/css/crater.css": "/assets/css/crater.css?id=672d21e2c7c182b9da75" "/assets/css/crater.css": "/assets/css/crater.css?id=bd085810e0311282c464"
} }

23
resources/assets/js/views/settings/UpdateApp.vue
View File

@@ -36,8 +36,11 @@
}}</label }}</label
><br /> ><br />
<label class="version">{{ updateData.version }}</label> <label class="version">{{ updateData.version }}</label>
<p class="page-sub-title" style="white-space: pre-wrap;"> <p
{{ description }} class="page-sub-title"
style="white-space: pre-wrap;"
v-html="description"
>
</p> </p>
<label class="input-label"> <label class="input-label">
{{ $t('settings.update_app.requirements') }} {{ $t('settings.update_app.requirements') }}
@@ -60,6 +63,7 @@
icon="rocket" icon="rocket"
color="theme" color="theme"
class="mt-5" class="mt-5"
v-if="hasUiUpdate"
@click="onUpdateApp" @click="onUpdateApp"
> >
{{ $t('settings.update_app.update') }} {{ $t('settings.update_app.update') }}
@@ -82,12 +86,12 @@
<li class="update-step" v-for="step in updateSteps"> <li class="update-step" v-for="step in updateSteps">
<p class="update-step-text">{{ $t(step.translationKey) }}</p> <p class="update-step-text">{{ $t(step.translationKey) }}</p>
<div class="update-status-container"> <div class="update-status-container">
<span v-if="step.time" class="update-time">{{ <span v-if="step.time" class="update-time">
step.time {{step.time}}
}}</span> </span>
<span :class="'update-status status-' + getStatus(step)">{{ <span :class="'update-status status-' + getStatus(step)">
getStatus(step) {{getStatus(step)}}
}}</span> </span>
</div> </div>
</li> </li>
</ul> </ul>
@@ -163,6 +167,9 @@ export default {
}) })
} }
}, },
hasUiUpdate() {
return this.updateData.version != '4.0.0'
}
}, },
created() { created() {
window.addEventListener('beforeunload', (event) => { window.addEventListener('beforeunload', (event) => {