Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/laravel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: laravel-ja/laravel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
1 contributor

Commits on Aug 11, 2013

  1. initial commit

    @HiroKws
    HiroKws committed Aug 11, 2013
    Copy the full SHA
    cc3261a View commit details

  2. translated readme

    @HiroKws
    HiroKws committed Aug 11, 2013
    Copy the full SHA
    41b99ed View commit details

Commits on Aug 12, 2013

  1. added ippatu-kun shell script

    @HiroKws
    HiroKws committed Aug 12, 2013
    Copy the full SHA
    22c45af View commit details

  2. more ippatsu-kun

    @HiroKws
    HiroKws committed Aug 12, 2013
    Copy the full SHA
    01779aa View commit details

  3. to packagist

    @HiroKws
    HiroKws committed Aug 12, 2013
    Copy the full SHA
    96d9e31 View commit details

  4. correct composer.json

    @HiroKws
    HiroKws committed Aug 12, 2013
    Copy the full SHA
    c68ff34 View commit details

Commits on Aug 26, 2013

  1. only English changed. No affected in Japamese

    @HiroKws
    HiroKws committed Aug 26, 2013
    Copy the full SHA
    1d6c60f View commit details

  2. added e flag into all script

    @HiroKws
    HiroKws committed Aug 26, 2013
    Copy the full SHA
    a8032ea View commit details

  3. used Prepper and more ippatsu install packages.

    @HiroKws
    HiroKws committed Aug 26, 2013
    Copy the full SHA
    6204926 View commit details

  4. no message when no install

    @HiroKws
    HiroKws committed Aug 26, 2013
    Copy the full SHA
    3f1b88d View commit details

Commits on Aug 30, 2013

  1. automatic execute prepper-start.sh after install/create-project

    @HiroKws
    HiroKws committed Aug 30, 2013
    Copy the full SHA
    cb755d1 View commit details

  2. change composer.json

    @HiroKws
    HiroKws committed Aug 30, 2013
    Copy the full SHA
    bfc6834 View commit details

  3. delete script when create project

    @HiroKws
    HiroKws committed Aug 30, 2013
    Copy the full SHA
    6c85196 View commit details

Commits on Sep 25, 2013

  1. reflected comment changes. also remove key generation command from co… 

    …mposer.json as original did.
    @HiroKws
    HiroKws committed Sep 25, 2013
    Copy the full SHA
    bd66d7a View commit details

Commits on Sep 26, 2013

  1. added key:genereate into install section again.

    @HiroKws
    HiroKws committed Sep 26, 2013
    Copy the full SHA
    7e86229 View commit details

Commits on Oct 31, 2013

  1. reflected origina change. Almost comment fixed.

    @HiroKws
    HiroKws committed Oct 31, 2013
    Copy the full SHA
    b783f9a View commit details

Commits on Dec 13, 2013

  1. 4.1.0

    @HiroKws
    HiroKws committed Dec 13, 2013
    Copy the full SHA
    c062e90 View commit details

Commits on Feb 28, 2014

  1. 4.1.22 Based

    @HiroKws
    HiroKws committed Feb 28, 2014
    Copy the full SHA
    7f98b48 View commit details

Commits on Mar 12, 2014

  1. translated database config file

    @HiroKws
    HiroKws committed Mar 12, 2014
    Copy the full SHA
    90b5adc View commit details

Commits on Apr 17, 2014

  1. 4.1.27

    @HiroKws
    HiroKws committed Apr 17, 2014
    Copy the full SHA
    b8a2f17 View commit details

  2. add missing storage directory

    @HiroKws
    HiroKws committed Apr 17, 2014
    Copy the full SHA
    fba3315 View commit details

Commits on Jun 3, 2014

  1. Released 4.2

    @HiroKws
    HiroKws committed Jun 3, 2014
    Copy the full SHA
    1c1c664 View commit details

Commits on Aug 22, 2014

  1. 2014年8月23日変更取り込み

    @HiroKws
    HiroKws committed Aug 22, 2014
    Copy the full SHA
    99079bf View commit details
