Commit Graph

3477 Commits

Author SHA1 Message Date
Andreas Heiberg 4de7510bfd fixed typo
I suppose stored is what was meant to be typed?
2013-01-09 22:31:17 +01:00
Malachi Soord 337c2f0a7c Fixed issue with html unit tests 2013-01-07 21:28:09 +00:00
Taylor Otwell 53b94468cd Fix multi inserts in SQLite. 2013-01-06 19:06:53 -06:00
Dayle Rees 0f690e83a0 Removing strange file additions. 2013-01-06 20:31:28 +00:00
Dayle Rees f0c3dbba40 Fixing merge issues. 2013-01-06 20:14:07 +00:00
Taylor Otwell abff7d8e7d Merge branch 'master' into develop 2013-01-06 14:01:18 -06:00
Taylor Otwell ff7f6f67db Merge pull request #1573 from neoascetic/patch-1
Respect LARAVEL_ENV variable
2013-01-06 12:00:43 -08:00
Taylor Otwell cb567c5e4d Updated Symfony HttpFoundation to 2.1.6. 2013-01-06 13:58:36 -06:00
Taylor Otwell 2946274a95 Merge pull request #1473 from s4wny/patch-1
Added a pretty_print option to the log class
2013-01-06 07:55:02 -08:00
Taylor Otwell ff682d69c0 Merge pull request #1546 from darkimmortal/master
Fix for white-on-white profiler text when using dark site theme
2013-01-06 07:52:07 -08:00
Taylor Otwell f754e1fa55 Merge pull request #1574 from Barryvdh/patch-1
Update application/language/nl/validation.php
2013-01-06 07:49:46 -08:00
Taylor Otwell dd548471bc Merge pull request #1571 from vauteer/patch-1
Update laravel/documentation/views/html.md
2013-01-06 07:49:01 -08:00
Barryvdh 6eaa2ad3f2 Update application/language/nl/validation.php
The use of 'Het' is not always correct, sometimes it should be 'De', so the sentence would look weird. Probably better to remove it.

Also, the 'exists' string stated it already exists, but should state it doesn't exist! Very important difference ;)

