phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4,542 Commits 3 Branches 0 Tags
26b6b8e5ff27aba5f40cc8c65924ef37051ae1c1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 136d7fa8ef Merge pull request #3418 from baspeters/feature/sqlsrv-default-charset 
Set default charset for sqlsrv driver to utf8
 2015-06-11 13:28:25 -05:00
Taylor Otwell f6e6508b4e Merge pull request #3416 from krienow/doctype 
Fix doctype declarations
 2015-06-11 09:17:39 -05:00
Taylor Otwell fa756ff4c2 Merge pull request #3415 from martinssipenko/master 
Added whitelist to remove warning for upcoming phpunit 4.8
 2015-06-10 12:52:22 -05:00
Taylor Otwell 347b928a0f Bump elixir requirement. 2015-06-09 09:16:53 -05:00
Taylor Otwell ff441abd62 fix conflicts 2015-06-09 07:48:02 -05:00
Taylor Otwell f9ed4ff7ac Override cookie encrypter by default. 2015-06-08 21:16:01 -05:00
Taylor Otwell 9a70a4b2b1 Update PHP dependencies. 2015-06-08 20:40:07 -05:00
Taylor Otwell a1a55fe274 Merge pull request #3410 from pespantelis/class-notation 
Use the ::class notation
 2015-06-08 10:02:51 -05:00
Taylor Otwell 6df868a123 Merge pull request #3409 from antonybudianto/patch-1 
Update latest CDN
 2015-06-07 22:28:19 -05:00
Taylor Otwell bacda07552 Change default cipher. 2015-06-06 13:20:49 -05:00
Taylor Otwell e4796a2608 Merge pull request #3405 from nWidart/patch-1 
Use the ::class notation
 2015-06-05 08:51:20 -05:00
Taylor Otwell 86e53af851 Merge pull request #3403 from RomainLanz/patch-1 
Use PHP 5.5 ::class property in config files
 2015-06-05 08:04:22 -05:00
Taylor Otwell 1ba2816d37 Merge remote-tracking branch 'origin/develop' into develop 2015-06-03 15:08:32 -05:00
Taylor Otwell f0cad014cf remove cipher option 2015-06-03 15:08:26 -05:00
Taylor Otwell 9293247585 Merge pull request #3398 from crynobone/feature/root-install 
[5.1] Move copying .env.example to post-root-package-install
 2015-06-02 08:19:11 -05:00
Taylor Otwell 9b6d5f4237 Merge pull request #3399 from GrahamForks/cs 
CS
 2015-06-01 09:49:27 -05:00
Taylor Otwell f871b7d0f3 Merge pull request #3397 from phaza/patch-2 
Enable model guarding after doing seeds
 2015-05-31 13:57:08 -05:00
Taylor Otwell 6575cb74f8 Merge pull request #3395 from spinen/feature/usePathParameter 
Using the path parameter in the path method.
 2015-05-28 14:45:11 -05:00
Taylor Otwell c3128ad92a import trait 2015-05-28 10:15:09 -05:00
Taylor Otwell 2e2ead5915 Merge branch 'develop' of github.com:laravel/laravel into develop 2015-05-26 16:15:35 -05:00
Taylor Otwell dff91c9f44 update filesystem config. 2015-05-26 16:15:28 -05:00
Taylor Otwell bb6c23c2eb Merge pull request #3392 from Fuxy22/patch-1 
Fix occasional clear-compiled failure after update
 2015-05-26 10:46:34 -05:00
Taylor Otwell 685e3cf0fa Merge pull request #3390 from marcanuy/develop 
Add env variable to database default connection
 2015-05-25 16:47:03 -05:00
Taylor Otwell d68b5b883f Merge pull request #3388 from GrahamForks/faker 
Add faker to require-dev
 2015-05-25 08:43:36 -05:00
Taylor Otwell e111f1ef9b add period. 2015-05-22 15:42:17 -05:00
Taylor Otwell f17d0e8a38 Merge pull request #3384 from rafaelfs17/patch-1 
Added title tag
 2015-05-22 15:41:24 -05:00
Taylor Otwell 9446685da9 Fix order of validation rules. 2015-05-21 08:14:40 -05:00
Taylor Otwell 11a8db8982 Merge pull request #3378 from TheShiftExchange/patch-3 
Add validation message for string rule
 2015-05-19 07:13:46 -05:00
Taylor Otwell 41472b79db Use signature to define name. 2015-05-13 13:44:43 -05:00
Taylor Otwell 2e1a1a6499 Base job use trait. 2015-05-11 13:46:51 -05:00
Taylor Otwell e0ddb26e44 Merge pull request #3372 from mul14/patch-1 
Remove unnecessary whitespace
 2015-05-10 13:30:10 -05:00
