ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Graham Campbell
2016-12-29 13:03:32 +00:00
parent 077d404c5f b43890c11f
commit 36875bb98e
8 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/Example.vue
View File

@@ -17,7 +17,7 @@
<script>
export default {
mounted() {
console.log('Component ready.')
console.log('Component mounted.')
}
}
</script>

2
resources/lang/en/validation.php
View File

@@ -16,11 +16,13 @@ return [
'accepted' => 'The :attribute must be accepted.',
'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.',
'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
'alpha' => 'The :attribute may only contain letters.',
'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
'alpha_num' => 'The :attribute may only contain letters and numbers.',
'array' => 'The :attribute must be an array.',
'before' => 'The :attribute must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
'between' => [
'numeric' => 'The :attribute must be between :min and :max.',
'file' => 'The :attribute must be between :min and :max kilobytes.',