phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,028 Commits 3 Branches 0 Tags
50b10fca95e46730e15b81cdb80c5d43ce98096f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 50b10fca95 Merge pull request #1132 from cmenke/master 
Add Routing Wildcard '(:all)' to Documentation
 2012-09-01 17:56:31 -07:00
Taylor Otwell c17c872b6a Merge pull request #1123 from daris/patch-1 
Update laravel/documentation/database/fluent.md
 2012-09-01 17:53:14 -07:00
Taylor Otwell e8046847c4 fix tests. 2012-08-28 23:58:52 -05:00
Taylor Otwell 928ce7c037 Merge branch 'staging' 2012-08-28 23:56:42 -05:00
Taylor Otwell 9b902427fd Updating version. 2012-08-28 23:55:04 -05:00
Taylor Otwell 9484db18ce Revert Blade back to 3.2.3 due to regression with layouts. 2012-08-28 23:52:15 -05:00
Taylor Otwell dd01308315 Merge pull request #1098 from franzliedke/patch-35 
[Docs] Fix contribution page links
 2012-08-26 19:28:56 -07:00
Taylor Otwell 7fa54c2ed9 Merge pull request #1100 from franzliedke/patch-36 
[Docs] Pull request guidelines
 2012-08-26 19:28:30 -07:00
Taylor Otwell b86b8ffed1 Merge pull request #1113 from HiroKws/markdown-fix/doc-change 
Added ## Laravel 3.2.5, and changed 'Upgrading From ...' to <h3>
 2012-08-26 19:26:46 -07:00
Taylor Otwell 926cdaa7f5 reimplement locale uri slugs. 2012-08-20 10:46:23 -05:00
Taylor Otwell 1203473469 revert eloquent back to 3.2.3 2012-08-17 09:18:16 -05:00
Taylor Otwell e8119f8109 increment version. 2012-08-17 09:04:17 -05:00
Taylor Otwell 1e20052b08 Merge branch 'staging' 2012-08-17 09:03:56 -05:00
Taylor Otwell 4d1405269c Merge branch 'develop' into staging 2012-08-17 09:02:51 -05:00
Taylor Otwell 9718d5cd0d fix nested queries. 2012-08-17 09:02:32 -05:00
Taylor Otwell 8dbe2d1a9a Merge pull request #681 from bencorlett/develop 
Added Output Buffering
 2012-08-13 12:17:35 -07:00
Taylor Otwell 64605f2223 Merge pull request #706 from Vespakoen/patch-1 
(profiler doesn't show up) laravel.done event doesn't get fired for php-fcgi users
 2012-08-13 12:16:08 -07:00
Taylor Otwell feb651f630 Merge pull request #670 from kbanman/hmvc-fix 
Add support for non-string parameters in controller routes
 2012-08-13 12:13:58 -07:00
Taylor Otwell fdac5e843f Merge pull request #636 from ProgerXP/patch-bexpand 
Branch::expand()
 2012-08-13 12:08:50 -07:00
Taylor Otwell 43614cfeb9 Merge branch 'develop' of github.com:laravel/laravel into develop 2012-08-09 22:50:22 -05:00
Taylor Otwell 749948bc9d fix conflicts. 2012-08-09 22:49:36 -05:00
Taylor Otwell 7dae482708 Merge branch 'develop' into staging 2012-08-09 22:47:17 -05:00
Taylor Otwell 4d25f50f4b Merge pull request #1016 from purwandi/develop 
Add decimal schema on docs
 2012-08-09 20:45:11 -07:00
Taylor Otwell 29a4ac2701 Merge pull request #1049 from Apathetic012/develop 
fix namespace issue on exception
 2012-08-09 20:44:15 -07:00
Taylor Otwell 343d132737 tweak change log. 2012-08-09 22:42:35 -05:00
Taylor Otwell 79f92e57df defer language support in URIs to version 4. 2012-08-09 22:42:03 -05:00
Taylor Otwell f5123f935a Merge pull request #1052 from sergiigrebeniuk/hotfix-phpdoc 
phpdoc fixes
 2012-08-09 10:02:21 -07:00
Taylor Otwell bc34498a7c Merge pull request #1045 from franzliedke/patch-29 
Simplify extending the database session driver
 2012-08-03 07:44:04 -07:00
Taylor Otwell d667a15e05 Merge branch 'develop' into staging 2012-08-01 13:46:06 -05:00
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