Commit Graph

1660 Commits

Author SHA1 Message Date
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
Tobsn 967d9898ae dann typo
i had one job…
2012-08-21 14:11:25 +02:00
Tobsn fa0fcff346 added unsigned() description
was missing…
2012-08-21 14:09:41 +02:00
Tobsn 161ae3f6e6 Docu on how to ensure foreign() works
tons of people are doing it wrong every day - this should fix it or at
least can be used as reference.
2012-08-21 00:12:29 +02:00
Tobsn 546c962612 Revert "Docu on how to ensure foreign() works"
This reverts commit b92f5bc854.
2012-08-21 00:10:03 +02:00
Tobsn b92f5bc854 Docu on how to ensure foreign() works
tons of people are doing it wrong every day - this should fix it or at
least can be used as reference.
2012-08-21 00:09:01 +02:00
Taylor Otwell 926cdaa7f5 reimplement locale uri slugs. 2012-08-20 10:46:23 -05:00
Hirohisa Kawase 359ee49f37 Added ## Laravel 3.2.5, and changed 'Upgrading From ...' to <h3>
Signed-off-by:Hirohisa Kawase <hiro.soft@gmail.com>
2012-08-18 20:40:56 +09:00
Dayle Rees 7298c93be1 Merge pull request #1109 from JesseObrien/feature/profiler-timers
Added profile timers
2012-08-17 13:28:28 -07:00
Jesse O'Brien 7193f29240 Added profile timers
Track the running time of a function
Profiler::time(function(){});
Profiler::time(function(){}, 'name');

Track a stopwatch style timer throughout your app
Profiler::tick('name');
Profiler::tick('name', function($timer){});
2012-08-17 16:22:12 -04:00
Taylor Otwell 1203473469 revert eloquent back to 3.2.3 2012-08-17 09:18:16 -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
Spencer Deinum 6c9d903e58 Added Command::run() to the documentation for artisan tasks.
Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>
2012-08-16 17:18:50 -04:00
Franz Liedke 385b776ba8 Docs: Finish section on pull request guidelines. 2012-08-15 11:47:27 -04:00
Franz Liedke f80d694a95 Contrib docs: add section stub about pull requests. 2012-08-15 10:47:51 -04:00
Franz Liedke 67464cb0f8 Fix typo in Github page table of contents. 2012-08-15 10:45:37 -04:00
Franz Liedke 1c7297dc02 Contrib docs: Remove pointless staging branch info. 2012-08-15 17:33:22 +03:00
Franz Liedke 5359085eda Fix contribution page links in documentation. 2012-08-15 17:27:50 +03: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
Dayle Rees a7c2c2544e Merge pull request #1053 from tobsn/patch-12
added array and array count validation for multi-select input
2012-08-12 12:50:10 -07:00
Dayle Rees 4b8ba99211 Merge pull request #1043 from tobsn/patch-10
type boolean is tinyint(1)
2012-08-12 12:43:15 -07:00
Dayle Rees e0338f3671 Merge branch 'core-tests' of https://github.com/franzliedke/laravel into develop 2012-08-12 16:19:13 +01:00
Jason Lewis 1bd157d0a6 Added in develop changes.
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-08-12 02:48:55 +09:30
Jason Lewis f685597180 Defer URI language support to L4.
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-08-12 02:16:11 +09:30
Jason Lewis a95b5eb4b9 Defer URI language support to L4.
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-08-12 02:15:52 +09:30
Jason Lewis 694f696cb6 Merge pull request #1063 from stayallive/develop
Changed jQuery '$' to 'jQuery' in the Profiler
2012-08-11 09:20: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 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