phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5,737 Commits 3 Branches 0 Tags
b0651d2467f1428eadc505e1b3b4f5678611927c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell b0651d2467 Merge branch 'master' into develop 2018-09-04 08:12:22 -05:00
Taylor Otwell 577ae1c019 Merge branch 'develop' of github.com:laravel/laravel into develop 2018-09-04 08:09:48 -05:00
Taylor Otwell 6d9215c0a4 formatting 2018-09-04 08:09:32 -05:00
Taylor Otwell 2d70aaa286 Merge pull request #4744 from staudenmeir/pagination 
[5.6] Fix pagination translation
 2018-09-04 08:06:42 -05:00
Taylor Otwell 6cce5303c7 Merge pull request #4742 from voyula/master 
Update .editorconfig
 2018-09-03 15:56:09 +02:00
Taylor Otwell 43747693bd Merge pull request #4741 from mattmcdonald-uk/develop 
[5.7] Define mix as const
 2018-08-31 14:58:05 +02:00
Taylor Otwell 2330aa7504 Merge branch 'develop' of github.com:laravel/laravel into develop 2018-08-31 13:53:35 +02:00
Taylor Otwell 0d43633f9f add illustrations 2018-08-31 13:53:27 +02:00
Taylor Otwell c29266a0c0 Merge pull request #4736 from nunomaduro/patch-1 
[5.7] Use semver caret operator for laravel-dump-server
 2018-08-27 08:16:02 -05:00
Taylor Otwell 663f7c2c05 Merge pull request #4735 from vemcogroup/master 
Extract 2 core configurations for sessions to environment
 2018-08-25 20:11:29 -05:00
Taylor Otwell 53686dd018 Merge branch 'develop' of github.com:laravel/laravel into develop 2018-08-24 10:40:47 -05:00
Taylor Otwell dda50109be update composer 2018-08-24 10:40:40 -05:00
Taylor Otwell edc937c5e6 Merge branch 'develop' of github.com:laravel/laravel into develop 2018-08-22 14:13:33 -05:00
Taylor Otwell 0c62780402 fix conflicts 2018-08-22 14:13:25 -05:00
Taylor Otwell 289b145731 Merge branch 'master' of github.com:laravel/laravel 2018-08-22 14:12:47 -05:00
Taylor Otwell 4e6838a6cc add nova 2018-08-22 14:12:42 -05:00
Taylor Otwell b2d7facfbb Merge pull request #4730 from ahinkle/ahinkle-patch-1 
Upgrade Lodash (Security Vulnerability)
 2018-08-15 16:04:03 -05:00
Taylor Otwell d6acad21cb Merge branch 'master' into develop 2018-08-14 14:35:49 -05:00
Taylor Otwell e124fc5f12 Merge pull request #4727 from Advaith3600/patch-1 
Changed font to new one
 2018-08-14 14:35:18 -05:00
Taylor Otwell 0d5c1c81ff add sponsor 2018-08-13 08:43:48 -05:00
Taylor Otwell e9b72b4879 add sponsor 2018-08-13 08:31:18 -05:00
Taylor Otwell ff99e2fd5c add dump server 2018-08-11 16:20:19 -10:00
Taylor Otwell 90b6165a2a Merge pull request #4725 from calebporzio/patch-1 
Add .phpunit.result.cache to the .gitignore
 2018-08-10 11:15:32 -10:00
Taylor Otwell 78573d6bf0 remove dump server until it is ready for 5.7 2018-08-05 08:14:56 -10:00
Taylor Otwell 28908d83d9 add supported type 2018-08-04 08:52:01 -10:00
Taylor Otwell ff38d4e1a0 flatten resources more 2018-07-31 15:03:51 -05:00
Taylor Otwell 3e43e6b1d0 Merge pull request #4719 from Kramerican/master 
Added Webdock.io link to readme
 2018-07-31 07:49:35 -05:00
Taylor Otwell 8512ad3181 Merge pull request #4716 from martin-heralecky/patch-1 
Delete trailing whitespace in phpunit.xml
 2018-07-27 11:28:48 -05:00
Taylor Otwell 4334f13e2e Merge branch 'master' into develop 2018-07-19 07:50:18 -05:00
Taylor Otwell 5da2d13b04 compile 2018-07-19 07:50:06 -05:00
Taylor Otwell f619d4f7c2 Merge branch 'develop' of github.com:laravel/laravel into develop 2018-07-19 07:48:59 -05:00
Taylor Otwell bf9836a785 Merge branch 'master' into develop 2018-07-19 07:48:44 -05:00
Taylor Otwell 6646ad7c52 update font and colors 2018-07-19 07:48:31 -05:00
Taylor Otwell fa81e36841 Merge pull request #4703 from thannaske/feature-maintenance-except-routes 
[5.6] Adding boilerplate maintenance middleware with excepted URIs array
 2018-07-12 10:00:50 -04:00
Taylor Otwell 736c5cadf4 Merge pull request #4700 from wuwx/patch-3 
a-z order
 2018-07-10 09:18:12 -04:00
