]>
BookStack Code Mirror - bookstack/commitdiff
projects
/
bookstack
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
inline
| side by side (parent:
6ded178
)
Fixed empty app name and missing bower dependancy
author
Dan Brown
<redacted>
Thu, 3 Sep 2015 18:52:11 +0000
(19:52 +0100)
committer
Dan Brown
<redacted>
Thu, 3 Sep 2015 18:52:11 +0000
(19:52 +0100)
bower.json
patch
|
blob
|
history
resources/views/settings/index.blade.php
patch
|
blob
|
history
diff --git
a/bower.json
b/bower.json
index 671b0a1648a33f4ba3105f3d929cbf3902ce8b90..5d991b0f22b9d7d663582d520fc1fe273f9ec8ce 100644
(file)
--- a/
bower.json
+++ b/
bower.json
@@
-19,6
+19,7
@@
"bootstrap": "~3.3.5",
"jquery-sortable": "~0.9.13",
"material-design-iconic-font": "~2.1.1",
"bootstrap": "~3.3.5",
"jquery-sortable": "~0.9.13",
"material-design-iconic-font": "~2.1.1",
- "vue": "~0.12.10"
+ "vue": "~0.12.10",
+ "vue-resource": "~0.1.15"
}
}
}
}
diff --git
a/resources/views/settings/index.blade.php
b/resources/views/settings/index.blade.php
index 8c5401747770c134cb928cf722318dd745738e04..72d62f73349276ced926ba801d7e17a8393fe669 100644
(file)
--- a/
resources/views/settings/index.blade.php
+++ b/
resources/views/settings/index.blade.php
@@
-12,7
+12,7
@@
{!! csrf_field() !!}
<div class="form-group">
<label for="setting-app-name">Application Name</label>
{!! csrf_field() !!}
<div class="form-group">
<label for="setting-app-name">Application Name</label>
- <input type="text" value="{{ Setting::get('app-name') }}" name="setting-app-name" id="setting-app-name">
+ <input type="text" value="{{ Setting::get('app-name'
, 'BookStack'
) }}" name="setting-app-name" id="setting-app-name">
</div>
<div class="form-group">
<label for="setting-app-public">Allow public viewing?</label>
</div>
<div class="form-group">
<label for="setting-app-public">Allow public viewing?</label>