phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,377 Commits 3 Branches 0 Tags
94948cf675b9aef11ebb96ceabaddb1bece771db
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 94948cf675 Fix Eloquent eager loading matching. 2012-04-23 16:08:57 -05:00
Taylor Otwell b65fa7040d tweak the status method.: 2012-04-23 13:36:25 -05:00
Taylor Otwell f1feb467f1 added Input::merge method. 2012-04-23 13:33:48 -05:00
Taylor Otwell bb506bb30b Updating change log and docs for Schema::drop. 2012-04-20 11:37:05 -05:00
Taylor Otwell a92ab1ca30 Fixing bugs. 2012-04-20 11:35:47 -05:00
Taylor Otwell 98ea9ac41f Fix bug in core script. 2012-04-20 10:54:40 -05:00
Taylor Otwell 7b65dc30a0 updated change log. 2012-04-19 14:32:59 -05:00
Taylor Otwell 58f69fdf47 fixing some issues related to environment. 2012-04-19 14:32:27 -05:00
Taylor Otwell 4440412f57 turn off profiler by default. 2012-04-19 10:51:29 -05:00
Taylor Otwell 9a90d303c7 return empty string if no items in html list. 2012-04-19 08:45:56 -05:00
Taylor Otwell 09e456d2bf fix docblock. 2012-04-19 08:41:23 -05:00
Taylor Otwell 92e482de0d updating documentation. 2012-04-19 08:39:30 -05:00
Taylor Otwell 798b76d8d0 update change log. 2012-04-19 08:38:06 -05:00
Taylor Otwell a150a7d457 allow multiple views to be registered for a single composer. 2012-04-19 08:37:42 -05:00
Taylor Otwell d1428948ea fix docblock. 2012-04-19 08:28:22 -05:00
Taylor Otwell cac5ebad4a Merge pull request #507 from sparksp/develop-patch-2 
Don't show the trace on shutdown, it's useless.
 2012-04-19 06:26:59 -07:00
Taylor Otwell 3670423da6 Merge pull request #558 from ProgerXP/patch-locks-dev 
Fixing "Cannot remove ...: Permission denied" in File and bundle:: task
 2012-04-19 06:23:42 -07:00
Taylor Otwell 45c9d15442 Merge pull request #559 from ProgerXP/patch-ioc-resolve 
IoC::resolve() - call_user_func_ARRAY()
 2012-04-19 06:13:39 -07:00
Taylor Otwell ed2df89c3e fix double return. 2012-04-19 08:11:29 -05:00
Taylor Otwell a19b8b9675 tweaking the value method. 2012-04-18 20:53:26 -05:00
Taylor Otwell d91da7d80a update change log. 2012-04-18 20:51:15 -05:00
Taylor Otwell b9d573467a Merge pull request #531 from markhuot/develop 
Syncing Up Magic Methods
 2012-04-18 18:50:19 -07:00
Taylor Otwell bee2a273bc added default option to bundle::option method. 2012-04-18 20:47:29 -05:00
Taylor Otwell 3f2bdb7695 only write file caches if minutes is greater than zero. 2012-04-18 20:43:25 -05:00
Taylor Otwell 78243fedba Merge branch 'develop' of github.com:laravel/laravel into develop 2012-04-18 20:39:18 -05:00
Taylor Otwell ff94d16630 Merge branch 'staging' of github.com:laravel/laravel into staging 2012-04-18 20:38:46 -05:00
Taylor Otwell 51f5fdd0c9 fix conflicts. 2012-04-18 20:38:36 -05:00
Taylor Otwell 9c823d42be Merge branch 'master' of github.com:laravel/laravel 2012-04-18 20:36:51 -05:00
Taylor Otwell 24e382848c add response to done event. 2012-04-18 20:36:38 -05:00
Taylor Otwell eafb4bdfb8 Merge pull request #501 from daylerees/error-pages 
Error pages
 2012-04-17 18:52:45 -07:00
Taylor Otwell 7199ac8e9c Merge pull request #549 from ProgerXP/patch-ru 
Russian language files.
 2012-04-17 18:49:32 -07:00
