phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5,227 Commits 3 Branches 0 Tags
f4bc6e531ae57b550bd4d692cbf9311d4962c79f
Commit Graph
87 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 182c889736 Merge pull request #4110 from laravel/fix 
Bump Mix dependency
 2017-01-22 10:27:46 -06:00
Taylor Otwell 5994e24215 Merge branch 'master' into develop 2017-01-21 10:15:21 -06:00
Taylor Otwell a9fad67e1f fix spacing 2017-01-21 10:15:05 -06:00
Taylor Otwell 4abe343ab9 Merge pull request #4102 from TheoKouzelis/fix/pusher-config-names 
[5.4] Change PUSHER enviroment variable names
 2017-01-19 08:23:59 -06:00
Taylor Otwell c679fb1a1e fix spacing 2017-01-17 16:00:28 -06:00
Taylor Otwell 100aa01088 rename mix command to dev 2017-01-17 15:58:53 -06:00
Taylor Otwell 54c5e1585a Trim and convert strings to nulls. 2017-01-17 15:35:36 -06:00
Taylor Otwell a205b127c6 add mix settings 2017-01-17 14:30:48 -06:00
Taylor Otwell 7cf27b2146 make env variables for aws 2017-01-17 07:41:12 -06:00
Taylor Otwell 590257fbf6 Comment out by default. 2017-01-16 11:08:54 -06:00
Taylor Otwell 01ad31584b add auth session middleware to web group 2017-01-16 11:08:54 -06:00
Taylor Otwell a6d2034c91 Merge pull request #4098 from KennedyTedesco/compiled-5.4 
[5.4] Remove compile.php
 2017-01-14 19:13:35 -06:00
Taylor Otwell 1a48254e83 Merge pull request #4095 from laravel/revert-4093-fix/pusher-config 
Revert "[5.4] Change PUSHER enviroment variable names"
 2017-01-04 15:40:04 -06:00
Taylor Otwell 7b3e884757 Revert "[5.4] Change PUSHER enviroment variable names" 2017-01-04 15:39:53 -06:00
Taylor Otwell 251140ef8b use env var 2017-01-04 12:09:43 -06:00
Taylor Otwell 65d551002e remove url 2017-01-04 10:16:05 -06:00
Taylor Otwell da62be60e8 Put URL config option on the disk to make it obvious how to customize. 2017-01-04 08:51:49 -06:00
Taylor Otwell 7bb56eff6a Merge pull request #4093 from TheoKouzelis/fix/pusher-config 
[5.4] Change PUSHER enviroment variable names
 2017-01-04 07:48:56 -06:00
Taylor Otwell 770c41552f Remove fetch mode option. 2017-01-02 17:18:35 -06:00
Taylor Otwell 52f0196fd3 Move broadcast channel registration to a routes file. 
These are very similar to routes in that they are channel endpoints
that your application supports and they also fully support route model
binding in Laravel 5.4. Upgraded applications do not need to make this
change if they do not want to.
 2016-12-30 15:46:05 -06:00
Taylor Otwell b748931666 Merge pull request #4083 from laravel/tinker 
[5.4] Added tinker to the default app
 2016-12-29 16:55:25 -06:00
Taylor Otwell df1298bfcc Merge pull request #4084 from laravel/mail 
[5.4] Remove the "mail" driver as recommended, and add "array"
 2016-12-29 07:36:50 -06:00
Taylor Otwell b43890c11f Update readme.md 2016-12-28 11:31:53 -06:00
Taylor Otwell 0a1cdb2df6 Update readme.md 2016-12-28 08:31:59 -06:00
Taylor Otwell 077d404c5f list post check middleware 2016-12-19 12:36:33 -06:00
Taylor Otwell 42973cb4e9 spacing 2016-12-17 10:15:15 -06:00
Taylor Otwell e78ef3ee42 tweak js file 2016-12-17 10:14:49 -06:00
Taylor Otwell b9db2864fe remove spacing 2016-12-17 10:12:27 -06:00
Taylor Otwell 46e389fb5a remove unneeded files 2016-12-17 10:11:02 -06:00
Taylor Otwell 83b76a7f8b Merge pull request #4074 from driesvints/patch-1 
[5.3] Sort Composer packages by default
 2016-12-17 09:49:51 -06:00