Taylor Otwell 1088837cf3 Merge pull request #4698 from mpociot/add_dump_server 
Add beyondcode/laravel-dump-server as dev dependency
 2018-07-09 16:32:01 -04:00
Taylor Otwell 5c38dee39e fix conflicts 2018-07-03 09:43:52 -05:00
Taylor Otwell b65c8245f7 formatting 2018-07-03 09:39:43 -05:00
Taylor Otwell d4e1b931dc Merge pull request #4693 from laravel/analysis-8PAgMA 
Apply fixes from StyleCI
 2018-07-03 09:39:25 -05:00
Taylor Otwell 715c7e101f Apply fixes from StyleCI 2018-07-03 14:39:18 +00:00
Taylor Otwell 3d70f988f6 Merge pull request #4692 from barryvdh/patch-4 
[5.7] Add addHttpCookie to VerifyCsrfToken
 2018-07-03 09:39:03 -05:00
Taylor Otwell c6d7d83ba3 add sponsor 2018-06-29 14:45:06 -05:00
Taylor Otwell fe796d8806 Merge pull request #4689 from laravel/verify-skeleton 
This PR contains the application skeleton changes needed for optional email verification.

To use:

php artisan make:auth

Route::auth(['verify' => true]);

class User implements MustVerifyEmail

Route::get('/home', etc...)->middleware('verified');
 2018-06-22 10:25:28 -05:00
Taylor Otwell 746a9e87a0 use date 2018-06-21 15:32:22 -05:00
Taylor Otwell cd594395d9 add signed 2018-06-21 11:13:00 -05:00
Taylor Otwell 592b3936a3 update migration 2018-06-21 11:11:30 -05:00
Taylor Otwell 4957bd5e0c stub in import 2018-06-21 11:10:17 -05:00
Taylor Otwell d6b6e706b1 add event registration 2018-06-21 11:09:58 -05:00
Taylor Otwell 69e92d6454 initial pass 2018-06-21 11:08:49 -05:00
Taylor Otwell d53539b47b Merge pull request #4687 from mll-lab/unit-tests-first 
[5.6] Switch execution order of testsuites, unit tests first
 2018-06-18 07:37:18 -05:00
Taylor Otwell e7a74be282 Merge pull request #4670 from amenk/patch-2 
Add iMi digital new Patreon Sponsor to readme
 2018-06-01 10:04:45 -05:00
Taylor Otwell 1dfa2851fa Merge pull request #4665 from barryvdh/patch-3 
[5.6] Use seperate cache database for Redis
 2018-05-24 08:14:08 -05:00
Taylor Otwell 0869d963aa Merge pull request #4661 from driesvints/patch-1 
[5.6] Fix alpha_dash
 2018-05-18 07:59:35 -05:00
Taylor Otwell aefda0cfec Merge pull request #4658 from DojoGeekRA/feature/editorconfig 
Add .editorconfig file
 2018-05-10 10:42:43 -05:00
Taylor Otwell 3f92cf66f5 Merge pull request #4656 from caouecs/patch-1 
fix: alphabetical order
 2018-05-08 14:42:54 -05:00
Taylor Otwell bc51cdd9f3 Merge pull request #4654 from Alymosul/master 
[5.6] Add language lines for the newly added comparison validation rules.
 2018-05-08 08:23:14 -05:00
Taylor Otwell 479d02b094 Merge pull request #4643 from DojoGeekRA/refactor/hashing-config 
[5.6] Set bcrypt rounds using the hashing config
 2018-04-18 20:50:01 -05:00
Taylor Otwell 0b89e2ff20 Merge pull request #4632 from astorm/patreon 
Removing Patreon Link
 2018-04-10 12:06:31 -07:00
Taylor Otwell 7e28dfafa2 Merge pull request #4629 from codepotato/codepotato-ses-region-patch 
Add SES_REGION to local environment file
 2018-04-09 05:18:44 -07:00
Taylor Otwell 3dc19a0d4f Merge pull request #4627 from szepeviktor/patch-1 
Request::HEADER_X_FORWARDED_ALL is an integer
 2018-04-07 12:55:17 -07:00
Taylor Otwell 7f936e1c64 Merge pull request #4624 from cubettech/patch-1 
Added Cubet as a Sponsor
 2018-04-04 05:30:13 -07:00
Taylor Otwell 584eae0191 Merge pull request #4621 from hillelcoren/master 
Added Invoice Ninja to the readme
 2018-03-28 07:16:31 -07:00
Taylor Otwell 50ffc7d9fd formatting 2018-03-24 14:25:38 -07:00
Taylor Otwell 11f0e4e463 Merge branch 'add-hashing-config' of https://github.com/huguesjoyal/laravel-laravel into huguesjoyal-add-hashing-config 2018-03-24 14:22:23 -07:00
Taylor Otwell 534b7acc3f Merge pull request #4620 from browner12/patch-1 
[5.6] Update handler
 2018-03-24 07:42:31 -07:00