Showing with 960 additions and 612 deletions.
  1. +1 −1 .gitattributes
  2. +4 −1 .gitignore
  3. +1 −1 CONTRIBUTING.md
  4. +88 −78 app/config/app.php
  5. +22 −18 app/config/auth.php
  6. +25 −25 app/config/cache.php
  7. +5 −5 app/config/compile.php
  8. +28 −28 app/config/database.php
  9. +18 −0 app/config/local/app.php
  10. +47 −0 app/config/local/database.php
  11. +38 −38 app/config/mail.php
  12. +35 −10 app/config/queue.php
  13. +59 −0 app/config/remote.php
  14. +31 −0 app/config/services.php
  15. +53 −38 app/config/session.php
  16. +6 −6 app/config/testing/cache.php
  17. +5 −5 app/config/testing/session.php
  18. +9 −9 app/config/view.php
  19. +9 −9 app/config/workbench.php
  20. +2 −2 app/controllers/BaseController.php
  21. +5 −5 app/controllers/HomeController.php
  22. +1 −0 app/database/.gitignore
  23. +2 −2 app/database/seeds/DatabaseSeeder.php
  24. +28 −18 app/filters.php
  25. +6 −6 app/lang/en/pagination.php
  26. +12 −8 app/lang/en/reminders.php
  27. +60 −52 app/lang/en/validation.php
  28. +20 −0 app/lang/ja/pagination.php
  29. +26 −0 app/lang/ja/reminders.php
  30. +106 −0 app/lang/ja/validation.php
  31. +8 −34 app/models/User.php
  32. +5 −5 app/routes.php
  33. +4 −4 app/start/artisan.php
  34. +24 −26 app/start/global.php
  35. +1 −1 app/start/local.php
  36. +2 −2 app/tests/ExampleTest.php
  37. +2 −2 app/tests/TestCase.php
  38. +4 −3 app/views/emails/auth/reminder.blade.php
  39. +31 −41 app/views/hello.php
  40. +26 −26 artisan
  41. +21 −21 bootstrap/autoload.php
  42. +16 −16 bootstrap/paths.php
  43. +23 −24 bootstrap/start.php
  44. +6 −5 composer.json
  45. +1 −1 phpunit.xml
  46. +10 −3 public/.htaccess
  47. +16 −29 public/index.php
  48. +5 −1 readme.md
  49. +3 −3 server.php
2 changes: 1 addition & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* text=auto
* text=auto
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -2,4 +2,7 @@
/vendor
composer.phar
composer.lock
.DS_Store
.env.*.php
.env.php
.DS_Store
Thumbs.db
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Contribution Guidelines

Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!
Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!
166 changes: 88 additions & 78 deletions app/config/app.php
View file
Original file line number Diff line number Diff line change
@@ -4,77 +4,92 @@

/*
|--------------------------------------------------------------------------
| Application Debug Mode
| アプリケーションのデバッグモード
|--------------------------------------------------------------------------
|
| When your application is in debug mode, detailed error messages with
| stack traces will be shown on every error that occurs within your
| application. If disabled, a simple generic error page is shown.
| アプリケーションをデバッグモードにすると、アプリケーションでエラーが発生する
| たびにスタックトレースともに、詳細なエラーメッセージが表示されます。
| このモードでない場合、シンプルで一般利用者向きなエラーページが表示されます。
|
*/

'debug' => true,
'debug' => false,

/*
|--------------------------------------------------------------------------
| Application URL
| アプリケーションURL
|--------------------------------------------------------------------------
|
| This URL is used by the console to properly generate URLs when using
| the Artisan command line tool. You should set this to the root of
| your application so that it is used when running Artisan tasks.
| このURLはArtisanコマンドラインツールを使用する時に正しい
| URLを生成するために使用します。アプリケーションのルートのURLを設定してください。
| Artisanコマンドを実行する時に使用されます。
|
*/

'url' => 'http://localhost',

/*
|--------------------------------------------------------------------------
| Application Timezone
| アプリケーションタイムゾーン
|--------------------------------------------------------------------------
|
| Here you may specify the default timezone for your application, which
| will be used by the PHP date and date-time functions. We have gone
| ahead and set this to a sensible default for you out of the box.
| ここではアプリケーションのデフォルトタイムゾーンを指定します。これは
| PHPの日付／時間関数で使用されます。最初から未設定でも使用できるように
| 適切なデフォルトを設定してあります。
|
*/