Taylor Otwell 5b7f3f66f2 update change log. 2012-04-17 20:48:17 -05:00
Taylor Otwell 4f3dbf2ec4 document the view::exists method. 2012-04-17 20:15:08 -05:00
Taylor Otwell ae2dc6a7e2 cleaning up view code. 2012-04-17 20:13:42 -05:00
Taylor Otwell 42f8914611 Merge branch 'develop' of github.com:laravel/laravel into develop 2012-04-17 20:11:08 -05:00
Taylor Otwell 66cf43de6c update change log. 2012-04-17 20:10:56 -05:00
Taylor Otwell 8c4170491e use memcached instead of memcache. 2012-04-17 20:09:41 -05:00
Taylor Otwell f1435ce195 Merge pull request #546 from ProgerXP/patch-typos 
Corrected typos in the comments.
 2012-04-17 17:58:19 -07:00
Taylor Otwell 7ba97bc3b5 Merge pull request #550 from davzie/develop 
Implemented View::exists function
 2012-04-17 17:55:52 -07:00
Taylor Otwell b7ac667405 tweak belongs to eager constraining. 2012-04-17 14:33:17 -05:00
Taylor Otwell f6388e26be added dd helper. 2012-04-16 20:38:31 -05:00
Taylor Otwell 62935964eb update chang elog 2012-04-16 14:50:32 -05:00
Taylor Otwell 11aabe4a84 move back to memcache 2012-04-16 14:50:06 -05:00
Taylor Otwell 1192abe39c update change log. 2012-04-16 08:37:15 -05:00
Taylor Otwell f316553bb7 use memcached api instead of memcache. 2012-04-16 08:36:44 -05:00
Taylor Otwell 5d52da696f use injection on the request::detect_env method for better testability. 2012-04-13 20:34:13 -05:00
Taylor Otwell 44dbbe01da added support for bundles outside of the bundle directory using 'path: ' syntax like views. 2012-04-13 13:54:56 -05:00
Taylor Otwell 0f483fb390 cleaning up the autoloader> 2012-04-13 13:33:54 -05:00
Taylor Otwell 1d7c27c19f tweak local environment defaults. 2012-04-13 13:02:20 -05:00
Taylor Otwell 7b7f154edd Merge branch 'staging' into develop 2012-04-13 08:25:51 -05:00
Taylor Otwell e16ab6f3d4 fixing conflicts. 2012-04-13 08:25:40 -05:00
Taylor Otwell 728a320cbc increment version and update change log. 2012-04-13 08:24:42 -05:00
Taylor Otwell f45330a006 call render method on view when including in blade. 2012-04-13 08:23:11 -05:00
Taylor Otwell 9daa919f4b updated change log. 2012-04-12 23:36:45 -05:00
Taylor Otwell ab6e364546 added simpler and easier environment handling. 2012-04-12 23:35:41 -05:00
Taylor Otwell 34cb9a00f4 move 'is' method to the str class where it belongs. 2012-04-12 22:54:50 -05:00
Taylor Otwell 0c8c6714f4 make the paths file more friendly. 2012-04-12 22:46:49 -05:00
Taylor Otwell 99e634d7a4 better organize paths file. 2012-04-12 22:35:18 -05:00
Taylor Otwell 2b88c78896 simplified the paths.php file. 2012-04-12 22:33:45 -05:00
Taylor Otwell 1847a369fb fixed eloquent datetime bug when determining dirty attributes. 2012-04-11 16:08:15 -05:00
Taylor Otwell 8bc128fdaa cleaning up code. 2012-04-10 22:36:20 -05:00
Taylor Otwell 9ad6fabc02 Updated change log. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-10 15:04:39 -05:00
Taylor Otwell 94b8582865 Add DateTime support to database binding layer. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-10 15:03:42 -05:00
Taylor Otwell 7d5b6b3748 added blade comments and documentation. 2012-04-10 11:46:55 -05:00
Taylor Otwell 222383c83b check application.ssl in request::secure. 2012-04-10 11:41:02 -05:00
Taylor Otwell d5b9f3c604 cleaning up section class. 2012-04-10 11:37:38 -05:00
Taylor Otwell 78a2bce820 Merge pull request #509 from cviebrock/section-append 
Make Section::append public, and do a true append. Other methods are renamed but unchanged.
 2012-04-10 09:36:49 -07:00
