phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,532 Commits 3 Branches 0 Tags
348feccd3e70bb51facbaba2993050ca824afc4e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 348feccd3e Merge pull request #1989 from juukie14/master 
Added Dutch translation for validation rules "date_format" and "required_with".
 2013-05-13 22:32:01 -07:00
Taylor Otwell cffded660c Merge pull request #1959 from dotramses/patch-1 
Update migrator.php
 2013-05-04 17:26:19 -07:00
Taylor Otwell 3d533f03e6 Fix method override. 2013-05-04 19:25:53 -05:00
Taylor Otwell b9cf8dfb71 Upgrade to latest Symfony HttpFoundation tag. Closes #1865. 2013-05-01 14:19:14 -05:00
Taylor Otwell 92f602edbf Merge pull request #1875 from effenberger/master 
modified IoC::registred()
 2013-05-01 09:41:58 -07:00
Taylor Otwell 23464cac25 Merge pull request #1868 from aeberhardo/bug/version-bump-3.2.14 
Incremented version from 3.2.13 to 3.2.14
 2013-04-10 20:11:34 -07:00
Taylor Otwell 64953eb196 Merge pull request #1869 from aeberhardo/docs/contributing-typo 
Fixed a typo in "Contributing" chapter
 2013-04-10 20:11:15 -07:00
Taylor Otwell 936160f907 Merge pull request #1850 from rk/patch-1 
Check application.ssl when setting a secure cookie
 2013-04-06 18:27:53 -07:00
Taylor Otwell 9c9b6eed10 Merge remote-tracking branch 'origin/master' 2013-04-06 20:27:07 -05:00
Taylor Otwell 5ddeab6051 pass exception to 500 event correctly. 2013-04-06 20:27:00 -05:00
Taylor Otwell 0008a2324f Merge pull request #1857 from doubleking/master 
Changed Laravel\ namespace prefix in some classes calls in helpers to global.
 2013-04-05 06:49:55 -07:00
Taylor Otwell 4ecbef68a0 Merge pull request #1853 from cviebrock/table-macros 
Add Macros to tables
 2013-04-04 10:41:39 -07:00
Taylor Otwell 78af4569de Merge pull request #1855 from rittme/patch-1 
get_dirty() comparison is not type safe
 2013-04-04 10:40:18 -07:00
Taylor Otwell 5dd3ec6f1e Merge pull request #1845 from stevenklar/master 
Add unregister IoC
 2013-04-02 09:38:59 -07:00
Taylor Otwell 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
Taylor Otwell 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
Taylor Otwell 92e3ae47bb Merge branch 'master' of github.com:laravel/laravel 2013-03-28 17:14:51 -05:00
Taylor Otwell 4046313ecd fix environment on tests. 2013-03-28 17:14:45 -05:00
Taylor Otwell f933db7a12 Merge pull request #1618 from demsey2/master 
URI data available in the before filter.
 2013-03-28 15:12:02 -07:00
Taylor Otwell ba3e481d4a Merge pull request #1621 from mtthlm/master 
Add Command alias to application configuration
 2013-03-28 15:11:23 -07:00
Taylor Otwell 52e9cd5c09 Merge pull request #1639 from frankwong/master 
Add calling class and function information in logs
 2013-03-28 15:08:05 -07:00
Taylor Otwell b914d07948 Merge pull request #1662 from fla/master 
Romanian language
 2013-03-28 14:54:02 -07:00
Taylor Otwell 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
Taylor Otwell 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
Taylor Otwell 37503be75b Merge pull request #1685 from tzhuan/patch-1 
Update laravel/session/drivers/cookie.php
 2013-03-28 14:36:36 -07:00
Taylor Otwell ffd5769416 Merge pull request #1688 from Pasvaz/patch-2 
Handles Redis password
 2013-03-28 14:35:14 -07:00
Taylor Otwell e8834d764e Merge pull request #1692 from adityamenon/master 
The tiniest PR you've ever seen.
 2013-03-28 14:34:12 -07:00
Taylor Otwell e289bc4893 Merge pull request #1700 from davedx/master 
Documentation update for Fluent
 2013-03-28 14:30:22 -07:00
