phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,632 Commits 3 Branches 0 Tags
b1707f2bc1d8c4852447d54e568cb7748b3eb811
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
Taylor Otwell 1f706bd2d1 Merge pull request #633 from crynobone/feature/validator-replace-attr 
Validator: During replace :attribute, need to verify Lang::has('key') instead of checking is_null()
 2012-05-05 11:40:24 -07:00
Taylor Otwell 47b6492a7e updated lang::has method. 2012-05-05 11:36:04 -05:00
Taylor Otwell 515f5f4009 change matcher function to public. 2012-05-04 14:49:07 -05:00
Taylor Otwell 16719ed455 Merge pull request #630 from dlpetrie/patch-3 
Fixing namespace issue with blade extend closure
 2012-05-04 12:43:16 -07:00
Taylor Otwell d3811af333 Merge pull request #625 from daylerees/docs-style-fix 
Ubuntu font in docs, and naughty inline styles fixed.
 2012-05-04 12:06:41 -07:00
Taylor Otwell 70d4746159 cleaning up. 2012-05-04 13:38:30 -05:00
Taylor Otwell a697781390 Merge pull request #628 from daylerees/custom-blade 
Blade::register() custom blade compilers.
 2012-05-04 11:36:57 -07:00
Taylor Otwell 0824c871fd tweaking wording. 2012-05-04 10:51:16 -05:00
Taylor Otwell 84f2209e3c Merge pull request #624 from CoolGoose/patch-1 
updated templating docs a bit with a function example
 2012-05-04 08:49:44 -07:00
Taylor Otwell c764f76e5b remove extra method call. 2012-05-04 09:13:03 -05:00
Taylor Otwell a59cdd937a updated version. 2012-05-04 09:00:47 -05:00
Taylor Otwell 6923b7c95d Merge pull request #623 from sparksp/develop-patch-view 
Fix View's use of Events so you can actually implement your own things
 2012-05-04 06:57:24 -07:00
Taylor Otwell e85ca96e38 Merge pull request #614 from awellis13/feature/trim-sql-for-query 
Add trim() to Connection::query()
 2012-05-04 06:52:22 -07:00
Taylor Otwell caf0bb7cb2 Fully qualify eloquent class. 2012-05-03 20:22:03 -05:00
Taylor Otwell 50dc9f8663 Use regular array_merge on Input::all(). 2012-05-03 17:32:33 -05:00
Taylor Otwell e256a66b18 Merge pull request #562 from ProgerXP/patch-lang 
Lang::__construct(): turn non-array $replacements into an array
 2012-05-03 06:44:34 -07:00
Taylor Otwell c2ed9e3429 return key instead of null when language line isn't found. 2012-05-03 08:42:44 -05:00
Taylor Otwell 74022cfa5a fix typo. 2012-05-03 08:38:43 -05:00
Taylor Otwell 280bc99ed8 add u PCRE modifier to str::words. 2012-05-03 08:37:52 -05:00
Taylor Otwell 4f036cf7dd add spacing to router. 2012-05-03 08:36:32 -05:00
Taylor Otwell 9ca81296d8 Merge pull request #589 from whitman/numeric-routes 
Automatically wrap numeric routes in parentheses
 2012-05-03 06:36:08 -07:00
Taylor Otwell d0cdfb971d clean up has_file method. 2012-05-03 08:35:02 -05:00
Taylor Otwell 5fa78819eb Merge branch 'develop' of github.com:laravel/laravel into develop 2012-05-03 08:33:04 -05:00
Taylor Otwell 11f08fb737 Merge pull request #590 from Vespakoen/develop 
Adding has_file method to the Input class
 2012-05-03 06:32:51 -07:00
Taylor Otwell 295c3b80c2 add sqlite query driver. 2012-05-03 08:28:40 -05:00
Taylor Otwell f53c8285a7 Merge pull request #564 from ProgerXP/patch-del 
Make File::delete() return result of unlink()
 2012-05-03 06:26:02 -07:00
Taylor Otwell 57c228aec6 Merge pull request #611 from asdfgh746/develop 
Fix Typos
 2012-05-03 06:21:21 -07:00
Taylor Otwell 4822f847c2 pass delete method through eloquent query. 2012-05-03 08:20:33 -05:00
Taylor Otwell aca2a2ae1c Fix auth bug and other resolver bugs. 2012-05-02 16:52:55 -05:00