Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
libern committed Jul 21, 2016
2 parents a0854e8 + c2c4b4b commit 52a7815
Show file tree
Hide file tree
Showing 17 changed files with 28 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function up()
{
Schema::create('oauth_scopes', function (Blueprint $table) {
$table->string('id', 40)->primary();
$table->string('description');
$table->string('description', 190);

$table->timestamps();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function up()
Schema::create('oauth_clients', function (BluePrint $table) {
$table->string('id', 40)->primary();
$table->string('secret', 40);
$table->string('name');
$table->string('name', 190);
$table->timestamps();

$table->unique(['id', 'secret']);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function up()
Schema::create('oauth_client_endpoints', function (Blueprint $table) {
$table->increments('id');
$table->string('client_id', 40);
$table->string('redirect_uri');
$table->string('redirect_uri', 190);

$table->timestamps();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ public function up()
$table->increments('id');
$table->string('client_id', 40);
$table->enum('owner_type', ['client', 'user'])->default('user');
$table->string('owner_id');
$table->string('client_redirect_uri')->nullable();
$table->string('owner_id', 100);
$table->string('client_redirect_uri', 190)->nullable();
$table->timestamps();

$table->index(['client_id', 'owner_type', 'owner_id']);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function up()
Schema::create('oauth_auth_codes', function (Blueprint $table) {
$table->string('id', 40)->primary();
$table->integer('session_id')->unsigned();
$table->string('redirect_uri');
$table->string('redirect_uri', 190);
$table->integer('expire_time');

$table->timestamps();
Expand Down
6 changes: 3 additions & 3 deletions database/migrations/2014_10_12_000000_create_users_table.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ public function up()
Schema::create('users', function (Blueprint $table) {
$table->increments('user_id');
$table->unsignedInteger('slid');
$table->string('name');
$table->string('name', 50);
$table->char('gender', 1);
$table->date('birthday');
$table->char('country', 2)->default('US');
$table->string('timezone', 30)->default('UTC');
$table->string('locale', 15)->default('en');
$table->string('username', 50)->nullable();
$table->string('phone_number')->nullable();
$table->string('email')->unique();
$table->string('password');
$table->string('email', 150)->unique();
$table->string('password', 190);
$table->rememberToken();
$table->tinyInteger('status')->default(0);
$table->unsignedInteger('created_by')->nullable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ class CreatePasswordResetsTable extends Migration
public function up()
{
Schema::create('password_resets', function (Blueprint $table) {
$table->string('email')->index();
$table->string('token')->index();
$table->string('email', 190)->index();
$table->string('token', 190)->index();
$table->timestamp('created_at');
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16803,7 +16803,7 @@ exports.default = {
msg: "hello"
},
components: {
'lt-user-list': _UserList2.default
'sl-user-list': _UserList2.default
},
methods: {},
events: {},
Expand Down Expand Up @@ -16914,7 +16914,7 @@ exports.default = {
},

components: {
'lt-user-list-item': _UserListGroupItem2.default
'sl-user-list-item': _UserListGroupItem2.default
},
http: {
root: '/api',
Expand All @@ -16938,7 +16938,7 @@ exports.default = {
}
};
if (module.exports.__esModule) module.exports = module.exports.default
;(typeof module.exports === "function"? module.exports.options: module.exports).template = "\n\n<div class=\"list-group list-group-lg list-group-sp\">\n <template v-for=\"item of items\">\n <div class=\"col-md-4 m-b-sm\">\n <lt-user-list-item :item=\"item\"></lt-user-list-item>\n </div>\n </template>\n</div>\n\n"
;(typeof module.exports === "function"? module.exports.options: module.exports).template = "\n\n<div class=\"list-group list-group-lg list-group-sp\">\n <template v-for=\"item of items\">\n <div class=\"col-md-4 m-b-sm\">\n <sl-user-list-item :item=\"item\"></sl-user-list-item>\n </div>\n </template>\n</div>\n\n"
if (module.hot) {(function () { module.hot.accept()
var hotAPI = require("vue-hot-reload-api")
hotAPI.install(require("vue"), true)
Expand Down
2 changes: 1 addition & 1 deletion public/build/js/app.src.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/build/rev-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"css/app.src.css": "css/app.src-a3d206c279.css",
"js/app.src.js": "js/app.src-a5f60d77a9.js"
"js/app.src.js": "js/app.src-78aea49182.js"
}
6 changes: 3 additions & 3 deletions public/js/app.src.js
Original file line number Diff line number Diff line change
Expand Up @@ -16803,7 +16803,7 @@ exports.default = {
msg: "hello"
},
components: {
'lt-user-list': _UserList2.default
'sl-user-list': _UserList2.default
},
methods: {},
events: {},
Expand Down Expand Up @@ -16914,7 +16914,7 @@ exports.default = {
},

components: {
'lt-user-list-item': _UserListGroupItem2.default
'sl-user-list-item': _UserListGroupItem2.default
},
http: {
root: '/api',
Expand All @@ -16938,7 +16938,7 @@ exports.default = {
}
};
if (module.exports.__esModule) module.exports = module.exports.default
;(typeof module.exports === "function"? module.exports.options: module.exports).template = "\n\n<div class=\"list-group list-group-lg list-group-sp\">\n <template v-for=\"item of items\">\n <div class=\"col-md-4 m-b-sm\">\n <lt-user-list-item :item=\"item\"></lt-user-list-item>\n </div>\n </template>\n</div>\n\n"
;(typeof module.exports === "function"? module.exports.options: module.exports).template = "\n\n<div class=\"list-group list-group-lg list-group-sp\">\n <template v-for=\"item of items\">\n <div class=\"col-md-4 m-b-sm\">\n <sl-user-list-item :item=\"item\"></sl-user-list-item>\n </div>\n </template>\n</div>\n\n"
if (module.hot) {(function () { module.hot.accept()
var hotAPI = require("vue-hot-reload-api")
hotAPI.install(require("vue"), true)
Expand Down
2 changes: 1 addition & 1 deletion public/js/app.src.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/js/main.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default {
msg: "hello",
},
components: {
'lt-user-list': UserList,
'sl-user-list': UserList,
},
methods: {
},
Expand Down
4 changes: 2 additions & 2 deletions resources/assets/js/vue/components/UserList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="list-group list-group-lg list-group-sp">
<template v-for="item of items">
<div class="col-md-4 m-b-sm">
<lt-user-list-item :item="item"></lt-user-list-item>
<sl-user-list-item :item="item"></sl-user-list-item>
</div>
</template>
</div>
Expand All @@ -23,7 +23,7 @@
}
},
components: {
'lt-user-list-item': UserListGroupItem,
'sl-user-list-item': UserListGroupItem,
},
http: {
root: '/api',
Expand Down
2 changes: 1 addition & 1 deletion resources/views/users/user_list.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<div class="row">

<lt-user-list></lt-user-list>
<sl-user-list></sl-user-list>

</div>

Expand Down

0 comments on commit 52a7815

Please sign in to comment.