phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,281 Commits 3 Branches 0 Tags
8a687053a85e16dd307ca16983381c327ec864f5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Taylor Otwell 02ad4c5c47 adjusting comments. 2012-04-04 11:09:44 -05:00
Taylor Otwell c31f001f22 fix url https bug. 2012-04-04 11:08:14 -05:00
Taylor Otwell 63e6d143fb updated change log. 2012-04-04 10:36:48 -05:00
Taylor Otwell d1adc8c181 Merge pull request #484 from kbanman/bugfix-pivot 
Timestamps are optional in many-to-many pivot table
 2012-04-04 08:36:01 -07:00
Taylor Otwell e78c90b993 Merge branch 'develop' into feature/http-foundation 2012-04-04 10:34:16 -05:00
Taylor Otwell 250541b22b updated change log. 2012-04-04 10:33:49 -05:00
Taylor Otwell eda46a815e fix eloquent model attribute resolution. 2012-04-04 10:33:24 -05:00
Taylor Otwell 232bf01ae2 fix secure cookie issue. 2012-04-04 10:28:06 -05:00
Taylor Otwell ffb4034631 fix url parsing. 2012-04-04 10:16:15 -05:00
Taylor Otwell a85945561c fixing conflicts. 2012-04-04 10:09:27 -05:00
Taylor Otwell 7f9e38a770 Merge branch 'staging' into develop 2012-04-04 09:57:16 -05:00
Taylor Otwell 10d9cd33ad fixing conflicts. 2012-04-04 09:57:08 -05:00
Taylor Otwell 3e00ce2efb fix bug regarding SSL cookies. 2012-04-04 09:50:01 -05:00
Taylor Otwell 8f24d83233 fixing profiler. 2012-04-04 08:59:44 -05:00
Taylor Otwell 17bd505ff6 pass response in laravel done event. 2012-04-04 08:36:43 -05:00
Taylor Otwell 507bba60ca dont show profiler bar on ajax request. 2012-04-03 20:22:01 -05:00
Taylor Otwell 02db986627 fixing route. 2012-04-03 17:07:56 -05:00
Taylor Otwell b58c6370ee fixing template. 2012-04-03 17:07:37 -05:00
Taylor Otwell e0e0b51b9b tweaking profiler. 2012-04-03 16:57:55 -05:00
Taylor Otwell e1d49749a3 fixing conflicts. 2012-04-03 16:54:28 -05:00
Taylor Otwell 1ca7d799af changes 2012-04-03 16:53:15 -05:00
Taylor Otwell 974ac61535 Merge pull request #490 from daylerees/markdown-extra 
Markdown extra
 2012-04-03 12:59:06 -07:00
Taylor Otwell 43a3635722 move documentation markdown to system directory. 2012-04-03 11:20:20 -05:00
Taylor Otwell 1f6e5f8741 updated change log and documentation. 2012-04-03 11:11:03 -05:00
Taylor Otwell 6fdccd7496 Fixing bug. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-03 11:00:45 -05:00
Taylor Otwell 517da41a72 Tweaking has_many "save" method. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-03 10:56:55 -05:00
Taylor Otwell d0a701e8f7 Tweaking has_many "save" method. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-04-03 10:55:04 -05:00
Taylor Otwell df70987679 added sync method to has_many relationship. 2012-04-03 10:48:01 -05:00
Taylor Otwell 3518f68633 tweaking layout. 2012-04-03 09:54:15 -05:00
Taylor Otwell 6735631cc1 tweaking style. 2012-04-03 09:53:33 -05:00
Taylor Otwell e66d8943d1 move documentation into bundle. 2012-04-03 09:51:56 -05:00
Taylor Otwell fdb7b3a7f3 put additions on top. 2012-04-03 09:49:24 -05:00
Taylor Otwell c31df7379b put change log in docs. 2012-04-03 09:48:44 -05:00
Taylor Otwell 7d30d179b7 update documentation. 2012-04-03 09:42:30 -05:00
Taylor Otwell 71531e5fe9 cleaning up code. 2012-04-03 09:22:02 -05:00
Taylor Otwell 6ee7c1c280 tweaking docs. 2012-04-03 09:20:59 -05:00
Taylor Otwell 5d3cc6beb0 template changes. 2012-04-03 09:17:18 -05:00
Taylor Otwell 2af6059457 Merge pull request #486 from daylerees/docs-template 
Docs template
 2012-04-03 06:24:04 -07:00
Taylor Otwell e29270f6a7 Merge pull request #487 from jasonlewis/patch-8 
Includes use render to prevent WSOD
 2012-04-03 06:23:29 -07:00
