phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,856 Commits 3 Branches 0 Tags
0bc38ff2a89a789b425dc42cc680be712a438384
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 5c3ede74d9 Merge pull request #946 from franzliedke/patch-23 
Fix eager loading constraints
 2012-07-24 06:09:41 -07:00
Taylor Otwell 764e7bc630 Merge pull request #983 from racklin/bugfix/memcached 
Fixed Memcached get connection instance typo in __callStatic method.
 2012-07-24 06:08:54 -07:00
Taylor Otwell b194d8372d Merge pull request #987 from robmeijer/develop 
Fix pivot table name in Many-to-Many section in Eloquent documentation.
 2012-07-24 06:08:32 -07:00
Taylor Otwell 38234c61dd Merge pull request #480 from cviebrock/schema-rename 
Schema::rename('oldtable','newtable') support
 2012-07-19 13:42:34 -07:00
Taylor Otwell c937f98b49 Merge pull request #932 from JeffreyWay/feature/auth_attempt_extend 
Extend Auth::Attempt()
 2012-07-19 13:41:33 -07:00
Taylor Otwell 19c64f1ea7 return false on empty string for active url. 2012-07-19 15:39:18 -05:00
Taylor Otwell cd9a745cb5 Merge pull request #972 from franzliedke/patch-28 
[Schema] Allow boolean default values
 2012-07-19 13:35:18 -07:00
Taylor Otwell 527e291f14 Merge pull request #976 from Jakobud/bug/docs-bundle 
Fixed some bugs with the docs bundle
 2012-07-19 13:34:37 -07:00
Taylor Otwell 03d22362ec Merge pull request #978 from racklin/pgsql-schema 
Added support PostgreSQL schema.
 2012-07-19 13:34:00 -07:00
Taylor Otwell ec41836241 Merge pull request #938 from Anahkiasen/develop 
Added quick notes on Pivot tables
 2012-07-17 17:19:31 -07:00
Taylor Otwell 680407f051 Merge pull request #959 from franzliedke/patch-25 
[Docs] Deleting files
 2012-07-17 17:18:41 -07:00
Taylor Otwell c6e4a25ae9 Merge pull request #966 from racklin/develop 
Fixed IoC::resolve forces singleton issue.
 2012-07-17 17:16:43 -07:00
Taylor Otwell a73a6fb6c4 Merge pull request #970 from franzliedke/patch-26 
[Docs] Schema default helper
 2012-07-17 17:15:30 -07:00
Taylor Otwell a87615da45 Merge pull request #971 from franzliedke/patch-27 
[Docs] Fix bundle routing link
 2012-07-17 17:14:45 -07:00
Taylor Otwell e19e4ebd24 tweak url for languages. 2012-07-11 10:30:44 -05:00
Taylor Otwell 10e5918e23 clear out langauges option. 2012-07-11 10:24:08 -05:00
Taylor Otwell 5f919d76a5 updated change log. 2012-07-11 10:20:12 -05:00
Taylor Otwell c8718a32ec added option for URI languages. 2012-07-11 10:18:48 -05:00
Taylor Otwell 1879e6575a tweak eloquent model change method to not check types. 2012-07-10 08:02:08 -05:00
Taylor Otwell 82ababb4cb Add note about making view directory writable. 2012-07-09 09:54:56 -05:00
Taylor Otwell ebcbbbb843 WIP. 2012-07-09 09:54:03 -05:00
Taylor Otwell 845023fc80 Merge pull request #847 from tobsn/patch-1 
NOT NULL order issue fixed!
 2012-07-06 18:12:11 -07:00
Taylor Otwell 430eeb6da1 Merge pull request #798 from xsbeats/feature/validation_required_with 
Added required_with validation rule...
 2012-07-06 18:11:19 -07:00
Taylor Otwell 990f10f6de Merge pull request #854 from jasonlewis/feature/pattern-filters 
Allow filter patterns to supply a name and callback as an easier alternative.
 2012-07-06 17:57:46 -07:00
Taylor Otwell 4de201002d Merge pull request #862 from franzliedke/patch-15 
[View] Pass variables with more expressive methods
 2012-07-06 17:57:15 -07:00
Taylor Otwell 8198dc23f3 Merge pull request #874 from franzliedke/patch-16 
[Eloquent] Constraining eager loads only allows WHERE clauses
 2012-07-06 17:51:27 -07:00
Taylor Otwell 69e1ea939d Merge pull request #868 from lucadegasperi/bug/phpunit 
Artisan test command fix
 2012-07-06 17:50:13 -07:00
Taylor Otwell f338db50db Merge pull request #888 from TommyC81/patch-3 
Documentation on how to attach data to pivot table
 2012-07-06 17:49:20 -07:00
Taylor Otwell 03ad47e2df Merge pull request #880 from tomasz-tomczyk/feature/polish-translation 
Polish translation
 2012-07-06 17:48:55 -07:00
