f34063c517
Fix bug in Eloquent to_array method.
2012-08-29 14:44:16 -05:00
e8046847c4
fix tests.
2012-08-28 23:58:52 -05:00
928ce7c037
Merge branch 'staging'
2012-08-28 23:56:42 -05:00
9b902427fd
Updating version.
2012-08-28 23:55:04 -05:00
9484db18ce
Revert Blade back to 3.2.3 due to regression with layouts.
2012-08-28 23:52:15 -05:00
dd01308315
Merge pull request #1098 from franzliedke/patch-35
...
[Docs] Fix contribution page links
2012-08-26 19:28:56 -07:00
7fa54c2ed9
Merge pull request #1100 from franzliedke/patch-36
...
[Docs] Pull request guidelines
2012-08-26 19:28:30 -07:00
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
967d9898ae
dann typo
...
i had one job…
2012-08-21 14:11:25 +02:00
fa0fcff346
added unsigned() description
...
was missing…
2012-08-21 14:09:41 +02:00
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
546c962612
Revert "Docu on how to ensure foreign() works"
...
This reverts commit b92f5bc854
2012-08-21 00:10:03 +02:00
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
926cdaa7f5
reimplement locale uri slugs.
2012-08-20 10:46:23 -05:00
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
7298c93be1
Merge pull request #1109 from JesseObrien/feature/profiler-timers
...
Added profile timers
2012-08-17 13:28:28 -07:00
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
1203473469
revert eloquent back to 3.2.3
2012-08-17 09:18:16 -05:00
1e20052b08
Merge branch 'staging'
2012-08-17 09:03:56 -05:00
4d1405269c
Merge branch 'develop' into staging
2012-08-17 09:02:51 -05:00
9718d5cd0d
fix nested queries.
2012-08-17 09:02:32 -05:00
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
385b776ba8
Docs: Finish section on pull request guidelines.
2012-08-15 11:47:27 -04:00
f80d694a95
Contrib docs: add section stub about pull requests.
2012-08-15 10:47:51 -04:00
67464cb0f8
Fix typo in Github page table of contents.
2012-08-15 10:45:37 -04:00
1c7297dc02
Contrib docs: Remove pointless staging branch info.
2012-08-15 17:33:22 +03:00
5359085eda
Fix contribution page links in documentation.
2012-08-15 17:27:50 +03:00
8dbe2d1a9a
Merge pull request #681 from bencorlett/develop
...
Added Output Buffering
2012-08-13 12:17:35 -07:00
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
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
fdac5e843f
Merge pull request #636 from ProgerXP/patch-bexpand
...
Branch::expand()
2012-08-13 12:08:50 -07:00
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
4b8ba99211
Merge pull request #1043 from tobsn/patch-10
...
type boolean is tinyint(1)
2012-08-12 12:43:15 -07:00
e0338f3671
Merge branch 'core-tests' of https://github.com/franzliedke/laravel into develop
2012-08-12 16:19:13 +01:00
1bd157d0a6
Added in develop changes.
...
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-08-12 02:48:55 +09:30
f685597180
Defer URI language support to L4.
...
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-08-12 02:16:11 +09:30
a95b5eb4b9
Defer URI language support to L4.
...
Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
2012-08-12 02:15:52 +09:30
694f696cb6
Merge pull request #1063 from stayallive/develop
...
Changed jQuery '$' to 'jQuery' in the Profiler
2012-08-11 09:20:50 -07:00
43614cfeb9
Merge branch 'develop' of github.com:laravel/laravel into develop
2012-08-09 22:50:22 -05:00
749948bc9d
fix conflicts.
2012-08-09 22:49:36 -05:00
4d25f50f4b
Merge pull request #1016 from purwandi/develop
...
Add decimal schema on docs
2012-08-09 20:45:11 -07:00
29a4ac2701
Merge pull request #1049 from Apathetic012/develop
...
fix namespace issue on exception
2012-08-09 20:44:15 -07:00
343d132737
tweak change log.
2012-08-09 22:42:35 -05:00
79f92e57df
defer language support in URIs to version 4.
2012-08-09 22:42:03 -05:00
e5dc10840a
Fix documentation error in input.md
...
Documentation says "Replacing the entire input" but calls Input::merge()
instead of Input::replace().
Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>
2012-08-09 15:44:34 -04:00
f5123f935a
Merge pull request #1052 from sergiigrebeniuk/hotfix-phpdoc
...
phpdoc fixes
2012-08-09 10:02:21 -07:00
8227784e11
Documentation Error, see /laravel/html.php line 225 for reference
2012-08-07 17:24:02 +02:00
43c3c2de68
fixes from testing
...
- all tested now - ready for merge into staging :P
2012-08-06 03:10:39 +02:00
f0e261c87f
Changed jQuery '$' to 'jQuery' in the Profiler
...
Changed the '$' to 'jQuery' in profiler.js because it conflicts with libs like 'prototype.js'.
I did not use '.noConflict()' because of the people that do use the '$'.
Signed-off-by: Alex Bouma <info@alboweb.nl>
2012-08-05 00:34:54 +03:00
bf07de7d5e
added array and array count validation
...
added validate_array/count/countmin/countmax/countbetween -
corresponding replace_count/countmin/countmax/countbetween message
functions - corresponding validator error messages into all language
files (please have maintainers update their language files) - also
converted spaces to tabs in the polish language file to fit all the
others.
2012-08-03 17:27:29 +02:00
Taylor Otwell
Tobsn
Hirohisa Kawase
Dayle Rees
Jesse O'Brien
Spencer Deinum
Franz Liedke
Jason Lewis
Simon Aebersold
Alex Bouma