Taylor Otwell f7b1a72f3c added unless structure to blade. 2012-04-10 11:33:55 -05:00
Taylor Otwell fda19731c5 Fixing update handling in Has_Many and Has_One relationships. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-10 11:26:03 -05:00
Taylor Otwell 8e988192a1 Merge branch 'develop' of github.com:laravel/laravel into develop 2012-04-10 10:10:51 -05:00
Taylor Otwell 0eb79a5b8d Merge branch 'staging' into develop 2012-04-10 10:10:41 -05:00
Taylor Otwell 1a5d4250d1 fix conflicts. 2012-04-10 10:10:31 -05:00
Taylor Otwell bcca8be072 Merge branch 'master' of github.com:laravel/laravel 2012-04-10 10:09:43 -05:00
Taylor Otwell cb9050844a incremented version. 2012-04-10 10:09:34 -05:00
Taylor Otwell 2e7cca1d0b Merge pull request #512 from Mikaweb/patch-1 
Misspelt word corrected!
 2012-04-10 07:49:05 -07:00
Taylor Otwell 60b5e38ca0 return after loading mapped class in autoloader. 2012-04-10 09:48:54 -05:00
Taylor Otwell b370549d80 Merge pull request #517 from joecwallace/migrate-resolver-classify-fix 
Resolver::resolve() bug fix
 2012-04-10 07:47:34 -07:00
Taylor Otwell a3e0c7c0c4 Merge pull request #522 from kloy/master 
Custom validation messages in language file fix.
 2012-04-10 07:43:49 -07:00
Taylor Otwell 9ee9e7bb5e Merge pull request #518 from joecwallace/eloquent-model-table-basename-fix 
Eloquent Model::table() bug fix
 2012-04-09 19:55:34 -07:00
Taylor Otwell f786b33e85 Merge pull request #515 from gaker/develop 
Change visibility on Crypter::randomizer()
 2012-04-08 07:37:38 -07:00
Taylor Otwell 825e8b2d49 cleaning up code and comments. 2012-04-05 21:40:56 -05:00
Taylor Otwell a77196db86 cleaning up code. 2012-04-05 21:30:53 -05:00
Taylor Otwell 8a687053a8 fix conflicts. 2012-04-05 09:33:50 -05:00
Taylor Otwell b7ac1b75af updated change log and incremented version. 2012-04-05 09:30:16 -05:00
Taylor Otwell cc4514e8f6 Fix bug in many to many eager loading. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-05 09:21:28 -05:00
Taylor Otwell ee288a7709 updated changelog. 2012-04-04 22:32:25 -05:00
Taylor Otwell 6dd709ccaa move vendors folder under laravel. 2012-04-04 22:16:34 -05:00
Taylor Otwell fe36d7fdfb Added total SQL execution time to profiler. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-04 17:08:16 -05:00
Taylor Otwell 01a7991bd5 fix artisan. 2012-04-04 16:57:18 -05:00
Taylor Otwell 4bee6d1bca put str_object back in. 2012-04-04 14:48:51 -05:00
Taylor Otwell 609920b0d0 Allow str_contains to take an array. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-04 14:30:32 -05:00
Taylor Otwell c1582e7c84 Turn on profiler by default. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-04 14:21:38 -05:00
Taylor Otwell 943309e00a Merge pull request #498 from daylerees/anbu-jquery-fix 
Anbu jquery fix
 2012-04-04 12:17:21 -07:00
Taylor Otwell 616460725f Merge pull request #496 from daylerees/anbu-jquery-fix 
Anbu jquery fix
 2012-04-04 12:07:27 -07:00
Taylor Otwell 1c26ce8ce5 Fix bug in input class. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-04 11:37:46 -05:00
Taylor Otwell 98fa907805 Use array_merge_recursive in input class. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-04 11:30:19 -05:00
Taylor Otwell 73e355bf18 added http foundation. 2012-04-04 11:22:15 -05:00
Taylor Otwell 85dbb422ce removed httpfoundation. 2012-04-04 11:21:54 -05:00
Taylor Otwell 04eea426e8 tweaking. 2012-04-04 11:19:52 -05:00
Taylor Otwell 9499758806 Merge branch 'develop' into feature/http-foundation 2012-04-04 11:16:44 -05:00