Also changed the formatting errors of email/url to be more specific.
2013-01-06 16:28:12 +01:00
Pavel Puchkin 77679a5659 Respect LARAVEL_ENV variable
Laravel **should** respect `LARAVEL_ENV` variable when running through CLI
2013-01-07 01:20:46 +11:00
vauteer b0ac276d1a Update laravel/documentation/views/html.md
The second parameter of HTML::style have to be an array, not a string.
2013-01-06 09:42:53 +01:00
Taylor Otwell 5598238fbc Merge pull request #1570 from HiroKws/ja/validation/new/translation
Japanese translations for new validation rules.(count*)
2013-01-05 19:07:58 -08:00
Hirohisa Kawase 01127bf70d Japanese translations for new validation rules.(count*)
Signed-off-by: Hirohisa Kawase <hirokws@gmail.com>
2013-01-06 10:47:34 +09:00
Taylor Otwell b0eb9a8b42 Fix bugs in Eloquent. 2013-01-05 16:45:34 -06:00
Taylor Otwell 28a880b5b5 Use array_key_exists in validator. 2013-01-05 16:24:51 -06:00
Taylor Otwell 23bdbd0834 Tweak postgres connector. 2013-01-05 16:22:32 -06:00
Taylor Otwell f948801369 Fix bug. 2013-01-05 16:15:18 -06:00
Taylor Otwell cc0908cddc Merge branch 'master' into develop 2013-01-05 16:07:59 -06:00
Taylor Otwell 5fd1ea527f Fix bug in connection with custom grammars. 2013-01-05 16:00:32 -06:00
Taylor Otwell 653770a3eb Allow relative URLs in to_asset. 2013-01-05 15:53:43 -06:00
Taylor Otwell 13a1c5daac Merge pull request #1170 from kapv89/patch-4
Added a method to fluently set belongs-to relation
2013-01-05 13:51:39 -08:00
Taylor Otwell cfc024fe66 Merge pull request #1212 from franzliedke/patch-46
Fix CLI mode detection for some shared hosts.
2013-01-05 13:37:31 -08:00
Taylor Otwell c397c26a7b Merge pull request #1221 from arisk/patch-1
Added PDO error code
2013-01-05 13:33:51 -08:00
Taylor Otwell 05cb1ea5ad Merge pull request #1234 from ROMOPAT/patch-1
add use Closure;
2013-01-05 13:24:45 -08:00
Taylor Otwell e7ae316e44 Merge pull request #1235 from ROMOPAT/patch-2
Undefined namespace Grammars
2013-01-05 13:23:47 -08:00
Taylor Otwell 1824b0b21c Merge pull request #1257 from vtalbot/develop
Add bundle:uninstall, bundle:unpublish, migrate:rollback and migrate:reset for bundles
2013-01-05 13:20:10 -08:00
Taylor Otwell b8ed80608f Merge pull request #1275 from Sadeghi85/develop
segment pattern to match a single segment, also matches UTF-8 segments.
2013-01-05 13:16:03 -08:00
Taylor Otwell f7d0b437c3 Merge pull request #1278 from Jakobud/feature/doc/strings
Added output from examples to String documentation
2013-01-05 13:15:10 -08:00
Taylor Otwell d089046160 Merge pull request #1312 from franzliedke/patch-53
DB::escape()
2013-01-05 13:03:31 -08:00
Taylor Otwell 62b55ff7a1 Don't cast in pluralizer. 2013-01-05 14:55:04 -06:00
Taylor Otwell 6a6873440e Merge pull request #1354 from BlaineSch/develop
Pass the response by reference so it can be overwritten in filters
2013-01-05 12:53:08 -08:00
Taylor Otwell f1562875af Merge pull request #1388 from tzan/improve-french
improve french translation for validation
2013-01-05 12:47:14 -08:00
Taylor Otwell 358e8abde6 Merge pull request #1390 from Anahkiasen/feature/url_language
Add URL::to_language and HTML::link_to_language localization helpers
2013-01-05 12:46:43 -08:00
Taylor Otwell 829fa4edd8 Merge pull request #1399 from HiroKws/correct/document/html
Correct document page of HTML page.
2013-01-05 12:44:39 -08:00
Taylor Otwell c463d2a4ab Merge pull request #1400 from sdbondi/develop
Ref #649 - Added documentation for where_between suite of methods (Ref Pull #1365)
2013-01-05 12:43:54 -08:00
Taylor Otwell b5e5494144 Merge pull request #1410 from franzliedke/patch-56
Make insert_get_id() work with non-auto-incrementing columns.
2013-01-05 12:41:39 -08:00
Taylor Otwell 875cac6c83 Merge branch 'master' into develop 2013-01-05 14:36:48 -06:00
Taylor Otwell 0726fb8e84 Merge pull request #1415 from j20/patch-1
Update laravel/documentation/localization.md
2013-01-05 12:36:27 -08:00
Taylor Otwell f785cb22c9 Merge pull request #1428 from dejangeci/feature/dbtransaction-return
Added return value from PDO::commit
2013-01-05 12:33:17 -08:00
Taylor Otwell 10b8732583 Merge pull request #1434 from franzliedke/patch-59
My take at #1198
2013-01-05 12:28:00 -08:00
Taylor Otwell e1d081bd54 Merge pull request #1501 from JesseObrien/master
Add Response::jsonp() to Response class.
2013-01-05 12:18:14 -08:00
Taylor Otwell e8cd58a9bc Merge pull request #1444 from eddmann/bug/database-connector
Fixed connector options merge bug.
2013-01-05 12:17:11 -08:00
Taylor Otwell 19d56d57c9 Merge pull request #1450 from netputer/master
Use `mb_substr` instead of `sub_str` in order to resolve multi-language problem.
2013-01-05 12:11:36 -08:00
Taylor Otwell f0dbc07101 Merge pull request #1568 from franzliedke/patch-62
Fix typo.
2013-01-05 12:10:14 -08:00
Taylor Otwell e5341ef59e Merge pull request #1458 from anaxamaxan/patch-2
Fix typo and update 2nd example comment for filter
2013-01-05 12:08:49 -08:00
Franz Liedke efdc12ed25 Fix typo. 2013-01-05 21:07:31 +01:00