Taylor Otwell 9f1bd0ca3f chdir if the request is not from the web. 2012-04-03 08:22:18 -05:00
Taylor Otwell 9f80351916 Merge branch 'develop' into feature/http-foundation 2012-04-02 20:45:24 -05:00
Taylor Otwell 4c2406db29 fixing base url generation. 2012-04-02 20:45:20 -05:00
Taylor Otwell ff484b7203 Merge pull request #483 from daylerees/docs-template 
Docs template
 2012-04-02 11:50:16 -07:00
Taylor Otwell 21cee3667b Merge pull request #482 from daylerees/docs-template 
Docs template
 2012-04-02 11:10:55 -07:00
Taylor Otwell 6a9cc48164 fix handling of hash Urls. 2012-04-02 13:02:49 -05:00
Taylor Otwell c0a80d132f fix routing. 2012-04-02 11:19:15 -05:00
Taylor Otwell 21530751a5 use url::to 2012-04-02 11:08:47 -05:00
Taylor Otwell 3a0135a6d3 fixing markdown 2012-04-02 11:05:20 -05:00
Taylor Otwell 6dd8063646 adding doc routes. 2012-04-02 11:02:09 -05:00
Taylor Otwell 2a49787e46 style fixes. 2012-04-02 10:09:07 -05:00
Taylor Otwell 686f83ae8e working on offline docs. 2012-04-02 09:47:30 -05:00
Taylor Otwell 902e8c7500 Merge pull request #479 from daylerees/docs-template 
Offline Docs Template
 2012-04-02 07:16:16 -07:00
Taylor Otwell 2276c6705c use http foundation to create content-disposition headers. 2012-04-01 23:19:45 -05:00
Taylor Otwell 8e80756b08 Merge branch 'develop' into feature/http-foundation 2012-04-01 21:31:20 -05:00
Taylor Otwell d41b1db722 fixing bug in view class. 2012-04-01 21:13:07 -05:00
Taylor Otwell cfce823095 improved view file loading performance. 2012-04-01 21:11:45 -05:00
Taylor Otwell 963426cb9e building on http foundation. 2012-04-01 15:33:35 -05:00
Taylor Otwell 97ac2c8dbf added languages method to the request class. 2012-04-01 15:17:41 -05:00
Taylor Otwell f97f73a835 fixing merge conflicts. 2012-04-01 13:51:59 -05:00
Taylor Otwell 363b7c54df Merge branch 'staging' into develop 2012-04-01 13:51:05 -05:00
Taylor Otwell 63ff04991b fixing merge conflicts. 2012-04-01 13:50:55 -05:00
Taylor Otwell bf886f3271 incrementing version. 2012-04-01 13:49:56 -05:00
Taylor Otwell d2f35900cd fix where in shortcut and response header casing problem. 2012-04-01 13:48:27 -05:00
Taylor Otwell 369ecd80f7 Merge branch 'staging' into develop 2012-03-30 08:45:16 -05:00
Taylor Otwell b66d326ec4 Merge branch 'master' into staging 2012-03-30 08:45:04 -05:00
Taylor Otwell b72f4e9fd9 fix change log. 2012-03-30 08:44:56 -05:00
Taylor Otwell 636d05665c fix merge conflicts. 2012-03-30 08:44:23 -05:00
Taylor Otwell 6aaf015cff incremented version and change log. 2012-03-30 08:43:10 -05:00
Taylor Otwell 75f6384767 fix eloquent->delete bug. 2012-03-30 08:41:52 -05:00
Taylor Otwell 8d16916630 fix magic quotes. 2012-03-29 22:50:14 -05:00
Taylor Otwell 6234905e4c Merge branch 'develop' into feature/http-foundation 2012-03-29 22:13:13 -05:00
Taylor Otwell 3e0d468470 Merge branch 'staging' into develop 2012-03-29 22:11:42 -05:00
Taylor Otwell 062ae8756c fix conflicts. 2012-03-29 22:11:30 -05:00
Taylor Otwell b870ac09dd fix front controller. 2012-03-29 22:06:39 -05:00
Taylor Otwell 67758b6932 update change log. 2012-03-29 22:06:20 -05:00
Taylor Otwell b5dd77d387 Fixing Eloquent constructor bug. 
Signed-off-by: Taylor Otwell <[email protected]>
 2012-03-29 22:04:04 -05:00
Taylor Otwell 579bc8719f cleaning up code. 2012-03-29 17:13:13 -05:00
Taylor Otwell 144117c0a1 cleaning up the eloquent model class. 2012-03-29 16:58:08 -05:00
Taylor Otwell 7c9228b40b update change log. 2012-03-29 16:23:15 -05:00
Taylor Otwell cd71c1e517 added sync method to has many and belongs to entity relationship. 2012-03-29 16:20:38 -05:00
Taylor Otwell c6125edc66 fix bug in input::except method when passing a string. 2012-03-29 15:14:46 -05:00
Taylor Otwell 270cdf2ffc Merge branch 'staging' into develop 2012-03-29 14:21:53 -05:00