Taylor Otwell 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
Taylor Otwell 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
Taylor Otwell 158b81974a Merge pull request #1731 from dcelasun/master 
Add flushing support to the Redis cache driver
 2013-03-28 14:15:26 -07:00
Taylor Otwell 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
Taylor Otwell 118555002f Merge pull request #1747 from voidman/patch-1 
Update laravel/request.php
 2013-03-28 14:04:05 -07:00
Taylor Otwell 4125438391 Merge branch 'master' of github.com:laravel/laravel 2013-03-28 15:50:36 -05:00
Taylor Otwell 15414808a1 fix padding bug in crypter. 2013-03-28 15:50:25 -05:00
Taylor Otwell 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
Taylor Otwell 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
Taylor Otwell 60ad02ad01 Merge branch 'master' of github.com:laravel/laravel 2013-03-28 15:35:25 -05:00
Taylor Otwell c1a8b83574 fix array input has. 2013-03-28 15:35:09 -05:00
Taylor Otwell 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 9f64de98f7 Merge pull request #1805 from JesseObrien/patch-1 
Adding PATCH to the route register.
 2013-03-22 13:08:31 -07:00
Taylor Otwell 88cde2c91d update change log. 2013-03-21 23:22:44 -05:00
Taylor Otwell 2d863c45fc Merge pull request #1803 from alexgalletti/master 
Fix for Postgresql PDO::FETCH_ASSOC
 2013-03-21 21:17:22 -07:00
Taylor Otwell 1bd93c3327 Merge pull request #1781 from neoascetic/1690_fix_for_php53 
Syntax fix for PHP 5.3 (#1690)
 2013-03-12 06:24:23 -07:00
Taylor Otwell 2e8b5575e5 Merge pull request #1690 from kdocki/master 
IoC container not resolving classes with optional parameters (i.e. models that use Eloquent)
 2013-02-25 20:11:33 -08:00
Taylor Otwell 252990455e Merge pull request #1586 from Pasvaz/patch-1 
Implemented OPTIONS verb
 2013-01-11 17:24:23 -08:00
Taylor Otwell 63bf89efd5 Merge branch 'develop' of github.com:laravel/laravel into develop 2013-01-10 16:21:01 -06:00
Taylor Otwell c9faa957a3 Merge branch 'master' of github.com:laravel/laravel into develop 2013-01-10 16:20:09 -06:00
Taylor Otwell ab2581dba5 increment version. 2013-01-10 16:19:57 -06:00
Taylor Otwell 06538cc8c0 update change log. 2013-01-10 16:19:36 -06:00
Taylor Otwell bd11b2a8af Merge pull request #1577 from inverse/develop 
Fixed issue with html unit tests
 2013-01-10 14:08:40 -08:00
Taylor Otwell 2e82761788 Merge pull request #1582 from AndreasHeiberg/patch-1 
fixed typo
 2013-01-10 14:08:23 -08:00
Taylor Otwell 6c177ab3b1 turn off profile by default. 2013-01-10 16:07:46 -06:00
Taylor Otwell 3b8d8bbf77 Merge pull request #1584 from bpierre/bug/doc-fixes 
Documentation fixes
 2013-01-10 14:03:46 -08:00
Taylor Otwell 53b94468cd Fix multi inserts in SQLite. 2013-01-06 19:06:53 -06: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
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
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
Taylor Otwell 22107fe944 Merge pull request #1461 from AustinW/master 
Minor corrections to the documentation and using Input::json() with Validator
 2013-01-05 12:06:53 -08:00
Taylor Otwell 423be0495b Merge branch 'master' into develop 2013-01-05 14:05:21 -06:00
Taylor Otwell 731cec2475 Merge pull request #1465 from ethaizone/patch-1 
Update laravel/validator.php
 2013-01-05 12:04:59 -08:00
Taylor Otwell 912f4e5e72 Fix forever length. 2013-01-05 14:01:42 -06:00
Taylor Otwell 3bbc809c12 Merge pull request #1479 from Ore4444/patch-1 
Update laravel/documentation/views/templating.md
 2013-01-05 12:00:14 -08:00