'timezone' => 'UTC',

/*
|--------------------------------------------------------------------------
| Application Locale Configuration
| アプリケーションローカル設定
|--------------------------------------------------------------------------
|
| The application locale determines the default locale that will be used
| by the translation service provider. You are free to set this value
| to any of the locales which will be supported by the application.
| アプリケーションローカルは翻訳サービスプロバイダーにより使用される
| デフォルトローカルを指定します。アプリケーションで提供するローカルを
| 自由に設定してください。
|
*/

'locale' => 'en',

/*
|--------------------------------------------------------------------------
| Encryption Key
| アプリケーションフォールバック言語
|--------------------------------------------------------------------------
|
| This key is used by the Illuminate encrypter service and should be set
| to a random, 32 character string, otherwise these encrypted strings
| will not be safe. Please do this before deploying an application!
| フォールバック言語は現在のローカルが使用できない場合に、
| 代替として使われます。アプリケーション全体に対して用意されている
| 言語フォルダーに対応するコードであればどれでも使用可能です。
|
*/

'fallback_locale' => 'en',

/*
|--------------------------------------------------------------------------
| 暗号化キー
|--------------------------------------------------------------------------
|
| このキーはIlluminate暗号化サービスで使用されます。ランダムな32文字を
| セットしないと安全ではありません。アプリケーションをデプロイ
| する前に、必ず変更してください。
|
*/

'key' => 'YourSecretKey!!!',

'cipher' => MCRYPT_RIJNDAEL_128,

/*
|--------------------------------------------------------------------------
| Autoloaded Service Providers
| オートロードサービスプロバイダー
|--------------------------------------------------------------------------
|
| The service providers listed here will be automatically loaded on the
| request to your application. Feel free to add your own services to
| this array to grant expanded functionality to your applications.
| ここにリストしたサービスプロバイダーはアプリケーションのリクエストに対し
| 自動的にロードされます。アプリケーションの機能を拡張するため、この配列へ
| 自由に自分のサービスを付け加えてください。
|
*/

@@ -83,32 +98,25 @@
'Illuminate\Foundation\Providers\ArtisanServiceProvider',
'Illuminate\Auth\AuthServiceProvider',
'Illuminate\Cache\CacheServiceProvider',
'Illuminate\Foundation\Providers\CommandCreatorServiceProvider',
'Illuminate\Session\CommandsServiceProvider',
'Illuminate\Foundation\Providers\ComposerServiceProvider',
'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
'Illuminate\Routing\ControllerServiceProvider',
'Illuminate\Cookie\CookieServiceProvider',
'Illuminate\Database\DatabaseServiceProvider',
'Illuminate\Encryption\EncryptionServiceProvider',
'Illuminate\Filesystem\FilesystemServiceProvider',
'Illuminate\Hashing\HashServiceProvider',
'Illuminate\Html\HtmlServiceProvider',
'Illuminate\Foundation\Providers\KeyGeneratorServiceProvider',
'Illuminate\Log\LogServiceProvider',
'Illuminate\Mail\MailServiceProvider',
'Illuminate\Foundation\Providers\MaintenanceServiceProvider',
'Illuminate\Database\MigrationServiceProvider',
'Illuminate\Foundation\Providers\OptimizeServiceProvider',
'Illuminate\Pagination\PaginationServiceProvider',
'Illuminate\Foundation\Providers\PublisherServiceProvider',
'Illuminate\Queue\QueueServiceProvider',
'Illuminate\Redis\RedisServiceProvider',
'Illuminate\Remote\RemoteServiceProvider',
'Illuminate\Auth\Reminders\ReminderServiceProvider',
'Illuminate\Foundation\Providers\RouteListServiceProvider',
'Illuminate\Database\SeedServiceProvider',
'Illuminate\Foundation\Providers\ServerServiceProvider',
'Illuminate\Session\SessionServiceProvider',
'Illuminate\Foundation\Providers\TinkerServiceProvider',
'Illuminate\Translation\TranslationServiceProvider',
'Illuminate\Validation\ValidationServiceProvider',
'Illuminate\View\ViewServiceProvider',
@@ -118,66 +126,68 @@

