phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4,418 Commits 3 Branches 0 Tags
5e71cc5232dc7235c609ff526bf8e06991932416
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Taylor Otwell 2f1786055d Merge branch 'master' into develop 2015-02-22 19:50:13 -06:00
Taylor Otwell 01cf5f183a Merge pull request #3267 from GrahamForks/fix 
Fixed 5.1 installation
 2015-02-22 19:49:32 -06:00
Taylor Otwell 8e15c7f73e A few tweaks to mail config. 2015-02-22 19:48:52 -06:00
Taylor Otwell cc09679c81 Merge pull request #3269 from martinbean/set-mail-defaults 
[5.0] Set mail config values in .env file.
 2015-02-22 19:46:43 -06:00
Taylor Otwell 7a5a5c7e38 Merge pull request #3273 from theravel/master 
Glyphicons are absent from Bootstrap
 2015-02-22 19:46:02 -06:00
Taylor Otwell 1500a18696 Tweak some jobs and names. 2015-02-20 20:49:06 -06:00
Taylor Otwell d2d9c79e4f Tweaks. 2015-02-16 23:37:05 -06:00
Taylor Otwell d5f285ba8b Simplify authentication. Remove service. 2015-02-16 23:36:48 -06:00
Taylor Otwell d75ed33861 Merge branch 'master' into develop 2015-02-12 13:16:00 -06:00
Taylor Otwell e3630a53af Use vendors. 2015-02-12 13:15:45 -06:00
Taylor Otwell da6fc175fb Merge branch 'master' into develop 2015-02-11 12:52:56 -06:00
Taylor Otwell e11deb1412 Tweak ignores. 2015-02-11 12:52:49 -06:00
Taylor Otwell 38aae749a3 Merge branch 'master' into develop 2015-02-11 12:51:01 -06:00
Taylor Otwell d57e785564 Fix order. 2015-02-11 12:50:34 -06:00
Taylor Otwell 3084c2ae62 Ignore a few paths in linguist. 2015-02-11 12:49:50 -06:00
Taylor Otwell b2c296292c Merge branch 'master' into develop 2015-02-06 13:40:06 -06:00
Taylor Otwell 35acc5408c Simplify exception handler. 2015-02-06 13:37:48 -06:00
Taylor Otwell 9da5d30bf7 upgrade version. 2015-02-04 08:17:58 -06:00
Taylor Otwell 61842064b7 upgrade version. 2015-02-04 08:17:48 -06:00
Taylor Otwell da60de8973 use stable 2015-02-04 08:17:25 -06:00
Taylor Otwell b2c7954e1e Merge pull request #3235 from jhmilan/develop 
Mentioning new config option
 2015-02-04 08:14:34 -06:00
Taylor Otwell 4552d93b66 Merge pull request #3234 from DavidLemayian/patch-1 
Use no protocol to fetch Lato font
 2015-02-04 08:14:16 -06:00
Taylor Otwell b07b9f8426 Merge pull request #3240 from danharper/patch-1 
[5.0] Add "node_modules" to .gitignore
 2015-02-04 08:13:14 -06:00
Taylor Otwell 009c2fbd26 Tweak artisan file. 2015-02-03 09:02:18 -06:00
Taylor Otwell e0c22a6e71 Merge pull request #3233 from GrahamForks/stability 
Use stable dependencies
 2015-01-27 14:54:20 -06:00
Taylor Otwell c3e3d9dc4b Include CSRF middleware in base install for easy override / whitelist. 
This makes it easy to skip CSRF verification for things like web hooks
and such from GitHub / Stripe.
 2015-01-26 19:32:22 -06:00
Taylor Otwell 9b9c12fcde Update facade. 2015-01-26 10:46:43 -06:00
Taylor Otwell 0ec2d01fa4 Add Disk facade. 2015-01-26 10:35:14 -06:00
Taylor Otwell 7dc60a86dc Add Eloquent alias. 2015-01-26 10:34:01 -06:00
Taylor Otwell 33e19b852e Merge pull request #3026 from paulofreitas/develop 
Add support for configuring AWS S3 region.
 2015-01-26 10:20:58 -06:00
Taylor Otwell 57eb4066ad Rename package views directory. 2015-01-24 21:09:51 -06:00
Taylor Otwell ed2c0546d1 Add Bus facade. 2015-01-23 14:44:20 -06:00
Taylor Otwell ad695e20bc Call parent boot. 2015-01-22 17:15:34 -06:00
Taylor Otwell 86b0ae0896 Merge pull request #3221 from billmn/patch-1 
[5.0] Allow to use $router in routes file
 2015-01-22 16:49:32 -06:00
Taylor Otwell fbbfa5a5d6 Merge pull request #3227 from jaylinski/develop 
updated elixir description in gulpfile from sass to less
 2015-01-22 16:49:16 -06:00
Taylor Otwell c99d4e396b Merge pull request #3228 from JoeForks/fix/event-sp 
[5.0] Fix app event service provider contract
 2015-01-22 16:49:06 -06:00
Taylor Otwell 0089439a33 A few tweaks. 2015-01-22 15:28:02 -06:00
Taylor Otwell 8780949bec Make route loading a little more explicit. 2015-01-20 16:09:01 -06:00
Taylor Otwell f248da36c3 Tweak doc blocks. 2015-01-20 11:11:43 -06:00
Taylor Otwell 013007a9e1 Move constructor to app. 2015-01-20 11:09:40 -06:00
Taylor Otwell 61ff20256b Moving auth constructor to app. 2015-01-20 11:06:17 -06:00
Taylor Otwell 8e81489c97 Add back in server file. 2015-01-19 21:58:06 -06:00
Taylor Otwell 9e6613f3b8 Merge pull request #3219 from joecohens/patch-1 
[5.0] Typo
 2015-01-19 13:29:08 -06:00
