phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4,610 Commits 3 Branches 0 Tags
2aa135c01e2bc2ecfa7b9e7518836d4e88bcda93
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 54533fc037 spacing 2015-10-20 13:57:31 -07:00
Taylor Otwell 421c0d0aba Merge remote-tracking branch 'origin/master' 2015-10-08 09:45:20 -05:00
Taylor Otwell f6b05ee3ce tweak options 2015-10-08 09:45:11 -05:00
Taylor Otwell b0a22fc511 Merge pull request #3501 from crynobone/feature/use-this 
[5.1] Use $this instead of parent.
 2015-09-21 12:43:32 -05:00
Taylor Otwell 24575f4b89 Merge pull request #3500 from pedes42/master 
Replace storage_path with database_path helper
 2015-09-18 07:56:38 -05:00
Taylor Otwell 7d4b5d75ef Default auth service provider. 2015-08-29 20:27:18 -05:00
Taylor Otwell 420e813498 Implement interface. 2015-08-29 16:51:13 -05:00
Taylor Otwell 72a10c64c2 Define HasAbilities trait on default user. 2015-08-29 16:42:19 -05:00
Taylor Otwell 9bb3c9fb3e Merge remote-tracking branch 'origin/master' 2015-08-29 16:36:28 -05:00
Taylor Otwell c82c5eceda acl changes 2015-08-29 16:36:22 -05:00
Taylor Otwell f40e72fa2f Merge pull request #3484 from Zarthus/patch/views-use-https 
Use https rather than // for google fonts in default views.
 2015-08-17 11:33:03 -05:00
Taylor Otwell 2ddeae9c71 Merge pull request #3480 from bmitch/JsonErrorMsg 
Error message for JSON validation
 2015-08-16 12:17:00 -05:00
Taylor Otwell f047f80dc0 fix incorrect method name in comment. 2015-08-08 08:07:23 -05:00
Taylor Otwell 395b69b540 fix status code 2015-08-06 12:07:35 -05:00
Taylor Otwell f478406894 Merge remote-tracking branch 'origin/master' 2015-08-06 12:07:10 -05:00
Taylor Otwell da7376d461 working on exception handling for model not found. 2015-08-06 12:07:04 -05:00
Taylor Otwell 51299e78cd Merge pull request #3468 from laracasts/patch-1 
Bump Laravel Elixir version
 2015-07-28 09:04:45 -05:00
Taylor Otwell 9d82fc6007 Merge pull request #3467 from andrewhood125/homestead-json 
Ignore Homestead.json
 2015-07-25 21:04:59 -05:00
Taylor Otwell 8061c2132c Convert some variables to env variables in services.php. 2015-07-23 10:58:17 -05:00
Taylor Otwell 0cf34a3bc0 Merge pull request #3465 from jumilla/patch-1 
Sorted by alphabetic.
 2015-07-23 08:47:41 -05:00
Taylor Otwell 9b359ba24c Merge pull request #3459 from jonathantorres/new-line 
Newline on .env.example
 2015-07-17 21:45:57 -05:00
Taylor Otwell 5964dcf97a Merge pull request #3456 from sileence/bcrypt_password_factory 
Using the bcrypt function in users generated by the model factory
 2015-07-13 20:40:02 -05:00
Taylor Otwell e3f18ea5f6 Merge pull request #3449 from browner12/patch-1 
type hint faker generator
 2015-07-07 21:06:40 -05:00
Taylor Otwell ef958716c3 change language files 2015-07-03 20:41:09 -05:00
Taylor Otwell ecd52ef1d2 fix order 2015-07-02 14:20:33 -05:00
Taylor Otwell 48abc56ede Merge pull request #3444 from antonybudianto/patch-1 
Add ThrottleLogin localization support
 2015-07-02 14:19:51 -05:00
Taylor Otwell 901a45fd96 added throttles logins trait by default 2015-07-01 13:30:05 -05:00
Taylor Otwell 07cb1eb873 Merge pull request #3440 from mikaelmattsson/patch-1 
Change comment to reflect the change of the default css preprocessor.
 2015-06-27 11:25:02 -05:00
Taylor Otwell 804b9d7460 fix wording 2015-06-26 08:30:59 -05:00
Taylor Otwell 99d25ec96c Merge pull request #3438 from bbashy/patch-1 
Fix redirect loop .htaccess
 2015-06-26 08:30:37 -05:00
Taylor Otwell a9ca36a8ca no margin needed. 2015-06-25 13:34:04 -05:00
Taylor Otwell 09d028f14b change welcome splash 2015-06-25 13:30:52 -05:00
Taylor Otwell 2dd8ed131a Merge pull request #3435 from tonglil/master 
Use double quotes for html attributes
 2015-06-23 14:08:14 -05:00
Taylor Otwell 9089b7e2ae Merge pull request #3434 from josezenem/master 
Use the ::class notation
 2015-06-23 12:08:36 -05:00
Taylor Otwell 04709cf0ed tweak package file 2015-06-23 10:58:54 -05:00
Taylor Otwell ad08717680 tweak default asset setup 2015-06-22 18:24:47 -05:00
Taylor Otwell 69076cb13f Merge remote-tracking branch 'origin/master' 2015-06-20 14:56:33 -05:00
Taylor Otwell 7a8800c6b4 add Homestead.yaml to gitignore 2015-06-20 14:56:23 -05:00
Taylor Otwell 3b0d03920e Merge pull request #3426 from Phyxsius/patch-2 
Maintain alphabetical order
 2015-06-16 09:38:18 -05:00
Taylor Otwell 15d6f3fe15 remove stability setting 2015-06-14 17:53:36 -05:00
Taylor Otwell 63ba6decb3 remove prefer stable 2015-06-14 17:46:57 -05:00
Taylor Otwell 5033b85080 Merge pull request #3421 from barryvdh/patch-1 
Set minimum stability to stable
 2015-06-14 17:45:10 -05:00
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