Taylor Otwell d502747428 Show example base variables. 2015-05-09 23:14:32 -05:00
Taylor Otwell b21d263e84 Use DispatchesJobs. 2015-05-09 17:11:52 -05:00
Taylor Otwell 9a6c3df7a0 Use define syntax. 2015-05-09 16:43:45 -05:00
Taylor Otwell e11d40abd0 Merge pull request #3368 from patrickbrouwers/patch-1 
Remove redundant Closure namespace import in VerifyCsrfToken
 2015-05-09 09:11:39 -05:00
Taylor Otwell fdf6dd7c20 Stub factory. 2015-05-08 08:42:04 -05:00
Taylor Otwell 1ac0a0bbda Merge pull request #3358 from lukeb/add-better-elixir-version 
Change package.json so changed to elixir will be non-breaking changes
 2015-05-07 08:29:57 -05:00
Taylor Otwell 7477ec918f Pull in Mockery for mocking. 2015-05-06 21:08:42 -05:00
Taylor Otwell ed93318cb7 Update test case. 2015-05-06 16:58:03 -05:00
Taylor Otwell 0d541ecb9a Merge pull request #3360 from patrickbrouwers/patch-2 
Add log driver to broadcasting connections
 2015-05-06 16:48:50 -05:00
Taylor Otwell 89e2d8e174 Auth controller stubs. 2015-05-01 23:04:32 -05:00
Taylor Otwell 89f568156f No need to override this by default anymore. 2015-04-30 14:59:22 -05:00
Taylor Otwell f4a2282e4e Add migration stubs. 2015-04-30 14:55:34 -05:00
Taylor Otwell b22a1f48c8 Fix typo. 2015-04-30 14:19:00 -05:00
Taylor Otwell 4e8d5533bd Stub out except property. 2015-04-30 14:18:27 -05:00
Taylor Otwell 88f5182d1f Use short-cut. 2015-04-28 13:36:52 -05:00
Taylor Otwell 71e339146e Merge pull request #3351 from fideloper/patch-1 
Documented availability of SES mail driver in mail config
 2015-04-28 09:18:56 -05:00
Taylor Otwell b7c237397b Redis configuration. 2015-04-27 15:52:54 -05:00
Taylor Otwell f8da2892bd Tweak configuration file name. 2015-04-27 15:22:01 -05:00
Taylor Otwell bd9a4f5436 Some sample configuration. 2015-04-27 15:21:32 -05:00
Taylor Otwell 50cf908cba Merge pull request #3348 from browner12/patch-1 
ignore maintenance mode `down` file
 2015-04-23 08:48:14 -05:00
Taylor Otwell 58ecbcdb1e Merge pull request #3346 from laravel/revert-3343-patch-2 
Revert "[5.1] Add new middleware"
 2015-04-22 08:26:29 -05:00
Taylor Otwell 161ebdab36 Revert "[5.1] Add new middleware" 2015-04-22 08:26:24 -05:00
Taylor Otwell 2d9b6958ec Simplify opening routes. 2015-04-21 14:42:23 -05:00
Taylor Otwell 111fdeba8f Don't compile service providers by default. 2015-04-21 14:39:47 -05:00
Taylor Otwell 423eba968f fix email 2015-04-20 08:15:08 -05:00
Taylor Otwell 3b7e6dcdca fix a bunch of stufF 2015-04-10 22:19:42 -05:00
Taylor Otwell a9a59c1a86 Merge pull request #3338 from makque/patch-1 
Defining global patterns before parent boot function call
 2015-04-10 22:15:10 -05:00
Taylor Otwell 8eb969098b Merge pull request #3334 from GrahamForks/compiled 
Correctly deal with the compiled file
 2015-04-02 13:38:24 -05:00
Taylor Otwell 39107a78c2 Key rename. 2015-04-01 09:08:53 -05:00
Taylor Otwell 609ec5afe7 Merge pull request #3328 from mul14/remove-unnecessary-gitignore-in-storage 
Delete unnecessary .gitignore file
 2015-04-01 09:08:20 -05:00
Taylor Otwell fcdb4ccaa0 Merge pull request #3329 from TheShiftExchange/patch-2 
Minor update to Stripe config
 2015-04-01 09:07:36 -05:00
Taylor Otwell 7ac2f3782c Merge pull request #3323 from EliuFlorez/patch-15 
Update app.php
 2015-03-29 22:32:12 -05:00
Taylor Otwell 0b463cef80 Remove lock file. 2015-03-27 10:59:17 -05:00
Taylor Otwell 3516f4f677 Use single logs by default. 2015-03-27 10:38:03 -05:00
Taylor Otwell 84028d4981 Merge pull request #3320 from garygreen/ftp-adapter 
Add FTP adapter to filesystem config
 2015-03-26 14:05:09 -05:00