Taylor Otwell 696ab5149e make 503 page more consistent with welcome page 2016-12-16 16:49:17 -06:00
Taylor Otwell 45b779f807 cluster option not needed anymore 2016-12-12 16:05:32 -06:00
Taylor Otwell 25aeb5da62 Merge branch 'develop' of github.com:laravel/laravel into develop 2016-12-12 11:04:13 -06:00
Taylor Otwell c7eb99d2ad add new mail settings 2016-12-12 11:04:03 -06:00
Taylor Otwell 673f110456 Merge pull request #4069 from JosephSilber/route-groups 
[5.4] Use path for group directly
 2016-12-09 11:47:59 -06:00
Taylor Otwell b5ae7aff9f Merge pull request #4068 from yuters/patch-1 
Make axios compatible with Request::ajax()
 2016-12-08 14:13:14 -06:00
Taylor Otwell 61b157f809 Merge pull request #4067 from JosephSilber/fluent-routes 
[5.4] Use fluent routes
 2016-12-07 22:27:46 -06:00
Taylor Otwell 99bb07502c use new route syntax 2016-12-06 09:40:56 -06:00
Taylor Otwell d1ba0c3d0d Merge pull request #4066 from damiencriado/patch-1 
Fix redis password `AUTH` failed
 2016-12-06 09:27:27 -06:00
Taylor Otwell d4bddc5649 remove unneeded deps 2016-12-05 13:57:35 -06:00
Taylor Otwell a7481f69d5 fix assertion 2016-12-05 13:22:14 -06:00
Taylor Otwell ba5bde7c91 add trait 2016-12-05 12:58:44 -06:00
Taylor Otwell b64d1e3dc8 fix example test 2016-12-05 12:40:03 -06:00
Taylor Otwell cf73f8cb21 update deps 2016-12-01 11:47:40 -06:00
Taylor Otwell 4c6e477131 Merge pull request #4059 from insoutt/insoutt-patch-1 
[5.4] Update mounted instead of ready
 2016-11-28 17:37:55 -06:00
Taylor Otwell cffcc4932d Merge pull request #4055 from themsaid/weakdateroles 
add language lines for before_or_equal and after_or_equal
 2016-11-21 10:46:24 -06:00
Taylor Otwell 6645cae859 Merge pull request #4053 from mattmcdonald-uk/master 
Redirect for registration only
 2016-11-17 07:52:34 -06:00
Taylor Otwell fc3b4d161f Merge pull request #4052 from laravel/analysis-qomWEg 
Applied fixes from StyleCI
 2016-11-16 14:57:29 -06:00
Taylor Otwell b122f775e9 Merge pull request #4051 from lokielse/master 
Support predis v1.1.1
 2016-11-16 14:57:07 -06:00
Taylor Otwell 038ae10ae7 Merge pull request #4046 from diogoazevedos/master 
Use the IP instead of DNS in redis host
 2016-11-15 08:19:30 -06:00
Taylor Otwell be90d3fa1b Merge pull request #4045 from DojoGeekRA/patch-1 
Changes localhost to 127.0.0.1 in database config
 2016-11-14 16:31:02 -06:00
Taylor Otwell cddb8a254a Merge pull request #4036 from danieliancu/patch-1 
Updated package.json
 2016-11-08 08:29:40 -06:00
Taylor Otwell f29c943c88 Update readme.md 2016-10-30 15:36:25 -05:00
Taylor Otwell 5937bbe4ca Update readme.md 2016-10-28 14:20:51 -05:00
Taylor Otwell bc08030b30 Merge pull request #4023 from lkmadushan/formatting-web-routes 
comment formatting
 2016-10-27 13:44:30 -05:00
Taylor Otwell 7479a8b920 Merge pull request #4019 from jirehstudios/master 
Added recommended parentheses
 2016-10-21 14:52:21 -07:00
Taylor Otwell 3437566d66 Merge pull request #4008 from vinkla/patch-1 
Remove unnecessary .gitkeep
 2016-10-17 09:25:59 -05:00
Taylor Otwell fdef1b6fbe Merge pull request #4007 from vinkla/patch-1 
Use fullpath for validator facade
 2016-10-17 09:00:25 -05:00
Taylor Otwell 5b7810680d Merge pull request #4001 from RonMelkhior/master 
Add redirectTo attribute to the reset password controller
 2016-10-17 08:59:26 -05:00
Taylor Otwell 1905c965eb Merge pull request #4004 from diogoazevedos/schema-drop 
Use dropIfExists instead of drop
 2016-10-16 15:06:04 -05:00
Taylor Otwell 472d6ae508 Merge pull request #4000 from zaknes/master 
Add home link to welcome page
 2016-10-14 21:12:18 -05:00
Taylor Otwell 38ba3280cc Merge pull request #3996 from jehadassaf/patch-1 
Ignore Passport-generated OAuth keys
 2016-10-12 10:16:51 -05:00
