phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,676 Commits 3 Branches 0 Tags
24bbd66273f4e89d7958e9e6bc0d9b8a2cc39954
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 24bbd66273 Merge pull request #838 from SonicHedgehog/master 
Fixed typo
 2012-06-20 09:38:55 -07:00
Taylor Otwell c92578b217 Merge branch 'master' of github.com:laravel/laravel 2012-06-16 15:08:38 -05:00
Taylor Otwell 681f80eafb update change log 2012-06-16 15:08:03 -05:00
Taylor Otwell 527977337d Merge pull request #823 from Vespakoen/patch-3 
ATTENTION! Fixing reference issue in relationship matching (Causing MAMP, and other installs, to crash when eager-loading)
 2012-06-16 13:06:11 -07:00
Taylor Otwell b27b132128 update change log 2012-06-13 10:26:42 -05:00
Taylor Otwell 0a24189b0e added resolving event. 2012-06-13 10:25:14 -05:00
Taylor Otwell 14868a5fd5 Merge pull request #792 from asdfgh746/develop 
Fix typo.
 2012-06-10 18:00:17 -07:00
Taylor Otwell d9802fe656 flush output buffer in error class. 2012-06-04 09:04:20 -05:00
Taylor Otwell ad14938cb2 Merge pull request #760 from cviebrock/develop 
Fix whitespace issues in laravel/form.php
 2012-06-04 06:56:14 -07:00
Taylor Otwell ba088022bb updated version. 2012-06-03 19:54:02 -05:00
Taylor Otwell f595deea1e updated change log. 2012-06-03 19:53:44 -05:00
Taylor Otwell 9d99cfad7e added default to config call to get auth password for backwards compatibility. 2012-06-03 19:53:21 -05:00
Taylor Otwell dda3a81c10 cleaning up comment. 2012-06-03 19:52:26 -05:00
Taylor Otwell 8205a21965 Merge pull request #707 from cviebrock/auth-pass-field 
Allow password field to be configured for Authentication drivers
 2012-06-03 17:51:15 -07:00
Taylor Otwell 8a1011c159 add bin path to artisan. 2012-06-03 19:49:43 -05:00
Taylor Otwell 84e8892c29 updating change log. 2012-06-03 17:45:08 -05:00
Taylor Otwell ba6590d7b1 cleaning up code. 2012-06-03 17:44:53 -05:00
Taylor Otwell f608157ffc Merge pull request #732 from franzliedke/patch-4 
Add a last_query() function to Database connection class.
 2012-06-03 15:43:44 -07:00
Taylor Otwell c9a4f5ea2f cast values when comparing. 2012-06-03 17:42:16 -05:00
Taylor Otwell 563568fbfe Merge branch 'staging', remote-tracking branch 'origin' into develop 2012-06-03 17:38:56 -05:00
Taylor Otwell aae8b62d6a Merge pull request #735 from lukemartin/patch-1 
Adding third parameter (filename) to upload method.
 2012-06-03 15:38:27 -07:00
Taylor Otwell e12b554cbb cleaning up. 2012-06-03 17:37:46 -05:00
Taylor Otwell d9c0dc0c35 Merge branch 'develop' of github.com:laravel/laravel into develop 2012-06-03 17:37:05 -05:00
Taylor Otwell 1ac911f05d Merge branch 'master' of github.com:laravel/laravel into develop 2012-06-03 17:36:16 -05:00
Taylor Otwell 930a3e89e0 Merge pull request #736 from joecwallace/cli-env-management 
Check  against host name for CLI commands
 2012-06-03 15:35:33 -07:00
Taylor Otwell b1707f2bc1 Merge pull request #737 from ianlandsman/develop 
fix spelling mistake pointed out by @andrey_butov
 2012-06-03 15:34:46 -07:00
Taylor Otwell 1b71a0ed89 Merge pull request #743 from kbanman/response-fix 
Render Response objects when casting as string
 2012-06-03 15:34:31 -07:00
Taylor Otwell 0bdfea32e7 Merge pull request #747 from kloy/master 
Fixing bug in IoC::resolve
 2012-06-03 15:33:07 -07:00
Taylor Otwell 3805b69aee Merge pull request #748 from hamuz/patch-1 
Use the static "compiled" method
 2012-06-03 15:32:45 -07:00
Taylor Otwell 5cb8b9bfe9 Merge pull request #750 from robmeijer/develop 
Add a note about registering a named route for a controller action.
 2012-06-03 15:32:04 -07:00
Taylor Otwell cfc0577d50 Merge pull request #751 from jasonlewis/patch-9 
Allow find to be called non-statically on Eloquent models
 2012-06-03 15:30:51 -07:00
