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
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
690e8572aa
phpdoc fixes
2012-08-03 18:17:48 +03:00
727afc1bfa
fix namespace issue on exception
...
Signed-off-by: apathetic012 <apathetic012@gmail.com>
2012-08-03 10:01:16 +08:00
e86cd79b11
Make database connection protected in session driver.
2012-08-02 18:50:44 +03:00
5716b4da40
type boolean is tinyint(1)
...
switched from default "tinyint" which creates a tinyint(4) to the
standard mysql boolean type "tinyint(1)"
2012-08-02 00:54:30 +02:00
d816eb9ef3
Refix unit testing for Laravel
...
Signed-off-by: crynobone <crynobone@gmail.com>
2012-08-01 13:05:59 +08:00
7256dc2a65
Merge pull request #1024 from Apathetic012/develop
...
add output of File::mime() example
2012-07-31 09:11:12 -07:00
0556ef35ce
Merge branch 'develop' of github.com:laravel/laravel into develop
2012-07-31 16:55:50 +01:00
30175c2a52
fixing merge issues for comment tweaks
2012-07-31 16:55:02 +01:00
dab2c79298
Merge pull request #933 from franzliedke/patch-22
...
Request::time()
2012-07-31 08:46:43 -07:00
a0fd22f6f1
Merge pull request #772 from loic-sharma/patch-3
...
Fixed bug where the profiler did not correctly put quotes around bindings
2012-07-31 08:42:47 -07:00
01f8323420
Merge pull request #945 from cviebrock/html-link
...
Allow second param of HTML::link* methods to be null
2012-07-31 08:39:24 -07:00
2611c1f27a
fixing merge issue for blade comments pull
2012-07-31 14:42:23 +01:00
9ea5018372
Merge branch 'develop' of github.com:laravel/laravel into develop
2012-07-31 14:37:07 +01:00
9d9d1d010c
fixing merge for contribution docs
2012-07-31 14:36:44 +01:00
4b97c28c6b
Merge pull request #860 from stevefrost/develop
...
Updated the helper method dd()
2012-07-31 06:33:27 -07:00
184cc090bc
Merge pull request #1026 from jbruni/patch-1
...
Update laravel/documentation/controllers.md
2012-07-31 02:16:36 -07:00
3a471de777
franz routing docs fix
2012-07-31 10:06:10 +01:00
3d66011249
Merge pull request #1037 from tobsn/patch-9
...
Returning results with SHOW queries
2012-07-31 01:56:39 -07:00
37e5605c22
Merge pull request #1036 from tobsn/patch-8
...
Added use Closure to database.php
2012-07-31 01:55:02 -07:00
8c5ac60154
Merge pull request #935 from tobsn/patch-7
...
Added explanation about PDO default attributes
2012-07-31 01:53:41 -07:00
89d8c5bb0d
Returning results with SHOW queries
...
reference to #991
2012-07-31 10:04:53 +02:00
244ecd49fd
Added use Closure to database.php
...
function extend($name, Closure $connector
extend uses closure - causes exception on call without use.
2012-07-31 09:55:45 +02:00
c9710525d9
Merge pull request #1020 from metaphox/develop
...
Removes status parameter for Response::view() in documentation section "Views & Responses"
2012-07-30 20:27:32 -07:00
Taylor Otwell
Spencer Deinum
Dayle Rees
Jason Lewis
Simon Aebersold
Tobsn
Alex Bouma
Sergii Grebeniuk
apathetic012
Franz Liedke
crynobone