Taylor Otwell 5dc817bf55 Merge pull request #3994 from craigpaul/master 
Updates laravel-elixir version for vue 2 compatibility
 2016-10-11 13:59:34 -05:00
Taylor Otwell a2df28face Merge pull request #3988 from arcanedev-maroc/patch-1 
Fixing typehint
 2016-10-07 19:48:55 -05:00
Taylor Otwell 421b210a77 Merge pull request #3987 from barryvdh/patch-2 
Add typehint for Factory
 2016-10-07 16:39:08 -05:00
Taylor Otwell f4606d2bb9 Merge pull request #3957 from WayneHarris/vue-resource 
Update Vue Resource
 2016-09-22 10:06:36 -05:00
Taylor Otwell f777e894d9 Merge pull request #3951 from krienow/patch-d57d11 
Add unique modifier
 2016-09-20 08:28:29 -05:00
Taylor Otwell 93d92bbb9e Merge pull request #3942 from ramondj/patch-1 
Rename variables.scss to _variables.scss
 2016-09-14 08:15:03 -05:00
Taylor Otwell 7f06559971 Merge pull request #3929 from bryceadams/patch-map-api-before-web 
[5.3] Map API routes before Web routes
 2016-09-05 09:41:38 -05:00
Taylor Otwell a4b53b394c Merge pull request #3922 from jasonmccreary/https-only-cookie-env 
Environment configuration for HTTPS only cookie
 2016-09-02 07:53:55 -05:00
Taylor Otwell a70dd5622b Merge pull request #3923 from fernandobandeira/patch-1 
Lang Alphabetical Order
 2016-09-02 07:37:19 -05:00
Taylor Otwell c92c724dbf Merge pull request #3921 from jackmu95/add-mimetypes-translation 
Add missing translation for `mimetypes` validation
 2016-09-01 13:21:39 -05:00
Taylor Otwell 07360db40a Merge pull request #3913 from ngyikp/master 
Add fallback sans-serif font in case the custom font fails to load
 2016-08-28 18:11:47 +01:00
Taylor Otwell d7fb66ca9b Merge pull request #3914 from dersvenhesse/patch-1 
Adding description for default inspire command
 2016-08-28 18:08:19 +01:00
Taylor Otwell 1cb19ac911 Merge pull request #3910 from restored18/master 
Add web.config for IIS
 2016-08-26 22:20:33 +01:00
Taylor Otwell 63e0cdc493 Merge pull request #3909 from Rkallenkoot/patch-1 
Sorted the Application Service Providers alphabetically
 2016-08-26 12:39:50 +01:00
Taylor Otwell de81dd38d1 Merge pull request #3906 from greabock/patch-1 
Change .env PUSHER_* params order
 2016-08-25 01:21:58 +02:00
Taylor Otwell 362383d7c5 Merge pull request #3904 from scrubmx/patch-5 
[5.3] Remove extra whitespace in config/cache.php
 2016-08-24 10:28:57 +02:00
Taylor Otwell e959c22840 Merge pull request #3899 from heruputra/patch-1 
Fix order
 2016-08-22 05:05:17 -05:00
Taylor Otwell a2c075bd30 Merge pull request #3894 from adamwathan/53-precomputed-hash 
Use precomputed hash instead of bcrypt in ModelFactory
 2016-08-21 07:35:24 -05:00
Taylor Otwell d84c4990fd Merge pull request #3891 from socieboy/develop 
[5.3] Add BROADCAST_DRIVER on .env
 2016-08-19 16:24:03 -05:00
Taylor Otwell e596cef035 Merge pull request #3889 from adriaanzon/patch-1 
Use module name instead of path
 2016-08-19 11:09:53 -05:00
Taylor Otwell 57b57bf1b3 Merge pull request #3880 from BrandonSurowiec/patch-2 
Update email address
 2016-08-16 07:39:01 -05:00
Taylor Otwell 9fb8af19d7 Merge pull request #3881 from BrandonSurowiec/patch-4 
Update server.php email address
 2016-08-16 07:38:53 -05:00
Taylor Otwell 982e769d2a Merge pull request #3874 from lancepioch/patch-1 
[5.2] Add TokenMismatchException to the dontReport array
 2016-08-15 19:21:15 -05:00
Taylor Otwell 86676aa02e Merge pull request #3878 from tillkruss/patch-4 
Fix order
 2016-08-13 21:26:27 -05:00
Taylor Otwell 40e9d60e88 Merge pull request #3877 from balping/patch-1 
GitIgnore PHPStorm's config directory
 2016-08-13 20:19:59 -05:00