phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5,568 Commits 3 Branches 0 Tags
acabdff2e3cde6bc98cc2d951a8fcadf22eb71f0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Taylor Otwell 23f6bbe699 Merge pull request #4444 from calebporzio/session-lifetime-in-env 
Load session lifetime from env file
 2017-10-04 09:01:04 -05:00
Taylor Otwell 691fdfe1c2 Merge pull request #4433 from ragingdave/patch-1 
Update .htaccess
 2017-09-26 16:34:29 -05:00
Taylor Otwell 4bbd5f9be5 Merge pull request #4422 from andrey-helldar/patch-4 
Added "-Indexes" option
 2017-09-18 14:19:01 -05:00
Taylor Otwell b96b152998 sponsor 2017-09-18 07:24:16 -05:00
Taylor Otwell 392ece3e4f Merge pull request #4416 from laravel/revert-4413-master 
Revert "Use database_path helper for sqlite database filename specified in .env"
 2017-09-11 08:04:20 -05:00
Taylor Otwell 80e96d276a Revert "Use database_path helper for sqlite database filename specified in .env" 2017-09-11 08:04:12 -05:00
Taylor Otwell d1cfd416ca Merge pull request #4413 from adrianharabula/master 
Use database_path helper for sqlite database filename specified in .env
 2017-09-09 23:12:43 +02:00
Taylor Otwell 26a0e8d758 remove sponsor 2017-09-06 10:20:27 -05:00
Taylor Otwell d93c8f177a Merge pull request #4409 from ThunderBirdsX3/master 
Update cache prefix.
 2017-09-06 14:20:04 +02:00
Taylor Otwell d4c622a0b8 add sponsor 2017-09-05 08:01:13 -05:00
Taylor Otwell 26eed641eb add sponsor 2017-08-23 12:32:36 -05:00
Taylor Otwell 37d39a7cf5 Merge pull request #4383 from scrubmx/patch-8 
Fix in comment in config/app.php
 2017-08-18 08:00:12 -05:00
Taylor Otwell d0ad72226e Merge pull request #4375 from decadence/patch-1 
require_once /vendor/autoload.php
 2017-08-15 08:24:34 -05:00
Taylor Otwell af2a4d47a3 Merge pull request #4374 from ikari7789/patch-1 
Change indent for package.json from 2 to 4 spaces
 2017-08-14 09:09:35 -05:00
Taylor Otwell 58ed5459b1 Merge pull request #4373 from marcusmoore/patch-2 
update example unit test to use RefreshDatabase trait
 2017-08-12 20:43:56 -05:00
Taylor Otwell bee41ce20b Merge pull request #4368 from keving91/patch-1 
Fixes "Cannot resolve directory'" in PhpStorm
 2017-08-12 15:35:39 -05:00
Taylor Otwell be143bf2dc Merge pull request #4364 from tomirons/patch-1 
[5.5] add whoops to dev dependencies
 2017-08-06 08:50:48 -05:00
Taylor Otwell a1ee424ac7 add sponsor 2017-08-01 12:15:51 -05:00
Taylor Otwell 8a50ccb617 Merge pull request #4350 from Te7a-Houdini/AddAuthDirective 
Add auth directive
 2017-07-25 22:27:56 -04:00
Taylor Otwell 7a9da9c164 Merge pull request #4351 from pierreneter/revert-4349-patch-1 
Revert "don't need it"
 2017-07-25 22:27:03 -04:00
Taylor Otwell 166d25b726 Merge pull request #4349 from pierreneter/patch-1 
don't need it
 2017-07-25 14:06:38 -04:00
Taylor Otwell e4de035371 Merge pull request #4347 from balping/patch-1 
Change hardcoded urls to named routes
 2017-07-25 06:25:08 -04:00
Taylor Otwell 7bcf7a5450 Merge pull request #4344 from djh101/develop 
Fixed trailing slash redirection for subdirectory installs.
 2017-07-23 06:35:09 -05:00
Taylor Otwell e19952fb19 Merge pull request #4340 from garygreen/remove-migrations-classmap 
Remove migrations from autoload classmap
 2017-07-22 09:44:05 -05:00
Taylor Otwell 134eafd12c remove things that aren't usually customized 2017-07-19 17:45:57 -05:00
Taylor Otwell 396634857e use exception status 2017-07-19 17:26:48 -05:00
Taylor Otwell c2e3cb9065 tweak default handler 2017-07-19 16:21:03 -05:00
Taylor Otwell ebc18e3aef update comment 2017-07-17 09:12:08 -05:00
Taylor Otwell 5d54c21ea8 auto loads commands 2017-07-17 09:11:10 -05:00
Taylor Otwell c4e142867c Merge pull request #4333 from DCzajkowski/develop 
Fixed CI
 2017-07-15 14:25:50 -05:00
Taylor Otwell fef413ff0e remove predis 2017-07-12 11:58:52 -05:00
Taylor Otwell 51f7e188a1 remove file 2017-07-12 11:58:33 -05:00
Taylor Otwell 1e4f3b9920 remove lock 2017-07-11 16:53:34 -05:00
Taylor Otwell 255c2bf1b7 Merge branch 'develop' of github.com:laravel/laravel into develop 2017-07-11 16:53:11 -05:00
Taylor Otwell d75800052d change default 2017-07-11 16:53:04 -05:00
Taylor Otwell 560bde8eb1 wip 2017-07-11 15:28:02 -05:00
Taylor Otwell 9a276e4ef5 wip 2017-07-11 15:25:52 -05:00
Taylor Otwell e109f4fcb0 wip 2017-07-11 15:24:40 -05:00
Taylor Otwell d0ce75926f Merge branch 'master' into develop 2017-07-11 13:26:38 -05:00
Taylor Otwell 8999e8745e tweak method 2017-07-06 12:28:57 -05:00
Taylor Otwell cec1b1bf94 fix error code 2017-07-06 12:27:35 -05:00
Taylor Otwell 4611d2bf31 stub listeners property 2017-07-06 12:08:40 -05:00
Taylor Otwell 3310063b59 add validation to exception handler 2017-07-06 11:49:51 -05:00
Taylor Otwell 098b8a4883 Merge pull request #4322 from kauhat/patch-1 
Ignore the Yarn error log
 2017-07-04 11:54:53 -05:00
Taylor Otwell 8d370ce7f2 Merge pull request #4311 from lucasmichot/feature/master/docblock 
[5.4] Fix docblock.
 2017-07-03 08:01:54 -05:00