Taylor Otwell 4dd82a0de3 update change log. 2012-06-03 17:29:59 -05:00
Taylor Otwell ba4271c999 Merge pull request #752 from AndrewBNZ/master 
Fixed typo from previous fix in sqlserver grammar, primary key function.
 2012-06-03 15:28:55 -07:00
Taylor Otwell e35ec6b390 update change log. 2012-05-30 14:25:27 -05:00
Taylor Otwell 691d68ba54 improve / fix postgres support. 2012-05-30 14:23:27 -05:00
Taylor Otwell 56c6202d28 update change log. 2012-05-30 13:46:41 -05:00
Taylor Otwell 544821bdeb fix eloquent auth driver bug. 2012-05-30 13:46:20 -05:00
Taylor Otwell 2dd8b242b9 update change log. 2012-05-30 09:02:48 -05:00
Taylor Otwell bc67c667a9 Merge pull request #730 from sparksp/develop-default-https 
Generated URLs default to use the current protocol (http or https)
 2012-05-30 07:01:28 -07:00
Taylor Otwell cf604d4e79 Merge pull request #689 from crlosmify/html 
Method for HTML special characters
 2012-05-30 06:58:48 -07:00
Taylor Otwell 4bb2e5f63f Merge pull request #698 from bencorlett/html-lists 
Adding support for values in nested lists generated in the HTML class.
 2012-05-30 06:58:19 -07:00
Taylor Otwell 79b4279101 update change log. 2012-05-30 08:41:45 -05:00
Taylor Otwell 5f97030ce8 refactored set_format to foromat. 2012-05-30 08:41:03 -05:00
Taylor Otwell c2ad6a8126 Merge pull request #714 from daylerees/feature/error-format 
Allow custom global message format.
 2012-05-30 06:38:27 -07:00
Taylor Otwell db6206218a Merge pull request #722 from syntaqx/readme-cleanup 
readme cleanup and overall better'ness
 2012-05-30 06:36:46 -07:00
Taylor Otwell 67583790d4 Merge pull request #723 from syntaqx/htaccess 
htaccess documentation and symlink usage
 2012-05-30 06:35:13 -07:00
Taylor Otwell d6bcc414b1 update change log. 2012-05-30 08:33:32 -05:00
Taylor Otwell 9114d2a033 Merge branch 'master' into staging 2012-05-30 08:28:58 -05:00
Taylor Otwell aa687d039d Merge pull request #725 from kapv89/patch-1 
Changed a line which causes "illegal string offset" error to be thrown i...
 2012-05-30 06:25:29 -07:00
Taylor Otwell 36247267e8 update change log. 2012-05-30 08:23:19 -05:00
Taylor Otwell d1bb02ab64 fix conflicts. 2012-05-30 08:22:40 -05:00
Taylor Otwell c1de1d61d8 Merge pull request #728 from AndrewBNZ/master 
Fix in sqlserver grammar primary key function
 2012-05-30 06:20:13 -07:00
Taylor Otwell d21713f35f increment version. 2012-05-29 17:08:30 -05:00
Taylor Otwell 9c1272093b update change log. 2012-05-29 17:07:47 -05:00
Taylor Otwell c062418ee1 fixing conflicts. 2012-05-29 17:06:11 -05:00
Taylor Otwell 0f5ffdfb56 fix conflicts. 2012-05-29 17:05:19 -05:00
Taylor Otwell 1a17e35461 messing with auth driver problem. 2012-05-29 17:04:47 -05:00
Taylor Otwell 012663ddbb fix conflicts. 2012-05-29 17:02:39 -05:00
Taylor Otwell 69d9257a50 Return value of cookie. 2012-05-29 17:00:23 -05:00
Taylor Otwell 34919aff71 Merge pull request #709 from daylerees/patch-3 
Authenticator Alias
 2012-05-24 06:37:46 -07:00
Taylor Otwell 63b1636d13 Merge pull request #695 from daylerees/profiler-upgrade 
profiler upgrade additions
 2012-05-22 09:09:28 -07:00
Taylor Otwell 49944bab96 Increment version. 2012-05-22 09:12:21 -05:00
Taylor Otwell 91c64b38a7 updated change log. 2012-05-22 08:32:23 -05:00
Taylor Otwell 2ea35398c3 Merge branch 'develop' into staging 2012-05-22 08:29:22 -05:00
Taylor Otwell c80a2e466a Merge pull request #693 from kbanman/request-fix 
Fix capitalization regression in Request::server()
 2012-05-22 06:19:23 -07:00
Taylor Otwell 62aa4f4681 Merge branch 'develop' into staging 2012-05-21 13:47:17 -05:00
Taylor Otwell d29c5bfdab Merge pull request #687 from syntaqx/git-files 
added gitattributes file and updated gitignore
 2012-05-21 11:45:54 -07:00
Taylor Otwell 5adc2256d7 Merge pull request #688 from syntaqx/readme 
README updates
 2012-05-21 11:45:23 -07:00
