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
Joe Wallace
d31f89d42f
Fixing a bug with saving data to pivot table
2012-08-09 22:10:49 -05:00
Dayle Rees
b5e81cb33c
Merge pull request #1083 from spencerdeinum/master
...
Input documentation fix.
2012-08-09 13:23:33 -07:00
Spencer Deinum
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
Taylor Otwell
f5123f935a
Merge pull request #1052 from sergiigrebeniuk/hotfix-phpdoc
...
phpdoc fixes
2012-08-09 10:02:21 -07:00
Sinan Eldem
0d718bbf30
Added Turkish language files.
...
Signed-off-by: Sinan Eldem <sinan@sinaneldem.com.tr>
2012-08-08 11:36:28 +03:00
Phill Sparks
ebec6ba8e0
Merge pull request #1077 from aebersold/master
...
Fix Documentation Error in html.md
2012-08-07 14:56:44 -07:00
Simon Aebersold
8227784e11
Documentation Error, see /laravel/html.php line 225 for reference
2012-08-07 17:24:02 +02:00
Phill Sparks
86b0ac0dff
Merge pull request #1064 from jwpage/bug/fix_index_path
...
Update path to index view file.
2012-08-07 06:17:08 -07:00
Tobsn
43c3c2de68
fixes from testing
...
- all tested now - ready for merge into staging :P
2012-08-06 03:10:39 +02:00
Johnson Page
93f5785911
Update path to index view file.
...
Signed-off-by: Johnson Page <jwpage@gmail.com>
2012-08-05 07:51:09 +10:00
Alex Bouma
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
Jakobud
31c730c913
Passing a null $value to Form::submit(), Form::reset() or Form::button() was throwing an Exception. I made the default $value = null for those methods. They result in the following respective valid HTML: <input type='submit'/> <input type='reset'/> <button></button>
...
Signed-off-by: Jakobud <jake.e.wilson@gmail.com>
2012-08-03 10:47:34 -06:00
Tobsn
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
Sergii Grebeniuk
690e8572aa
phpdoc fixes
2012-08-03 18:17:48 +03:00
Franz Liedke
228f57226b
Extract sweep method in Session payload class.
...
This allows for manually triggering garbage collection in session drivers.
2012-08-03 18:09:37 +03: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
apathetic012
727afc1bfa
fix namespace issue on exception
...
Signed-off-by: apathetic012 <apathetic012@gmail.com>
2012-08-03 10:01:16 +08:00
Franz Liedke
e86cd79b11
Make database connection protected in session driver.
2012-08-02 18:50:44 +03:00
Tobsn
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
Taylor Otwell
d667a15e05
Merge branch 'develop' into staging
2012-08-01 13:46:06 -05:00
Franz Liedke
a28698ed36
Merge pull request #1 from crynobone/core-tests
...
Refix unit testing for Laravel
2012-08-01 06:33:26 -07:00
crynobone
d816eb9ef3
Refix unit testing for Laravel
...
Signed-off-by: crynobone <crynobone@gmail.com>
2012-08-01 13:05:59 +08:00
Jakobud
761186a676
Reorganized Control Structure section.
...
Added Control Structure to TOC.
Added in missing @elseif example.
Move the Blade Comments to more appropriate section.
Simplified Blade Comments examples.
Minor changes to @parent example.
Signed-off-by: Jakobud <jake.e.wilson@gmail.com>
2012-07-31 12:00:47 -06:00
Dayle Rees
7256dc2a65
Merge pull request #1024 from Apathetic012/develop
...
add output of File::mime() example
2012-07-31 09:11:12 -07:00
Dayle Rees
06ac3274e5
Merge pull request #917 from HiroKws/japanese-language
...
Japanese language
2012-07-31 09:08:20 -07:00
Dayle Rees
0556ef35ce
Merge branch 'develop' of github.com:laravel/laravel into develop
2012-07-31 16:55:50 +01:00
Dayle Rees
30175c2a52
fixing merge issues for comment tweaks
2012-07-31 16:55:02 +01:00
Dayle Rees
dab2c79298
Merge pull request #933 from franzliedke/patch-22
...
Request::time()
2012-07-31 08:46:43 -07:00
Dayle Rees
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
Dayle Rees
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
Dayle Rees
2611c1f27a
fixing merge issue for blade comments pull
2012-07-31 14:42:23 +01:00
Dayle Rees
9ea5018372
Merge branch 'develop' of github.com:laravel/laravel into develop
2012-07-31 14:37:07 +01:00
Dayle Rees
9d9d1d010c
fixing merge for contribution docs
2012-07-31 14:36:44 +01:00
Dayle Rees
4b97c28c6b
Merge pull request #860 from stevefrost/develop
...
Updated the helper method dd()
2012-07-31 06:33:27 -07:00
Dayle Rees
184cc090bc
Merge pull request #1026 from jbruni/patch-1
...
Update laravel/documentation/controllers.md
2012-07-31 02:16:36 -07:00
Dayle Rees
3a471de777
franz routing docs fix
2012-07-31 10:06:10 +01:00
Dayle Rees
3d66011249
Merge pull request #1037 from tobsn/patch-9
...
Returning results with SHOW queries
2012-07-31 01:56:39 -07:00
Dayle Rees
37e5605c22
Merge pull request #1036 from tobsn/patch-8
...
Added use Closure to database.php
2012-07-31 01:55:02 -07:00
Dayle Rees
8c5ac60154
Merge pull request #935 from tobsn/patch-7
...
Added explanation about PDO default attributes
2012-07-31 01:53:41 -07:00
Tobsn
89d8c5bb0d
Returning results with SHOW queries
...
reference to #991
2012-07-31 10:04:53 +02:00
Tobsn
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
Jason Lewis
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
Jakobud
2c7bf657ed
Removed empty Coding Standards doc.
...
Removed Coding Standards from Table of Contents Sidebar.
Signed-off-by: Jakobud <jake.e.wilson@gmail.com>
2012-07-30 13:32:53 -06:00