Taylor Otwell 86791280d6 Merge pull request #3216 from TheShiftExchange/patch-1 
[Bug] Composer create-project key:generate currently broken
 2015-01-18 19:44:04 -06:00
Taylor Otwell b6ce0e513e Merge pull request #3218 from hannesvdvreken/patch-1 
copy .env file as after create project
 2015-01-18 19:42:58 -06:00
Taylor Otwell b4b12e91f8 Merge pull request #3213 from ebynum/develop 
Remove comment from duplicate bootstrap instance.
 2015-01-16 09:50:10 -06:00
Taylor Otwell 26fce312c5 Remove duplicate bootstrap reference. 2015-01-15 22:24:45 -06:00
Taylor Otwell 359af29ef3 Try a lighter version of the auth scaffolding. 2015-01-09 11:51:17 -06:00
Taylor Otwell ce20ef22c1 Remove command suffix. 2015-01-07 15:29:01 -06:00
Taylor Otwell 083db95b95 Views. 2015-01-05 13:48:35 -06:00
Taylor Otwell caa166f5d6 Remove middleware interface. 2015-01-05 13:16:21 -06:00
Taylor Otwell df6fa97d70 Fix directory. 2015-01-02 16:30:29 -06:00
Taylor Otwell 203a0c3ba1 Change compiled path. 2015-01-02 16:29:35 -06:00
Taylor Otwell ff13943dbe Merge pull request #3200 from overtrue/patch-3 
[5.0]Modify the wording of env() default values
 2015-01-02 16:27:45 -06:00
Taylor Otwell 6d078c1d58 Merge pull request #3203 from jumilla/develop 
Remove config for workbench.
 2015-01-02 16:27:27 -06:00
Taylor Otwell e2d0ab67e8 Add to the compiler. 2015-01-02 14:48:05 -06:00
Taylor Otwell c1db7050ea Add a basic service provider for config overwriting. 2015-01-02 14:47:42 -06:00
Taylor Otwell c7eecb1c91 Merge pull request #3198 from ibrasho/switch-order-of-providers 
Switch the order of app providers
 2015-01-02 13:01:37 -06:00
Taylor Otwell dc384fe1f5 Stub out some folders for jobs / commands and events. 2014-12-27 16:45:14 -06:00
Taylor Otwell 3cfe2a0c85 Merge pull request #3196 from ytake/develop 
fixed MemcachedConnector Illegal string offset 'host'
 2014-12-25 11:14:24 -06:00
Taylor Otwell c84e2fa035 Merge pull request #3197 from coderabbi/develop 
Update index.php - Fix Comment Lengths
 2014-12-25 11:14:09 -06:00
Taylor Otwell b60f57e77b Simplify routes file. 2014-12-23 16:45:03 -06:00
Taylor Otwell 7b892e2452 Allow session encryption. 2014-12-23 16:18:38 -06:00
Taylor Otwell 5ce23f1859 Setup some stuff for config caching. 2014-12-23 10:51:14 -06:00
Taylor Otwell 49cbb23ac5 Sample database config. 2014-12-19 16:00:22 -06:00
Taylor Otwell 8f6db28661 Add connection settings to cache config. 2014-12-16 22:01:17 -06:00
Taylor Otwell 8d9bbc1c26 Update cache configuration. 2014-12-16 17:44:56 -06:00
Taylor Otwell 3646070dc1 Add expire option by default. 2014-12-16 16:10:19 -06:00
Taylor Otwell e2b7f92abe Merge pull request #3046 from driesvints/feature/phpspec-config-file 
Add PHPSpec config file and dependency
 2014-12-16 13:47:47 -06:00
Taylor Otwell 78b9b7d9b9 Use string "true". 2014-12-15 13:07:32 -06:00
Taylor Otwell 93434d8679 Use the "Env" helper which has boolean support. 2014-12-15 13:07:04 -06:00
Taylor Otwell a6a0aab6c6 Merge pull request #3188 from anhskohbo/patch-3 
Fixed artisan optimize crash
 2014-12-15 13:04:20 -06:00
Taylor Otwell 01adbfbb5f Merge pull request #3187 from GrahamForks/autoload-dev 
Make use of autoload-dev
 2014-12-15 10:01:44 -06:00
Taylor Otwell 7a8b2256a3 Update value. 2014-12-15 08:49:07 -06:00
Taylor Otwell b1dc129af5 Merge pull request #3132 from winglian/develop 
use APP_KEY from environment if available for the secret key
 2014-12-15 08:45:49 -06:00
Taylor Otwell 83a5602df1 Use environment options in database config. 2014-12-15 08:44:30 -06:00
Taylor Otwell ce48990bf2 Tweak some paths again. 2014-12-15 08:42:13 -06:00
Taylor Otwell 47971fbba2 Merge pull request #3176 from slik/bugfix/artisan_optimize_crash 
[5.0] Fixed artisan optimize crash
 2014-12-08 23:57:06 -06:00
Taylor Otwell 9d3a58284f Fix database path. 2014-12-08 10:10:47 -06:00