phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5,646 Commits 3 Branches 0 Tags
2683de70828e6c4dcf8613a60fc7304ff90e6acc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Taylor Otwell 7bb301b81f Merge pull request #4557 from nikolaynizruhin/master 
Update laravel-mix
 2018-01-25 07:43:24 -06:00
Taylor Otwell 0178fd8921 update bootstrap 2018-01-19 08:01:34 -06:00
Taylor Otwell 6284528b76 update driver list 2018-01-18 08:55:30 -06:00
Taylor Otwell f6e0fd7ac3 slack driver config 2018-01-18 08:53:51 -06:00
Taylor Otwell ff0bec857e update to stack 2018-01-18 08:26:24 -06:00
Taylor Otwell bd5783b5e9 add aggregate example 2018-01-16 11:52:42 -06:00
Taylor Otwell 54eca63612 Merge pull request #4539 from tomhorvat/patch-1 
Update bootstrap version
 2018-01-06 09:58:16 -06:00
Taylor Otwell acabdff2e3 update log configuration file 2018-01-04 15:28:26 -06:00
Taylor Otwell 828967a42f Merge branch 'master' into develop 2018-01-03 10:52:47 -06:00
Taylor Otwell f4cba4f2b2 Merge branch 'master' of github.com:laravel/laravel 2018-01-03 10:52:15 -06:00
Taylor Otwell 60de3a5670 add thanks 2018-01-03 10:52:04 -06:00
Taylor Otwell 73cff166c7 Merge pull request #4526 from themsaid/pusherCluster 
Include cluster in pusher config
 2017-12-24 08:11:52 -06:00
Taylor Otwell a32af97ede Update .env.example 2017-12-24 08:11:41 -06:00
Taylor Otwell a4af0b5318 Update broadcasting.php 2017-12-24 08:11:34 -06:00
Taylor Otwell b347461f53 Merge pull request #4525 from przemdz665/bootstrap-pusher-fix 
Update Echo options for pusher in bootstrap.js
 2017-12-23 20:09:19 -06:00
Taylor Otwell aad59400e2 Update bootstrap.js 2017-12-23 20:08:55 -06:00
Taylor Otwell 1f7f915b3b Merge pull request #4521 from SjorsO/patch-1 
Add comment with the value of the hashed password
 2017-12-21 20:31:08 -06:00
Taylor Otwell cd53623249 compile 2017-12-20 17:02:59 -06:00
Taylor Otwell c0cda4f81f fix 2017-12-20 16:58:36 -06:00
Taylor Otwell 6ee9718038 recompile 2017-12-20 16:53:12 -06:00
Taylor Otwell fbe47aec33 Merge pull request #4519 from themsaid/bootstrap4 
[5.6] Switch to Bootstrap 4
 2017-12-20 16:50:53 -06:00
Taylor Otwell 304854c335 Merge branch 'master' into develop 2017-12-20 07:49:16 -06:00
Taylor Otwell f693a20a3c just use hard-coded hash 2017-12-20 07:49:07 -06:00
Taylor Otwell f5ea753ebe Merge pull request #4514 from nunomaduro/master 
[5.6] Adds nunomaduro/collision on composer require-dev
 2017-12-19 08:37:23 -06:00
Taylor Otwell 260a8ab2d0 wording 2017-12-19 08:21:38 -06:00
Taylor Otwell 7b138fe398 set rounds 2017-12-19 08:17:01 -06:00
Taylor Otwell 5a08a3572d Merge branch 'master' into develop 2017-12-19 08:16:16 -06:00
Taylor Otwell 4bfb164c26 lower rounds 2017-12-19 08:16:00 -06:00
Taylor Otwell c5a5069ac4 Merge pull request #4517 from laurencei/patch-1 
Reduce Hash computations during tests
 2017-12-19 08:14:04 -06:00
Taylor Otwell 0512abee6b Merge pull request #4515 from dunglas/add-set-cache-headers-middleware 
[5.6] Add the SetCacheHeaders middleware
 2017-12-19 08:11:53 -06:00
Taylor Otwell aa4b02358a fix name 2017-12-19 08:08:25 -06:00
Taylor Otwell a4402f23af Merge pull request #4516 from pavinthan/patch-2 
Update SQS config
 2017-12-19 08:07:43 -06:00
Taylor Otwell a86226a1e2 Merge pull request #4518 from fideloper/trustedproxy 
Trusted proxy to version 4.0 for Laravel 5.6
 2017-12-19 08:01:55 -06:00