Taylor Otwell 12bc7f1ee0 Merge pull request #889 from Nirlah/develop 
Hebrew Translation
 2012-07-06 17:48:40 -07:00
Taylor Otwell 90447e7183 Merge pull request #892 from jasonlewis/bug/database/select 
Fixes #818, allows Query select to just be an Expression.
 2012-07-06 17:14:20 -07:00
Taylor Otwell 06154abe8d Merge pull request #895 from TomorrowToday/develop 
Eloquent docs update: eager loading using $includes example
 2012-07-06 17:12:15 -07:00
Taylor Otwell 0556d8e3f0 Merge pull request #899 from RoumenMe/develop 
Bulgarian translation
 2012-07-06 17:08:26 -07:00
Taylor Otwell e6ff7ba336 Merge pull request #901 from franzliedke/patch-18 
Ignore NULL values when determining whether a model object is dirty
 2012-07-06 17:07:58 -07:00
Taylor Otwell a9d27ba79c Merge pull request #902 from JesseObrien/feature/eloquent-update-timestamp 
Feature/eloquent update timestamp
 2012-07-06 17:07:34 -07:00
Taylor Otwell 6e9efb464d Merge pull request #903 from Lapayo/master 
Fixed a little bug with the Input::has_file function
 2012-07-06 17:06:33 -07:00
Taylor Otwell 0171cf8e91 Merge pull request #905 from franzliedke/patch-19 
[Docs] Localization page: Fix anchor name
 2012-07-06 17:05:59 -07:00
Taylor Otwell dcf1966c28 Merge pull request #910 from franzliedke/patch-20 
Force UTF-8 charset on JSON responses
 2012-07-06 17:04:55 -07:00
Taylor Otwell 5c44cf98cd Merge pull request #879 from franzliedke/patch-17 
[Eloquent] Bug with eager loading relationships and isset()
 2012-07-06 17:04:34 -07:00
Taylor Otwell 750365c740 increment version 2012-06-28 15:28:26 -05:00
Taylor Otwell d53ac0e9d1 update change log 2012-06-28 15:28:03 -05:00
Taylor Otwell 8d17702b9c Merge branch 'staging' into develop 2012-06-28 15:26:25 -05:00
Taylor Otwell 14e9488cf9 Speed up eager loading of many to many. 2012-06-28 15:19:20 -05:00
Taylor Otwell 2d4fa7217a Merge pull request #867 from niallobrien/develop 
Updated Validation docs
 2012-06-27 20:41:19 -07:00
Taylor Otwell 1f93039ba7 Merge pull request #873 from dlpetrie/master 
Adding support for '=', in (:any) and (:any?) route patterns
 2012-06-27 20:39:59 -07:00
Taylor Otwell 7af0304fe8 Merge branch 'master' into develop 2012-06-21 11:38:50 -05:00
Taylor Otwell 1b062499dd Merge pull request #774 from franzliedke/patch-8 
Avoid unnecessary end() in Table::command() function
 2012-06-20 09:59:50 -07:00
Taylor Otwell 3fcb3aac6c Merge pull request #775 from franzliedke/patch-9 
Foreign key creation ignores database prefix
 2012-06-20 09:58:38 -07:00
Taylor Otwell a203a12da4 Merge pull request #799 from Jelle-S/develop 
Eloquent - simplify eager loading
 2012-06-20 09:57:59 -07:00
Taylor Otwell 81efdcf157 Merge pull request #776 from JesseObrien/develop 
Request::ip() doesn't return default
 2012-06-20 09:56:01 -07:00
Taylor Otwell 6e28d0bf2c Merge pull request #812 from stefanneubig/patch-2 
Fixed namespace issue when registering a session driver with the extend ...
 2012-06-20 09:52:09 -07:00
Taylor Otwell 6405175dbd Merge pull request #819 from jasonlewis/patch-11 
Allow checking of named view existance.
 2012-06-20 09:49:12 -07:00
Taylor Otwell fc96014c4f Merge pull request #821 from daylerees/feature/clear-input 
Added clear() method to the input class
 2012-06-20 09:47:02 -07:00
Taylor Otwell 7354b5fc72 Merge pull request #824 from tobsn/patch-1 
Added UNSIGNED to mysql grammar inrementer()
 2012-06-20 09:46:16 -07:00
Taylor Otwell 1f9f064bf6 Merge pull request #831 from jasonlewis/feature/blade-break 
Added an @break to blade to break out of loops.
 2012-06-20 09:43:15 -07:00
Taylor Otwell 749a91f948 Merge pull request #840 from noor/develop 
Fixed optgroup closing tag
 2012-06-20 09:42:12 -07:00
Taylor Otwell 1c0501ef30 Merge pull request #833 from tobsn/patch-4 
Added important note about @layout call
 2012-06-20 09:41:49 -07:00
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