4ecbef68a0
Merge pull request #1853 from cviebrock/table-macros
...
Add Macros to tables
2013-04-04 10:41:39 -07:00
78af4569de
Merge pull request #1855 from rittme/patch-1
...
get_dirty() comparison is not type safe
2013-04-04 10:40:18 -07:00
d8daedcb46
Merge pull request #1852 from andershammar/develop
...
Add validation error message for the 'required_without' rule
2013-04-04 08:10:32 -07:00
d46e19214b
get_dirty() comparison is not type safe
...
get_dirty() must compare using Not Identical (!==) on place of Not Equal (!=).
For example, changing null to false don't make the model dirty.
2013-04-04 12:50:59 +03:00
906d0d851e
add macros to tables
2013-04-03 18:26:15 -05:00
0fd3815f81
Merge branch 'develop' of git://github.com/laravel/laravel into develop
...
Conflicts:
laravel/documentation/requests.md
laravel/routing/router.php
license.txt
2013-04-03 18:19:08 -05:00
c9771d2fff
Add validation error message for the 'required_without' rule
2013-04-03 23:14:39 +02:00
785e168f5e
Check application.ssl when setting a secure cookie
...
Most SLL-related code in Laravel checks to see if `application.ssl`
is true before doing an action requiring it. `Cookie::put()` is the
only exception that I've found, to date, that doesn't test for SSL.
This checks to see that the SSL is enabled when attempting to set a
secure cookie.
To verify, set `application.ssl` to false (without this patch) then
run:
Cookie::put('foo', 'bar', 0, '/', null, true);
You will get an exception because of line 90 in `cookie.php`:
if ($secure and ! Request::secure())
{
throw new \Exception("Attempting to set secure cookie over HTTP.");
}
With this patch you will not get this error unless both `application.ssl`
is true, and the cookie `$secure` flag is set.
2013-04-03 12:13:21 -03:00
5dd3ec6f1e
Merge pull request #1845 from stevenklar/master
...
Add unregister IoC
2013-04-02 09:38:59 -07:00
4086d130d1
Add unregister to IoC-Contrainer
...
Signed-off-by: Steven Klar <steven.klar@mayflower.de>
2013-04-02 11:09:40 +02:00
67488916f4
Remove locales.
2013-03-30 08:46:49 -05:00
f0b8d2cc9d
Added locales configuration.
2013-03-29 15:48:32 -05:00
e86532e095
Merge pull request #1829 from neoascetic/return_non_0_on_command_fail
...
Exit with non-zero if command fails, useful in scripting and CI
2013-03-29 05:54:48 -07:00
1a6230b82a
Remove extra not_in.
2013-03-29 07:54:06 -05:00
1ba8e90b70
Use storage_path() helper in configuration files.
2013-03-29 07:52:49 -05:00
bc6b786973
Exit with non-zero if command fails, useful in scripting and CI
2013-03-29 12:27:09 +11:00
778a97b319
Merge pull request #1827 from neoascetic/flush_file_cache
...
Ability to flush file-based cache storage
2013-03-28 17:50:00 -07:00
0d99d13298
Ability to flush file-based cache storage
2013-03-29 11:02:26 +11:00
92e3ae47bb
Merge branch 'master' of github.com:laravel/laravel
2013-03-28 17:14:51 -05:00
4046313ecd
fix environment on tests.
2013-03-28 17:14:45 -05:00
f933db7a12
Merge pull request #1618 from demsey2/master
...
URI data available in the before filter.
2013-03-28 15:12:02 -07:00
ba3e481d4a
Merge pull request #1621 from mtthlm/master
...
Add Command alias to application configuration
2013-03-28 15:11:23 -07:00
52e9cd5c09
Merge pull request #1639 from frankwong/master
...
Add calling class and function information in logs
2013-03-28 15:08:05 -07:00
b914d07948
Merge pull request #1662 from fla/master
...
Romanian language
2013-03-28 14:54:02 -07:00
7888309502
Merge pull request #1663 from neoascetic/anbu_fix
...
Fix bug in ANBU that cause wrong total time showing on SQL tab
2013-03-28 14:53:50 -07:00
66c9dd46e5
Merge pull request #1665 from tkaw220/develop
...
Convert spaces to tab.
2013-03-28 14:52:56 -07:00
d293f9c6a8
Merge pull request #1676 from chrishow/form-label-html
...
Make HTML escaping optional for label contents.
2013-03-28 14:50:07 -07:00
37503be75b
Merge pull request #1685 from tzhuan/patch-1
...
Update laravel/session/drivers/cookie.php
2013-03-28 14:36:36 -07:00
ffd5769416
Merge pull request #1688 from Pasvaz/patch-2
...
Handles Redis password
2013-03-28 14:35:14 -07:00
20256d20e1
Merge pull request #1691 from brunogaspar/patch-1
...
Convert spaces to tabs
2013-03-28 14:34:37 -07:00
e8834d764e
Merge pull request #1692 from adityamenon/master
...
The tiniest PR you've ever seen.
2013-03-28 14:34:12 -07:00
e289bc4893
Merge pull request #1700 from davedx/master
...
Documentation update for Fluent
2013-03-28 14:30:22 -07:00
b593b109f6
Merge pull request #1706 from billmn/develop
...
Added "Not In" rule translation (fix issue #1701 )
2013-03-28 14:29:37 -07:00
7fe61b74d6
Merge pull request #1711 from torm3nt/master
...
Event firing of 500s now passes along the $exception object
2013-03-28 14:28:04 -07:00
d29282726d
Add commands to loader.
2013-03-28 16:27:39 -05:00
9b0fafe3d5
Merge pull request #1716 from briankiewel/readme-typo
...
small typo fix in readme
2013-03-28 14:24:21 -07:00
3f803d4eb3
Merge pull request #1719 from neoascetic/fix_custom_grammar
...
One more fix about custom query grammar
2013-03-28 14:23:47 -07:00
158b81974a
Merge pull request #1731 from dcelasun/master
...
Add flushing support to the Redis cache driver
2013-03-28 14:15:26 -07:00
18cda5037a
Move location of LARAVEL_START.
2013-03-28 16:07:32 -05:00
675157ea24
Merge pull request #1738 from bencorlett/patch-1
...
Remove tabs / spaces mix.
2013-03-28 14:06:13 -07:00
457d0f174a
Merge pull request #1746 from underparnv/master
...
Simply combines @import rules in public/laravel/css/style.css
2013-03-28 14:04:25 -07:00
118555002f
Merge pull request #1747 from voidman/patch-1
...
Update laravel/request.php
2013-03-28 14:04:05 -07:00
4125438391
Merge branch 'master' of github.com:laravel/laravel
2013-03-28 15:50:36 -05:00
15414808a1
fix padding bug in crypter.
2013-03-28 15:50:25 -05:00
0c2389ccb3
Fix language lines.
2013-03-28 15:43:38 -05:00
dd7c317707
Merge pull request #1793 from alexgalletti/patch-1
...
Allow the renaming of the drivers remember cookie
2013-03-28 13:40:57 -07:00
7244405868
Merge pull request #1806 from Gargron/patch-1
...
Fix for double escaping of queries in the profiler
2013-03-28 13:36:11 -07:00
60ad02ad01
Merge branch 'master' of github.com:laravel/laravel
2013-03-28 15:35:25 -05:00
c1a8b83574
fix array input has.
2013-03-28 15:35:09 -05:00
7e14c8c4c6
Merge pull request #1822 from bruston/doc-fix-controllers
...
Minor correction to controllers documentation.
2013-03-28 13:25:25 -07:00
Taylor Otwell
Bernardo Rittmeyer
Colin Viebrock
Anders Hammar
Robert K
Steven Klar
Pavel Puchkin