Taylor Otwell dabd0686be Update Kernel.php 2017-12-18 19:30:09 -06:00
Taylor Otwell bcaeb32430 Update Kernel.php 2017-12-18 19:29:49 -06:00
Taylor Otwell f1575bf27c prefer stable 2017-12-18 10:40:39 -06:00
Taylor Otwell 73576f73d6 update deps 2017-12-15 16:24:49 -06:00
Taylor Otwell 3f0e742421 Merge pull request #4504 from hasanemrebeyy/patch-1 
Make links HTTPS
 2017-12-04 08:17:50 -06:00
Taylor Otwell 18730bd0da Merge pull request #4503 from lbausch/patch-1 
Remove whitespace
 2017-12-03 08:40:51 -06:00
Taylor Otwell 593963979a Merge pull request #4493 from m1guelpf-forks/patch-1 
Upgrade Vue
 2017-11-21 07:37:48 -06:00
Taylor Otwell 19da36d08d Merge pull request #4494 from m1guelpf-forks/patch-3 
Make Vehikl link HTTPS
 2017-11-21 07:37:35 -06:00
Taylor Otwell 0fd4fb33a2 Merge pull request #4491 from JeremyBellaiche/master 
Add sponsor
 2017-11-17 07:23:43 -06:00
Taylor Otwell 4a646a0fa0 add sponsor 2017-11-13 08:13:25 -06:00
Taylor Otwell 68772c762c Merge pull request #4483 from nesk/custom-url-aws 
Support custom URLs for AWS storage
 2017-11-10 08:19:58 -06:00
Taylor Otwell 411ff5978c Update filesystems.php 2017-11-10 08:19:10 -06:00
Taylor Otwell be6d4f2ec5 fix 2017-11-10 08:09:05 -06:00
Taylor Otwell 648544a95f fix grammar 2017-11-10 08:02:26 -06:00
Taylor Otwell 0a2daf8f17 Merge pull request #4485 from pranayaryal/patch-2 
Removing redundant language
 2017-11-10 07:53:54 -06:00
Taylor Otwell df22b3b904 Merge pull request #4486 from astorm/patreon 
Fixing Link
 2017-11-10 07:53:30 -06:00
Taylor Otwell 7231956714 Merge pull request #4482 from astorm/patreon 
For Patreon (Alan Storm/Pulse Storm)
 2017-11-09 07:49:16 -06:00
Taylor Otwell 985d306fb1 Update readme.md 2017-11-09 07:49:07 -06:00
Taylor Otwell 01b9061f69 Merge pull request #4476 from gabriel-caruso/package-cross-env 
Updated cross-env in package.json
 2017-11-01 08:57:45 -05:00
Taylor Otwell ba96ab0f6e Merge pull request #4475 from tecpresso/add_sponsor 
add sponsor
 2017-10-31 11:53:42 -05:00
Taylor Otwell 7adc396e9b Merge pull request #4473 from gabriel-caruso/jquery 
Update jquery in package.json
 2017-10-30 07:49:18 -05:00
Taylor Otwell a3eb00e23a Merge pull request #4472 from nikolaynizruhin/master 
Update axios
 2017-10-29 08:48:45 -05:00
Taylor Otwell e441d9cac8 Merge pull request #4470 from michaeldyrynda/chore/consistent-aws-env-vars 
Update AWS environment variable defaults
 2017-10-26 07:17:27 -05:00
Taylor Otwell a4aada88b0 Merge pull request #4467 from michaeldyrynda/master 
Don't show progress for production run command
 2017-10-24 10:50:39 -05:00
Taylor Otwell 3dcea02db6 Merge pull request #4464 from m1guelpf-forks/patch-1 
Update Laracasts statistics
 2017-10-22 15:52:44 -05:00
Taylor Otwell e6067becd1 Merge pull request #4461 from Gawdl3y/patch-2 
Reword the readme slightly and link the email address
 2017-10-22 08:52:20 -05:00
Taylor Otwell 8f99719dfe Merge pull request #4458 from gabriel-caruso/mockery 
[5.5] Match mockery/mockery with laravel/framework
 2017-10-16 09:29:05 -05:00
Taylor Otwell da9851055a compile assets 2017-10-09 15:49:15 -05:00
Taylor Otwell 4a86f0765a Merge pull request #4447 from talvbansal/master 
Rename example component to follow the vue.js style guide
 2017-10-09 15:36:37 -05:00