kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Firefly III can now handle "channels" in its releases.

Browse Source
This commit is contained in:
James Cole
2019-10-26 14:42:51 +02:00
parent 778e0bcbae
commit be0e2bf6a7
10 changed files with 216 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/lang/en_US/firefly.php
View File

@@ -228,6 +228,11 @@ return [
'update_current_version_alert' => 'You are running v:version, which is the latest available release.',
'update_newer_version_alert' => 'You are running v:your_version, which is newer than the latest release, v:new_version.',
'update_check_error' => 'An error occurred while checking for updates. Please view the log files.',
'admin_update_channel_title' => 'Update channel',
'admin_update_channel_explain' => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
'update_channel_stable' => 'Stable. Everything should work as expected.',
'update_channel_beta' => 'Beta. New features but things may be broken.',
'update_channel_alpha' => 'Alpha. We throw stuff in, and use whatever sticks.',
// search
'search' => 'Search',

1
resources/lang/en_US/form.php
View File

@@ -38,6 +38,7 @@ return [
'match' => 'Matches on',
'strict' => 'Strict mode',
'repeat_freq' => 'Repeats',
'update_channel' => 'Update channel',
'journal_currency_id' => 'Currency',
'currency_id' => 'Currency',
'transaction_currency_id' => 'Currency',

14
resources/views/v1/admin/update/index.twig
View File

@@ -10,6 +10,20 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ 'admin_update_channel_title'|_ }}</h3>
</div>
<div class="box-body">
<p class="text-info">
{{ 'admin_update_channel_explain'|_ }}
</p>
{{ ExpandedForm.select('update_channel', channelOptions, channelSelected) }}
</div>
</div>
</div>
{# do update check. #}
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
<div class="box box-default">