phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4,839 Commits 3 Branches 0 Tags
6dfc0229b2f4ec4d72bf7361d7e81ff62e5d4b5e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell e7ff2bfb4d update method 2016-05-12 22:53:02 -05:00
Taylor Otwell 37ce8b50ce Merge pull request #3778 from scrubmx/patch-3 
[5.3] Add "sslmode" setting for PostgreSQL connection
 2016-05-12 08:40:15 -05:00
Taylor Otwell 6f4c333678 Merge pull request #3777 from Adam14Four/develop 
[5.3] Enabled MySQL "strict" mode by default
 2016-05-11 09:25:31 -05:00
Taylor Otwell 59f2d49074 stub out commands method in console kernel 2016-05-09 11:16:31 -05:00
Taylor Otwell a97b9e0c7c fix comment 2016-05-04 09:31:54 -05:00
Taylor Otwell 26ef471305 Merge branch 'feature/session-store-config' of https://github.com/tomcastleman/laravel into tomcastleman-feature/session-store-config 2016-05-04 09:30:29 -05:00
Taylor Otwell 81aea74578 Merge branch 'master' into develop 2016-05-04 09:30:19 -05:00
Taylor Otwell f8cddc0000 Merge pull request #3770 from tillkruss/patch-2 
Use Bootstrap 3.3
 2016-05-01 22:13:00 -05:00
Taylor Otwell b358fe473d spacing 2016-05-01 10:07:37 -05:00
Taylor Otwell 3173f1c072 Merge pull request #3768 from tomcastleman/patch-1 
[5.3] Add config for new Memcached features
 2016-05-01 10:06:47 -05:00
Taylor Otwell da662e40ec working on broadcasting 2016-04-29 22:40:08 -05:00
Taylor Otwell 749528db0c remove unneeded trait 2016-04-28 10:28:26 -05:00
Taylor Otwell e3d2b68c49 Merge branch 'master' into develop 2016-04-27 15:48:59 -05:00
Taylor Otwell 76b8ef7204 remove post install just in case it causes problems 2016-04-27 08:01:12 -05:00
Taylor Otwell eee2a8b7c8 Merge pull request #3763 from vinkla/npm 
Add npm scripts
 2016-04-27 08:00:19 -05:00
Taylor Otwell d359343ca2 Merge pull request #3760 from tillkruss/patch-1 
Switch to `.scss`
 2016-04-24 20:16:16 -05:00
Taylor Otwell 5450b3180f Merge pull request #3725 from laravel/phpunit 
Fixed up the phpunit config
 2016-04-01 13:25:56 -05:00
Taylor Otwell 72581c0b98 Merge pull request #3723 from JosephSilber/authorize-middleware 
Add support for the authorize middleware and AuthorizesRequests trait
 2016-04-01 13:19:40 -05:00
Taylor Otwell 32318c385a Merge pull request #3726 from laravel/patch 
Bump package versions
 2016-03-30 18:50:41 -05:00
Taylor Otwell b1b524d78b Merge pull request #3718 from JosephSilber/default-auth-driver 
Set the default driver from the Authenticate middleware
 2016-03-28 09:08:55 -05:00
Taylor Otwell 3fc105d3d4 Merge pull request #3699 from barryvdh/patch-1 
[5.2] Use ComposerScripts
 2016-03-25 14:29:48 -05:00
Taylor Otwell 8edf58030e Merge pull request #3709 from MadMikeyB/patch-1 
Update .env.example
 2016-03-25 07:59:03 -05:00
Taylor Otwell cd0a902061 Merge pull request #3698 from dakira/master 
[5.2] Allow for setting sqlite database via env
 2016-03-24 10:06:01 -05:00
Taylor Otwell 1c43882c82 Merge pull request #3701 from laravel/analysis-87anp3 
Applied fixes from StyleCI
 2016-03-23 17:05:52 -05:00
Taylor Otwell 34d2509e84 Merge pull request #3702 from laravel/analysis-XZl3KP 
Applied fixes from StyleCI
 2016-03-23 17:05:30 -05:00
Taylor Otwell e316be4cec Applied fixes from StyleCI 2016-03-23 18:05:26 -04:00
Taylor Otwell a77fa359d9 Applied fixes from StyleCI 2016-03-23 18:05:18 -04:00
Taylor Otwell bcc54357bd add to comment 2016-03-23 17:05:17 -05:00
Taylor Otwell 5c30c98db9 just use web group by default 2016-03-23 17:04:42 -05:00
Taylor Otwell 1d5e88d0fb update default routes file 2016-03-22 13:49:35 -05:00
Taylor Otwell 4f4d378d6a Merge pull request #3685 from JosephSilber/multi-auth 
Allow passing multiple gaurds to the auth middleware
 2016-03-21 09:57:14 -05:00