Taylor Otwell 650e627eec Merge pull request #4617 from rellect/npm_watch 
Simplify the npm watch command
 2018-03-22 13:16:17 -07:00
Taylor Otwell 657b25a6cb update comment 2018-03-21 16:29:49 -07:00
Taylor Otwell 29a1739099 add wording 2018-03-14 14:19:07 -05:00
Taylor Otwell 66f5757d58 add stderr example 2018-03-14 14:17:27 -05:00
Taylor Otwell 4369e9144c add middleware 2018-03-14 12:40:35 -05:00
Taylor Otwell a14e62325c customizable redirect on auth failure 2018-03-13 16:09:47 -05:00
Taylor Otwell c30adc88c1 adjust variable name 2018-03-13 13:38:47 -05:00
Taylor Otwell 10340d3a02 fix wording 2018-03-13 13:37:32 -05:00
Taylor Otwell c892bd367c Merge pull request #4607 from shadoWalker89/patch-2 
[5.6] Set MAIL_DRIVER to array in phpunit.xml
 2018-03-13 08:09:14 -05:00
Taylor Otwell f013a48879 Merge pull request #4602 from vlakoff/not_regex 
[5.6] Add message for "Not Regex" validation rule
 2018-03-10 09:48:50 -06:00
Taylor Otwell 44488acc28 Merge pull request #4600 from laravel/sem-ver 
[5.6] Use semver caret operator
 2018-03-07 07:39:26 -06:00
Taylor Otwell ff2f828c55 Merge pull request #4593 from freekmurze/patch-1 
[5.6] Remove unnecessary package
 2018-03-05 08:07:37 -06:00
Taylor Otwell 324dda65ba Merge pull request #4594 from mputkowski/patch-sftp 
Add SFTP to supported storage drivers
 2018-02-27 14:32:31 -06:00
Taylor Otwell a58ceaf6fb Update filesystems.php 2018-02-27 14:32:22 -06:00
Taylor Otwell c56e3865db Update filesystems.php 2018-02-27 14:32:00 -06:00
Taylor Otwell bf92ec116e Merge pull request #4583 from nikolaynizruhin/master 
Update axios
 2018-02-20 15:31:20 -06:00
Taylor Otwell 8059290fa0 Merge pull request #4581 from cesaramirez/collision 
Update Collision
 2018-02-18 12:22:29 -06:00
Taylor Otwell 4df852fe05 Merge pull request #4579 from laurencei/revert-4574-defaults-56 
Revert "[5.6] Use composer platform config"
 2018-02-17 08:51:35 -06:00
Taylor Otwell c09537b057 Merge pull request #4577 from arikaiy/patch-1 
packets in alphabetical order
 2018-02-15 15:54:25 -06:00
Taylor Otwell 8f75f4c8dc Merge pull request #4574 from laravel/defaults-56 
[5.6] Use composer platform config
 2018-02-14 17:26:33 -06:00
Taylor Otwell ca1013d31c Merge pull request #4572 from nikolaynizruhin/patch-1 
Remove sass variables which does not exist in bootstrap 4
 2018-02-12 08:52:43 -06:00
Taylor Otwell d86dd9b1ec Merge pull request #4570 from Vanlombardi/master 
Add Argon2 support to create method in RegisterController
 2018-02-10 18:00:41 -06:00
Taylor Otwell ecfd939ff2 Merge branch 'master' into develop 2018-02-07 09:37:45 -06:00
Taylor Otwell 179538e009 Merge pull request #4568 from jasonmccreary/patch-1 
Require same PHP version as framework
 2018-02-06 12:11:28 -06:00
Taylor Otwell f771896c28 ship phpunit 7 by default 2018-02-02 15:42:56 -06:00
Taylor Otwell 3d8ba1d4d2 Merge pull request #4565 from jrseliga/kirschbaum-partnership 
Add Kirschbaum Development Group Sponsor listing.
 2018-01-30 17:19:09 -06:00
Taylor Otwell bac7595f02 add hashing config 2018-01-30 08:38:49 -06:00
Taylor Otwell 22a2d055f6 Merge pull request #4563 from zendrax/add-vscode-to-gitignore 
Add VSCode to gitignore file
 2018-01-30 08:27:17 -06:00
Taylor Otwell b78f5bd6e9 change env example 2018-01-26 14:42:08 -06:00
Taylor Otwell ebb0a2a84f change the default logging channel 2018-01-26 14:41:53 -06:00
Taylor Otwell 2eeca4e220 change name 2018-01-26 10:45:22 -06:00
Taylor Otwell 224f9949c7 use mix env variables 2018-01-26 09:52:02 -06:00
Taylor Otwell 2db1e0c5e8 add mix keys to example 2018-01-26 09:51:03 -06:00
Taylor Otwell 3926520f73 update example component to bs4 2018-01-26 09:45:48 -06:00
Taylor Otwell d6d0013562 add block_for option 2018-01-26 09:05:27 -06:00