/*
|--------------------------------------------------------------------------
| Service Provider Manifest
| サービスプロバイダーマニフェスト
|--------------------------------------------------------------------------
|
| The service provider manifest is used by Laravel to lazy load service
| providers which are not needed for each request, as well to keep a
| list of all of the services. Here, you may set its storage spot.
| サービスプロバイダーマニフェストはLaravelにより使用され、リクエストのたびに
| 必要ではないサービスプロバイダーを後からロードするために使用される、
| 全サービスのリストです。ここでは、保存箇所を指定します。
|
*/

'manifest' => storage_path().'/meta',

/*
|--------------------------------------------------------------------------
| Class Aliases
| クラスエイリアス
|--------------------------------------------------------------------------
|
| This array of class aliases will be registered when this application
| is started. However, feel free to register as many as you wish as
| the aliases are "lazy" loaded so they don't hinder performance.
| このクラスエイリアスの配列はこのアプリケーションが開始されると登録されます。
| エイリアスをどんなに好きなだけ自由に登録しても、「遅延」ロードされるので、
| パフォーマンスを妨げることはありません。
|
*/

'aliases' => array(

'App' => 'Illuminate\Support\Facades\App',
'Artisan' => 'Illuminate\Support\Facades\Artisan',
'Auth' => 'Illuminate\Support\Facades\Auth',
'Blade' => 'Illuminate\Support\Facades\Blade',
'Cache' => 'Illuminate\Support\Facades\Cache',
'ClassLoader' => 'Illuminate\Support\ClassLoader',
'Config' => 'Illuminate\Support\Facades\Config',
'Controller' => 'Illuminate\Routing\Controllers\Controller',
'Cookie' => 'Illuminate\Support\Facades\Cookie',
'Crypt' => 'Illuminate\Support\Facades\Crypt',
'DB' => 'Illuminate\Support\Facades\DB',
'Eloquent' => 'Illuminate\Database\Eloquent\Model',
'Event' => 'Illuminate\Support\Facades\Event',
'File' => 'Illuminate\Support\Facades\File',
'Form' => 'Illuminate\Support\Facades\Form',
'Hash' => 'Illuminate\Support\Facades\Hash',
'HTML' => 'Illuminate\Support\Facades\HTML',
'Input' => 'Illuminate\Support\Facades\Input',
'Lang' => 'Illuminate\Support\Facades\Lang',
'Log' => 'Illuminate\Support\Facades\Log',
'Mail' => 'Illuminate\Support\Facades\Mail',
'Paginator' => 'Illuminate\Support\Facades\Paginator',
'Password' => 'Illuminate\Support\Facades\Password',
'Queue' => 'Illuminate\Support\Facades\Queue',
'Redirect' => 'Illuminate\Support\Facades\Redirect',
'Redis' => 'Illuminate\Support\Facades\Redis',
'Request' => 'Illuminate\Support\Facades\Request',
'Response' => 'Illuminate\Support\Facades\Response',
'Route' => 'Illuminate\Support\Facades\Route',
'Schema' => 'Illuminate\Support\Facades\Schema',
'Seeder' => 'Illuminate\Database\Seeder',
'Session' => 'Illuminate\Support\Facades\Session',
'Str' => 'Illuminate\Support\Str',
'URL' => 'Illuminate\Support\Facades\URL',
'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View',
'App' => 'Illuminate\Support\Facades\App',
'Artisan' => 'Illuminate\Support\Facades\Artisan',
'Auth' => 'Illuminate\Support\Facades\Auth',
'Blade' => 'Illuminate\Support\Facades\Blade',
'Cache' => 'Illuminate\Support\Facades\Cache',
'ClassLoader' => 'Illuminate\Support\ClassLoader',
'Config' => 'Illuminate\Support\Facades\Config',
'Controller' => 'Illuminate\Routing\Controller',
'Cookie' => 'Illuminate\Support\Facades\Cookie',
'Crypt' => 'Illuminate\Support\Facades\Crypt',
'DB' => 'Illuminate\Support\Facades\DB',
'Eloquent' => 'Illuminate\Database\Eloquent\Model',
'Event' => 'Illuminate\Support\Facades\Event',
'File' => 'Illuminate\Support\Facades\File',
'Form' => 'Illuminate\Support\Facades\Form',
'Hash' => 'Illuminate\Support\Facades\Hash',
'HTML' => 'Illuminate\Support\Facades\HTML',
'Input' => 'Illuminate\Support\Facades\Input',
'Lang' => 'Illuminate\Support\Facades\Lang',
'Log' => 'Illuminate\Support\Facades\Log',
'Mail' => 'Illuminate\Support\Facades\Mail',
'Paginator' => 'Illuminate\Support\Facades\Paginator',
'Password' => 'Illuminate\Support\Facades\Password',
'Queue' => 'Illuminate\Support\Facades\Queue',
'Redirect' => 'Illuminate\Support\Facades\Redirect',
'Redis' => 'Illuminate\Support\Facades\Redis',
'Request' => 'Illuminate\Support\Facades\Request',
'Response' => 'Illuminate\Support\Facades\Response',
'Route' => 'Illuminate\Support\Facades\Route',
'Schema' => 'Illuminate\Support\Facades\Schema',
'Seeder' => 'Illuminate\Database\Seeder',
'Session' => 'Illuminate\Support\Facades\Session',
'SoftDeletingTrait' => 'Illuminate\Database\Eloquent\SoftDeletingTrait',
'SSH' => 'Illuminate\Support\Facades\SSH',
'Str' => 'Illuminate\Support\Str',
'URL' => 'Illuminate\Support\Facades\URL',
'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View',

),