Taylor Otwell e52b1f71d5 fix wording 2016-03-21 09:13:22 -05:00
Taylor Otwell 80240e9b9e Merge pull request #3690 from kevinsimard/master 
Ignore schedule files
 2016-03-18 07:34:09 -05:00
Taylor Otwell a925d6c9fd Merge pull request #3692 from guilhermegonzaga/patch-1 
Update of the doc for equals to Model
 2016-03-18 07:33:46 -05:00
Taylor Otwell 91c6e71677 Merge pull request #3687 from barryvdh/patch-1 
Remove pre-update-cmd
 2016-03-16 12:21:40 -05:00
Taylor Otwell 8aa5af7372 Merge branch 'master' into develop 2016-03-06 19:56:49 -06:00
Taylor Otwell a282304f35 Merge remote-tracking branch 'origin/master' 2016-03-06 19:56:40 -06:00
Taylor Otwell d998b5bd03 formatting 2016-03-06 19:56:30 -06:00
Taylor Otwell 0da3df2afc Merge pull request #3682 from jadjoubran/patch-1 
Fixed order of password validation in registration
 2016-03-02 14:42:42 -06:00
Taylor Otwell f74879938f Merge pull request #3678 from themsaid/add-land-line-for-in_array 
Add language line for the in_array validation rule
 2016-03-01 20:16:51 -06:00
Taylor Otwell ec0e06e783 cleaning up configs 2016-03-01 08:23:00 -06:00
Taylor Otwell fc12337663 Merge pull request #3675 from yava9221/master 
clearing redundancy
 2016-02-29 10:00:41 -06:00
Taylor Otwell 7093812f80 Merge pull request #3674 from themsaid/language-for-distinct 
Add language line to the validation "distinct" rule
 2016-02-28 11:11:09 -06:00
Taylor Otwell 83fd3f29e7 Merge pull request #3672 from themsaid/add-language-line-for-present-validation-rule 
Add language line for the "present" validation rule.
 2016-02-26 09:27:48 -06:00
Taylor Otwell aa07b0c699 Merge pull request #3670 from SammyK/password-column-fix 
Fix password column for future hashing
 2016-02-23 21:12:28 -06:00
Taylor Otwell 754d78ec8e Merge remote-tracking branch 'origin/master' 2016-02-22 22:19:36 -06:00
Taylor Otwell 62d62a0524 update method call 2016-02-22 22:19:31 -06:00
Taylor Otwell dec392623a Merge pull request #3668 from lucasmichot/feature/master/eof 
Ensure files finish with a LB
 2016-02-22 10:38:04 -06:00
Taylor Otwell e4f7ff9ef1 Merge pull request #3661 from AdenFraser/AppUrlEnv 
APP_URL added to Environment Configuration
 2016-02-17 20:29:42 -06:00
Taylor Otwell 770f8a7453 Merge pull request #3660 from anthonyholmes/master 
Rename commented default seeder call
 2016-02-16 13:53:22 -06:00
Taylor Otwell b1ccb8f0de Merge pull request #3659 from camilorojas/patch-1 
Missing point
 2016-02-16 13:37:39 -06:00
Taylor Otwell 40f9630449 Merge pull request #3658 from martinbean/patch-2 
Use safeEmail() in user factory instead
 2016-02-16 07:42:37 -06:00
Taylor Otwell c751b33d01 add to gitignore 2016-02-12 09:05:19 -06:00
Taylor Otwell 85e6774d2e simplify filesystem default config 2016-02-11 10:19:57 -06:00
Taylor Otwell 00f07ff382 Merge remote-tracking branch 'origin/master' 2016-02-10 16:56:42 -06:00
Taylor Otwell 8e137b525c adding public directory to app storage 2016-02-10 16:55:42 -06:00
Taylor Otwell 7aa988d491 Merge pull request #3645 from david-ridgeonnet/patch-1 
Added default engine in configuration
 2016-02-04 08:36:50 -06:00
Taylor Otwell 01e3d8f288 Merge pull request #3640 from martinbean/patch-1 
[5.2] Make Memcached options configurable.
 2016-01-29 13:17:29 -06:00
Taylor Otwell ce7c1fedb3 Merge pull request #3641 from jspringe/fix-envexample 
.env.example - Changed localhost to 127.0.0.1
 2016-01-29 08:22:20 -06:00
Taylor Otwell eb59458d17 Merge pull request #3637 from gaomd/fix-readme 
Fix title heading level in readme.md
 2016-01-24 13:08:28 -06:00
Taylor Otwell 70355f3066 Merge pull request #3636 from paulvl/master 
Handle authorization header
 2016-01-23 11:32:08 -06:00
