phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,169 Commits 3 Branches 0 Tags
d1c1fe4446aecb33de3344b237e68448ba9466b2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell d1c1fe4446 fix bug in eloquent model and update version. 2012-09-27 17:45:12 -04:00
Taylor Otwell 02cb96a008 fix bug in eloquent model. 2012-09-27 17:44:03 -04:00
Taylor Otwell ae5331b312 Merge branch 'staging' 2012-09-27 09:08:20 -04:00
Taylor Otwell 4de8e2d717 Update change log. 2012-09-27 09:05:29 -04:00
Taylor Otwell b043482905 Improve view errors. 2012-09-26 16:20:56 -04:00
Taylor Otwell 633c2bde83 Pass the path to the filter event. 2012-09-26 11:20:03 -04:00
Taylor Otwell a976c555e6 Added "view.filter" event so we can hook in final filters. 2012-09-26 10:43:34 -04:00
Taylor Otwell 14c6ff1692 Increment version and change log. 2012-09-26 10:13:30 -04:00
Taylor Otwell 3e3ee870ea Merge branch 'develop' of github.com:laravel/laravel into develop 2012-09-26 10:11:46 -04:00
Taylor Otwell d64d6c9092 Fix logging issue when using the laravel.log event. 2012-09-26 10:11:24 -04:00
Taylor Otwell 09500818e0 Merge pull request #1204 from bryantebeek/optimisation/str-class 
Performance enhancement for Str Class (see pull request #1180)
 2012-09-25 18:37:53 -07:00
Taylor Otwell fc9b0e1636 Merge pull request #1201 from JoostK/fix-1 
Fixed a problem with `Eloquent::get_dirty`
 2012-09-25 18:37:09 -07:00
Taylor Otwell 4b7dc2e824 Merge pull request #1226 from akuzemchak/bug/language-routes 
Fixes language URI routing issue
 2012-09-25 18:34:40 -07:00
Taylor Otwell 439f9c8055 Merge pull request #1236 from kuroi/patch-1 
Correct broken links in docs
 2012-09-25 18:33:48 -07:00
Taylor Otwell dad0bbc688 Merge pull request #1247 from dcelasun/patch-1 
Fix a tiny typo
 2012-09-25 18:33:14 -07:00
Taylor Otwell 9acf541653 Merge pull request #1255 from joual/develop 
Auth token now nulled on logout
 2012-09-25 18:32:36 -07:00
Taylor Otwell 5a1741e9d5 Merge pull request #1276 from rk/rk-issue-1261 
[#1261] get_key now pulls from $original instead
 2012-09-25 18:31:34 -07:00
Taylor Otwell c2a255c788 Merge branch 'develop' into staging 2012-09-25 20:24:50 -04:00
Taylor Otwell 9e0ff85b24 Merge branch 'master' of github.com:laravel/laravel into staging 2012-09-25 20:24:48 -04:00
Taylor Otwell 4eac00a009 Use hash_hmac on cookie hashes. 2012-09-25 16:43:58 -04:00
Taylor Otwell 064309c0ce Merge branch 'cookies' into develop 2012-09-25 08:44:53 -05:00
Taylor Otwell 04f22f086d Update change log. 2012-09-25 08:42:03 -05:00
Taylor Otwell ad313198df working on cookie fingerprinting. 2012-09-25 08:40:48 -05:00
Taylor Otwell 110966bd6a working on cookie fingerprinting. 2012-09-25 08:40:29 -05:00
Taylor Otwell 4f7dd1c8a4 Merge pull request #1233 from franzliedke/patch-51 
GitHub contribution guidelines
 2012-09-17 11:07:41 -07:00
Taylor Otwell 96f428f83c Merge pull request #1186 from akuzemchak/feature/json 
Allow Input::json() to return array instead of object
 2012-09-05 13:11:43 -07:00
Taylor Otwell 07bec5c043 Merge branch 'master' into staging 2012-09-01 22:16:46 -05:00
Taylor Otwell 1f005bd7e5 Remove notification from travis file. 2012-09-01 22:16:30 -05:00
Taylor Otwell 8afab342c6 Incrementing version and updating change log. 2012-09-01 22:09:47 -05:00
Taylor Otwell 4e21cfce39 Fixing a double slash bug in URL generation with languages. add tests. 2012-09-01 22:07:01 -05:00
Taylor Otwell 8a9acbccf0 Merge branch 'staging' 2012-09-01 21:50:41 -05:00
Taylor Otwell cfe5fa109a Add fix to change log. 2012-09-01 21:50:14 -05:00
Taylor Otwell 2e01c58f92 Fix error handling. 2012-09-01 21:48:37 -05:00
Taylor Otwell b061b9b21c Merge pull request #1150 from franzliedke/patch-40 
Get rid of duplicate code for DROP TABLE in schema grammars.
 2012-09-01 18:05:29 -07:00
Taylor Otwell 852b10e836 Merge pull request #1143 from franzliedke/patch-38 
Fix insert() method for related models.
 2012-09-01 18:02:41 -07:00
Taylor Otwell 1b475d8f9c Merge pull request #1142 from HendrikJan/master 
Improved code examples for inserting related models
 2012-09-01 18:01:20 -07:00
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 db48fa4140 Merge pull request #1121 from mcintyre94/minor/unprotect-eloquent-timestamps 
Minor/unprotect eloquent timestamps
 2012-09-01 17:52:53 -07:00
Taylor Otwell c974052c13 Merge pull request #1115 from HiroKws/delete-top-anchor/doc-session.config 
Deleted an anchor of top of line. Defined "config", but it was reffered ...
 2012-09-01 17:50:46 -07:00
Taylor Otwell 5e11cb91ed Merge pull request #1112 from HiroKws/fix-markdown/git-docs 
Change some Markdown to fit other md files' format.
 2012-09-01 17:50:04 -07:00
Taylor Otwell b3319f5d36 Merge pull request #1051 from franzliedke/patch-30 
[Session] Trigger garbage collection (sweep) manually
 2012-09-01 17:47:45 -07:00
Taylor Otwell 175683f9cc Merge pull request #1092 from franzliedke/patch-34 
German translation for array validator messages
 2012-09-01 17:44:15 -07:00
Taylor Otwell 4db08087f7 Merge pull request #1089 from kbanman/fix-query-lists 
Fix Query::lists() for empty resultsets
 2012-09-01 17:41:49 -07:00
Taylor Otwell 4a60981582 Merge pull request #1084 from joecwallace/pivot_fix 
Fixing a bug with saving data to pivot table
 2012-09-01 17:40:14 -07:00
Taylor Otwell 017c65c0bc Merge pull request #1056 from Jakobud/bug/form/buttons/defaultValues 
Fixed Exception thrown when passing null $value to Form::submit(), Form::reset(), Form::button()
 2012-09-01 17:35:34 -07:00
Taylor Otwell 22962fce4a Merge pull request #1041 from Jakobud/feature/docs/templating 
Reorg and Additions and Improvements to Templating Documentation
 2012-09-01 17:29:41 -07:00
Taylor Otwell 0a908eff8d Merge pull request #1014 from jasonlewis/feature/root-bundles 
Allow bundles to respond to root requests.
 2012-09-01 17:26:35 -07:00
Taylor Otwell 8e8ef861b6 Merge pull request #1013 from Jakobud/bug/artisan-task-route 
Artisan route task was ignoring the specified route
 2012-09-01 17:25:40 -07:00
Taylor Otwell 5b14091e3f Merge pull request #858 from franzliedke/patch-14 
[Auth] Eloquent driver does now allow login via object
 2012-09-01 16:58:57 -07:00
Taylor Otwell 46f68ab78c Merge pull request #813 from anaxamaxan/patch-3 
Allow Model instance or id for first argument in Has_Many_And_Belongs_To::attach()
 2012-09-01 16:52:36 -07:00
Taylor Otwell 8f8fa09708 Merge pull request #811 from xsbeats/feature/str_limit_exact 
Feature: Str::limit_exact    limits a string including its custom ending to a specified length
 2012-09-01 16:51:39 -07:00
Taylor Otwell c7679bafe0 Merge pull request #770 from abigwonderful/develop 
added dblib option to sqlsrv connector class /sam fitz (abigwonderful)
 2012-09-01 16:45:50 -07:00
Taylor Otwell c785067e95 Increment version and change log. 2012-08-29 14:45:22 -05:00
Taylor Otwell f34063c517 Fix bug in Eloquent to_array method. 2012-08-29 14:44:16 -05: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