Taylor Otwell 4e0b15fba1 Use new bootstrap/cache for cached optimizations loaded during bootstrapping. 2015-03-25 10:20:08 -05:00
Taylor Otwell 7bddbdc2a1 Merge pull request #3318 from TheShiftExchange/patch-1 
Update services.php
 2015-03-24 16:06:56 -05:00
Taylor Otwell 3e9422b74f Merge pull request #3315 from taiyaei/fix-spacing 
[develop] Fix indent format.
 2015-03-21 11:09:32 -05:00
Taylor Otwell 1f5681b398 Remove space. 2015-03-20 10:26:19 -05:00
Taylor Otwell 5e11f87de2 Remove auth scaffolding to make it opt-in. 2015-03-18 12:55:56 -05:00
Taylor Otwell 5644e8e320 fix conflicts. 2015-03-13 22:04:40 -05:00
Taylor Otwell c822db1f5b Update compiled file directory. 2015-03-13 22:02:50 -05:00
Taylor Otwell 7cbe38c0a9 Merge pull request #3302 from EliuFlorez/patch-13 
Update server.php
 2015-03-04 09:41:28 -06:00
Taylor Otwell ce5bcb2f8f Merge pull request #3304 from sineld/develop 
support for unencrypted mail server usage like mailcatcher.me
 2015-03-04 09:40:37 -06:00
Taylor Otwell 8909e75552 Some spacing. 2015-03-02 15:31:27 -06:00
Taylor Otwell c9c0380b34 Just use helper function in middleware. 2015-03-01 21:35:37 -06:00
Taylor Otwell 055edad216 Merge branch 'master' into develop 2015-03-01 21:34:01 -06:00
Taylor Otwell 393569bfda Merge pull request #3294 from MarkRedeman/master 
Added QUEUE_DRIVER to .env.example
 2015-03-01 21:24:25 -06:00
Taylor Otwell 5e71cc5232 conflicts. 2015-02-26 09:56:50 -06:00
Taylor Otwell 6249969271 Merge pull request #3283 from mathewhany/master 
Update app.blade.php
 2015-02-26 09:56:07 -06:00
Taylor Otwell 5e71bcae3c fix bad merge. 2015-02-26 07:45:20 -06:00
Taylor Otwell 338f5f1cce fix conflicts. 2015-02-26 07:42:24 -06:00
Taylor Otwell 4929781b95 Merge pull request #3282 from mathewhany/master 
Update app.blade.php
 2015-02-26 07:39:30 -06:00
Taylor Otwell 73e1c71e70 Merge pull request #3279 from marcus-herrmann/develop 
Use "for" attribute on labels in auth views
 2015-02-25 08:03:24 -06:00
Taylor Otwell eacb058caf Connection setting in Redis queue. 2015-02-24 20:07:09 -06:00
Taylor Otwell e590bf2223 Merge branch 'master' into develop 2015-02-24 19:59:13 -06:00
Taylor Otwell 78e24acf2a Merge pull request #3278 from jpkleemans/patch-1 
Updated Run The Application comment
 2015-02-24 19:58:56 -06:00
Taylor Otwell 4c78958b5b Tweak a few things. 2015-02-22 22:37:16 -06:00
Taylor Otwell cc2139ac91 Tweaking a few things. 2015-02-22 21:56:03 -06:00
Taylor Otwell f424b87a63 PSR-2 for app. 2015-02-22 20:47:03 -06:00
Taylor Otwell 76d4c11c0f Merge branch 'master' into develop 2015-02-22 19:58:23 -06:00
Taylor Otwell 1cf4fb6bd6 Merge pull request #3243 from mikefrancis/patch-1 
Remove inline styling, add class to link
 2015-02-22 19:55:15 -06:00
Taylor Otwell 4e444b0820 Merge pull request #3245 from webpatser/hotfix/npm-warning 
Get rid of npm warning: "npm WARN package.json @ No repository field."
 2015-02-22 19:54:21 -06:00
Taylor Otwell 29059a6365 Merge pull request #3246 from Garbee/filemode-queue 
Remove executable status from queue config.
 2015-02-22 19:54:10 -06:00
Taylor Otwell c357eb0ccd Merge pull request #3250 from bbashy/patch-1 
Use relative href on 503 font path
 2015-02-22 19:53:37 -06:00
Taylor Otwell 1c58722f02 Merge pull request #3258 from fwForks/master 
Added <title> tag
 2015-02-22 19:52:47 -06:00
Taylor Otwell 94000aec2e Merge pull request #3260 from itised/master 
config options for larval/framework pr #7409
 2015-02-22 19:52:33 -06:00
Taylor Otwell c9afa3480f Merge pull request #3262 from mikedugan/master 
remove unused use statements
 2015-02-22 19:52:20 -06:00
Taylor Otwell 41b9969c45 Merge pull request #3265 from TheShiftExchange/patch-1 
Have logical default for Queue Driver when testing
 2015-02-22 19:52:11 -06:00