Taylor Otwell c6931d266a Merge pull request #3635 from JacobBennett/patch-1 
[5.2] Don't return a login page to a JSON request
 2016-01-22 12:00:37 -06:00
Taylor Otwell e46a73ddb7 Merge remote-tracking branch 'origin/master' 2016-01-14 10:08:58 -06:00
Taylor Otwell c83c0b97f1 change exception 2016-01-14 10:08:49 -06:00
Taylor Otwell a07fcf2803 Merge pull request #3613 from n1c/patch-1 
Fix tab to spaces in web.config
 2015-12-30 07:15:01 -06:00
Taylor Otwell e6dff08752 Merge pull request #3606 from phecho/patch-1 
Change redirecTo in AuthController
 2015-12-25 07:10:59 -06:00
Taylor Otwell 2b940ce5ec return statement not needed here 2015-12-23 12:02:21 -06:00
Taylor Otwell ad173afa5f Merge pull request #3601 from vinicius73/master 
Disable demonstration command
 2015-12-22 14:51:58 -06:00
Taylor Otwell 54d1845b70 Merge pull request #3597 from KennedyTedesco/minor-5.2 
[5.2] Remove unused import
 2015-12-21 20:37:08 -06:00
Taylor Otwell becd774e04 update dependencies 2015-12-21 11:26:25 -06:00
Taylor Otwell 895c5fead8 readable name 2015-12-16 15:18:11 -06:00
Taylor Otwell 8c7ebc5f81 change order of scripts 2015-12-16 11:55:37 -06:00
Taylor Otwell 638b261a68 Change default view. 2015-12-15 16:58:41 -06:00
Taylor Otwell 1865c2993e use provider for consistent language 2015-12-15 15:01:35 -06:00
Taylor Otwell ba857ca50e Uncomment example. 2015-12-14 19:35:30 -06:00
Taylor Otwell 435104304e Basic token configuration. 2015-12-14 16:37:16 -06:00
Taylor Otwell 3eb8613ff8 Comment fix. 2015-12-14 09:44:17 -06:00
Taylor Otwell 171de278d7 Note of explanation. 2015-12-13 14:31:22 -06:00
Taylor Otwell 1546149198 Merge pull request #3591 from laravel/analysis-zdEQ98 
Applied fixes from StyleCI
 2015-12-11 16:50:21 -06:00
Taylor Otwell a98759b264 Applied fixes from StyleCI 2015-12-11 17:50:16 -05:00
Taylor Otwell b70dbaf7a1 define an api group as an example 2015-12-11 16:49:20 -06:00
Taylor Otwell fa3495a28d comment changes 2015-12-11 16:31:19 -06:00
Taylor Otwell 527306a14c Remove terminology for "web routes". 2015-12-09 13:36:47 -06:00
Taylor Otwell 587e514719 Middleware groups, define web group, configure routes file. 2015-12-09 11:12:27 -06:00
Taylor Otwell 60d782a1bb remove unneeded service provider 2015-12-08 15:28:26 -06:00
Taylor Otwell 7ef3839fbf adding env to app config 2015-12-08 14:25:11 -06:00
Taylor Otwell 1d0853b638 Add throttle middleware. 2015-12-07 21:27:16 -06:00
Taylor Otwell ede3202d66 Merge branch 'master' into develop 2015-12-07 12:05:50 -06:00
Taylor Otwell 8c27cb56d0 default to null 2015-12-07 12:05:42 -06:00
Taylor Otwell 48fb9517d2 fix conclits 2015-12-07 12:04:59 -06:00
Taylor Otwell 4fba29c0ec fix problems 2015-12-07 12:03:49 -06:00
Taylor Otwell 1173e19293 Merge branch 'master' of https://github.com/SyntaxC4/laravel into SyntaxC4-master 2015-12-07 12:02:49 -06:00
Taylor Otwell b6625f5ced Merge remote-tracking branch 'origin/develop' into develop 2015-12-06 14:46:56 -06:00
Taylor Otwell 36db347a0c remove iron config. moved to package 2015-12-06 14:46:51 -06:00
Taylor Otwell 2ea2ae0f3f allow guard to be specified on middleaware 2015-12-05 21:56:17 -06:00
Taylor Otwell c2c8ab6f5f line length 2015-12-05 21:52:46 -06:00
Taylor Otwell 2adbbbd91e update config 2015-12-04 22:50:20 -06:00
Taylor Otwell ba7137dcb0 update routes and middleware 2015-12-03 23:11:04 -06:00
Taylor Otwell 3fa12671ce adjusting comments 2015-12-03 22:26:09 -06:00
Taylor Otwell ff35b10a3d working on config 2015-12-03 22:08:12 -06:00