40 changes: 22 additions & 18 deletions app/config/auth.php
View file
Original file line number Diff line number Diff line change
@@ -4,53 +4,57 @@

/*
|--------------------------------------------------------------------------
| Default Authentication Driver
| デフォルト認証ドライバー
|--------------------------------------------------------------------------
|
| This option controls the authentication driver that will be utilized.
| This drivers manages the retrieval and authentication of the users
| attempting to get access to protected areas of your application.
| このオプションは認証で使用するドライバーを設定します。
| このドライバーはアプリケーションの保護領域へユーザーがアクセスする時の
| 認証を管理します。
|
| Supported: "database", "eloquent"
| サポートドライバー: "database", "eloquent"
|
*/

'driver' => 'eloquent',

/*
|--------------------------------------------------------------------------
| Authentication Model
| 認証モデル
|--------------------------------------------------------------------------
|
| When using the "Eloquent" authentication driver, we need to know which
| Eloquent model should be used to retrieve your users. Of course, it
| is often just the "User" model but you may use whatever you like.
| "Eloquent"認証ドライバーを使用する場合、ユーザー情報を取得する
| Eloquentモデルの指定が必要です。もちろん、通常は"User"モデル
| でしょうが、お好きなものをどうぞ。
|
*/

'model' => 'User',

/*
|--------------------------------------------------------------------------
| Authentication Table
| 認証テーブル
|--------------------------------------------------------------------------
|
| When using the "Database" authentication driver, we need to know which
| table should be used to retrieve your users. We have chosen a basic
| default value but you may easily change it to any table you like.
| "Database"認証ドライバーを使用する場合、ユーザーを取得するための
| テーブルを指定する必要があります。基本的な値をデフォルトにしていますが、
| お好きなテーブル名へ簡単に変更できます。
|
*/

'table' => 'users',

/*
|--------------------------------------------------------------------------
| Password Reminder Settings
| パスワードリマインダー設定
|--------------------------------------------------------------------------
|
| Here you may set the settings for password reminders, including a view
| that should be used as your password reminder e-mail. You will also
| be able to set the name of the table that holds the reset tokens.
| ここではパスワードリマインダーの設定を行います。それには再設定
| メールに使用するアドレスの指定も含まれます。また、リセット
| トークンを保存しておくためのテーブル名も指定可能です。
|
| 有効時間の"expire"に指定する分数は、良く考えてください。
| このトークン保存時間はセキュリティー機能で、短い時間ほど
| 安全になります。ですが、必要に応じ変更可能です。
|
*/

@@ -64,4 +68,4 @@

),

);
);
Loading