Taylor Otwell 98535868ac Merge branch 'develop' into staging 2012-05-21 11:06:35 -05:00
Taylor Otwell 5ba802d473 Update environment documentation. 2012-05-21 11:05:59 -05:00
Taylor Otwell e7a40c0caf Updating event docs. 2012-05-21 11:02:43 -05:00
Taylor Otwell a7959ebc3d Updating docs. 2012-05-21 10:57:23 -05:00
Taylor Otwell e7ee6865b1 Updating docs. 2012-05-21 10:55:08 -05:00
Taylor Otwell 0f0c291ffb updating docs for merge and replace input methods. 2012-05-21 10:53:28 -05:00
Taylor Otwell 7d1102dd6e Updated authentication offline docs. 2012-05-21 10:48:15 -05:00
Taylor Otwell 5c03938e3b Merge branch 'develop' into staging 2012-05-21 10:35:55 -05:00
Taylor Otwell dbb4c169da Merge pull request #685 from loic-sharma/patch-1 
Fixed some minor spelling mistakes in Eloquent
 2012-05-18 06:15:34 -07:00
Taylor Otwell a6ad5c6dee Merge pull request #671 from ErikDubbelboer/docfix 
Fix error in comment.
 2012-05-16 14:15:23 -07:00
Taylor Otwell 21d8a266e6 Merge pull request #673 from daylerees/patch-2 
Blade::extend in changelog.
 2012-05-16 14:14:47 -07:00
Taylor Otwell a303d66ae0 Fix bug in events. 2012-05-11 15:32:28 -05:00
Taylor Otwell d417eb5664 Merge pull request #658 from jkudish/develop 
moose are uncountable
 2012-05-11 12:19:25 -07:00
Taylor Otwell 135b6d5132 Merge pull request #664 from franzliedke/patch-3 
Remove more unneeded Closure references
 2012-05-11 12:18:15 -07:00
Taylor Otwell 4cff0907a0 Merge pull request #669 from awellis13/feature/where_nested-closure-fix 
where_nested breaks on empty closures
 2012-05-11 12:17:22 -07:00
Taylor Otwell b097b6c682 Fix to_array() in eloquent model. 2012-05-11 13:22:04 -05:00
Taylor Otwell f8fe7843ab tweak event queue. 2012-05-11 10:30:23 -05:00
Taylor Otwell 314f25bd28 fixing conflicts. 2012-05-11 08:49:17 -05:00
Taylor Otwell ef6076b2ce added event queues. 2012-05-11 08:48:31 -05:00
Taylor Otwell 94f49c3627 Merge pull request #663 from cviebrock/develop 
Fix order of elements for Cookie::put() in Auth driver
 2012-05-10 20:07:23 -07:00
Taylor Otwell 492b49a04b Merge pull request #661 from cviebrock/develop 
Fix for #660
 2012-05-10 14:33:55 -07:00
Taylor Otwell df79b47cc9 Merge pull request #656 from cviebrock/array-helpers 
Doc change for issue #648
 2012-05-10 09:44:12 -07:00
Taylor Otwell af9f875ee3 Remote unneeded properties. 2012-05-10 11:37:30 -05:00
Taylor Otwell 5fcf57a27d Updated change log. 2012-05-10 08:45:12 -05:00
Taylor Otwell 21a51b7cf9 Add controller and controller_action to route. 2012-05-10 08:44:43 -05:00
Taylor Otwell 641f1d4c14 Merge pull request #615 from awellis13/feature/route-cleanup 
Laravel\Route PHPDoc cleanup and removed $uri from Route::parameters().
 2012-05-10 06:35:54 -07:00
Taylor Otwell 01894ae4ee Merge pull request #651 from dlpetrie/patch-4 
Controller property Bundle ( and some additions )
 2012-05-10 06:34:18 -07:00
Taylor Otwell d0edf92e31 Merge pull request #640 from crynobone/feature/remove-prettyprint 
Google Pretty Print never loaded, there's no need to include it.
 2012-05-10 06:31:49 -07:00
Taylor Otwell 0ad9c67fa0 Merge pull request #631 from loic-sharma/patch-2 
Allow Blade extensions to actually extend Blade
 2012-05-10 06:28:58 -07:00
Taylor Otwell 287f2a299f Merge pull request #641 from crynobone/feature/form-select-optgroup 
Add support for Form::select with optgroup, solved #526
 2012-05-10 06:26:35 -07:00
Taylor Otwell cded744ac9 Merge pull request #648 from cviebrock/array-helpers 
add array_except() and array_only(), mimicking Input::except() and Input::only() but for any array
 2012-05-10 06:25:51 -07:00
Taylor Otwell c0b9de27eb Merge pull request #645 from cviebrock/develop 
Auth Driver uses Crypter
 2012-05-09 14:04:20 -07:00