phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,362 Commits 3 Branches 0 Tags
358e8abde6f68776d792fa4ac15ad89967f3940a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Taylor Otwell 277f1c620b Merge pull request #1483 from josem/develop 
Parameter JSON_OPTIONS added to response.php
 2013-01-05 11:59:35 -08:00
Taylor Otwell 22c2c3843a Merge pull request #1485 from laravie/feature/auth-events 
Add 'laravel.auth: login' and 'laravel.auth: logout' events.
 2013-01-05 11:58:57 -08:00
Taylor Otwell 8541ff50ab Merge pull request #1497 from bencorlett/patch-2 
Allow forward slash separators in Str::classify()
 2013-01-05 11:54:54 -08:00
Taylor Otwell e0dfd7c5d3 Merge pull request #1502 from olivervogel/develop 
added lists() method to the fluent documentation
 2013-01-05 11:50:51 -08:00
Taylor Otwell 6c3c297c5c Use DS constant. 2013-01-05 13:50:38 -06:00
Taylor Otwell c74118decb Merge pull request #1510 from lollypopgr/develop 
Removed GR folder
 2013-01-05 11:48:51 -08:00
Taylor Otwell 19b01b1d27 Add on to accepted. 2013-01-05 13:48:39 -06:00
Taylor Otwell 14179c8811 Merge pull request #1520 from JorgeMurta/master 
Small Changes on the Language File (PT-PT)
 2013-01-05 11:46:54 -08:00
Taylor Otwell 6a69979376 Merge pull request #1526 from TheShiftExchange/blade_e 
Automatically apply entities to output using Blade
 2013-01-05 11:44:54 -08:00
Taylor Otwell f8dbe4cddd Merge pull request #1530 from tempestim/master 
Fix for validate_required_with
 2013-01-05 11:44:00 -08:00
Taylor Otwell eb5d68f201 Merge pull request #1531 from jasonlewis/eloquent/bug/find 
Allow find to be called anywhere on an Eloquent Model
 2013-01-05 11:43:11 -08:00
Taylor Otwell 082fc0b39b Merge pull request #1533 from JoostK/relationship-with 
Added ability to call Eloquent::with on a Relationship instance
 2013-01-05 11:42:08 -08:00
Taylor Otwell 419367f0a7 Merge pull request #1536 from xsbeats/required_with_validation_message 
bugfix: added validation message to language file for required_with
 2013-01-05 11:39:55 -08:00
Taylor Otwell b69e649a7f Merge pull request #1539 from williamn/patch-1 
Update application/language/id/pagination.php
 2013-01-05 11:38:28 -08:00
Taylor Otwell 153c2837f3 Update docs. 2013-01-05 13:36:02 -06:00
Taylor Otwell 9bdf02648e Update doc block. 2013-01-05 13:33:20 -06:00
Taylor Otwell 15887af961 Merge branch 'master' into develop 2013-01-05 13:31:48 -06:00
Taylor Otwell ab152200e9 Merge pull request #1545 from bryanwood/master 
Adds WinCache caching driver
 2013-01-05 11:31:25 -08:00
Taylor Otwell 6ba37d42d8 Fix token bug in eloquent auth driver. 2013-01-05 13:28:55 -06:00
Taylor Otwell 0993552c0a Merge pull request #1554 from theideapeople/patch/doc-rule-arrays 
Added documentation for validating arrays.
 2013-01-05 11:16:53 -08:00
Taylor Otwell 7b846be4c4 Allow multiple schemas in pgsql. 2013-01-05 13:15:59 -06:00
Taylor Otwell c65f284c25 Merge branch 'master' into develop 2013-01-05 13:13:06 -06:00
Taylor Otwell bdb5941af2 Merge pull request #1558 from deerawan/update-id-translation 
update new indonesian translation validation text
 2013-01-05 11:12:50 -08:00
Taylor Otwell 536a810b07 Merge branch 'develop' of github.com:laravel/laravel into develop 2013-01-05 13:09:21 -06:00
Taylor Otwell cc9929e578 Merge branch 'master' into develop 2013-01-05 13:08:33 -06:00
Taylor Otwell fd1289760f Merge pull request #1560 from DServy/master 
Added a more dynamic method for checking dblib (response to ticket #770)
 2013-01-05 11:08:08 -08:00
Taylor Otwell 5a89836f5d Merge pull request #1561 from danro/develop 
Use $.noConflict in profiler to prevent conflicts in multiple versions of jQuery.
 2013-01-05 11:06:49 -08:00
Taylor Otwell 1a33a13a3a Merge branch 'master' into develop 2013-01-05 13:05:06 -06:00
Taylor Otwell d5d6d2856a Merge pull request #1563 from JesseObrien/docs/profiler 
Documenting Profiler
 2013-01-05 11:04:42 -08:00
Taylor Otwell 2827c3fc78 Document group_by. 2013-01-05 13:04:22 -06:00
Taylor Otwell 0339a3276b Fix bad doc. 2013-01-05 13:02:58 -06:00
Taylor Otwell f25d09dd07 Merge pull request #1492 from adamjacobbecker/patch-1 
fix link to #route-groups
 2012-12-03 10:32:19 -08:00
Taylor Otwell 8ff052cbdb Merge pull request #1180 from unikent/master 
Performance enhancement for HTML Class.
 2012-12-03 07:04:23 -08:00
Taylor Otwell d1efd44c7c Merge pull request #1467 from franzliedke/patch-60 
[Eloquent] Allow hiding relationships
 2012-11-23 20:46:03 -08:00
Taylor Otwell d2fefa65aa Work on section handling. 2012-11-06 15:04:13 -06:00
Taylor Otwell 1ddb4bb6cd Merge pull request #1419 from laravie/feature/blade-testcase 
Improve Blade unit-test code coverage
 2012-11-05 06:46:12 -08:00
Taylor Otwell 5059ced2e1 Merge pull request #1413 from machuga/develop 
Add 500 response code to exception handler. -- machuga, JesseOBrien, sde...
 2012-11-02 19:09:11 -07:00
Taylor Otwell d693a82615 Merge pull request #1408 from cartalyst/develop 
Allowing use of third party Routers to handle Routing.
 2012-10-31 14:31:50 -07:00
Taylor Otwell 4c53b9d94d remove artisan change. 2012-10-31 08:54:35 -05:00
Taylor Otwell c69c7cac1a Merge branch 'master' of github.com:laravel/laravel 2012-10-31 08:54:26 -05:00
Taylor Otwell b386eeec8a update change log. 2012-10-31 08:54:07 -05:00
Taylor Otwell 355cbe35a5 use hostname in environment detection. 2012-10-31 08:53:01 -05:00
Taylor Otwell 4d0bc9e251 Merge pull request #1389 from Anahkiasen/feature/migrate_rebuild 
Added migrate:rebuild command to clean and reconstruct the database
 2012-10-30 06:06:57 -07:00
Taylor Otwell 115f59b4ff Merge pull request #1392 from mynameiszanders/patch-1 
Update "docs/views/html.md", parse error in example code.
 2012-10-26 18:48:43 -07:00
Taylor Otwell 37cd08faea Merge pull request #1357 from aebersold/master 
documentation fix on validators
 2012-10-25 06:14:55 -07:00
Taylor Otwell 205cc4869d Merge pull request #1356 from helmut/patch-1 
Update laravel/file.php
 2012-10-25 06:12:42 -07:00
Taylor Otwell 0a0eb3779c Merge pull request #1365 from sdbondi/develop 
Ref #649 - Added query builder support for BETWEEN clauses
 2012-10-25 06:11:15 -07:00
Taylor Otwell ca44c93ca4 Merge pull request #1375 from christianzt19/develop 
beautifies profiler tabs to cursor:pointer
 2012-10-25 06:08:12 -07:00
Taylor Otwell 2914471de1 Merge pull request #1381 from vFragosop/documentation/improvements 
Improving documentation about Input::file()
 2012-10-25 06:07:15 -07:00
Taylor Otwell d55328cc52 Merge pull request #1320 from dejangeci/feature/dbexception-inner 
Added a getInner method for retrieving the inner exception
 2012-10-07 12:05:01 -07:00
Taylor Otwell 3416506194 increment version. refactor eloquent eager loading matching. 2012-10-07 14:04:29 -05:00
Taylor Otwell 1df8fa91fc Merge pull request #1322 from vFragosop/eloquent/relationship_performance 
Fixing has_one iterations
 2012-10-07 11:56:24 -07:00
Taylor Otwell 790a540620 Merge pull request #1294 from danielboendergaard/phpdoc-fix 
Fixed wrong return type in phpdoc
 2012-10-06 12:39:23 -07:00
Taylor Otwell 7555fda589 Merge pull request #1307 from tillsanders/develop 
Update laravel/helpers.php
 2012-10-06 12:38:26 -07:00
Taylor Otwell 8faf38efe1 Merge pull request #1314 from vFragosop/eloquent/relationship_performance 
Huge performance increase on Eloquents relationships
 2012-10-06 12:27:53 -07:00
Taylor Otwell 4f8a6724b0 Merge pull request #1305 from nmalcolm/develop 
Fixes XSS vulnerability in Profiler
 2012-10-02 17:22:11 -07:00
Taylor Otwell 4d3c68129b Fix version in path file. 2012-09-27 17:55:19 -04:00
Taylor Otwell d1c1fe4446 fix bug in eloquent model and update version. 2012-09-27 17:45:12 -04:00
Taylor Otwell 02cb96a008 fix bug in eloquent model. 2012-09-27 17:44:03 -04:00
Taylor Otwell ae5331b312 Merge branch 'staging' 2012-09-27 09:08:20 -04:00
Taylor Otwell 4de8e2d717 Update change log. 2012-09-27 09:05:29 -04:00
Taylor Otwell b043482905 Improve view errors. 2012-09-26 16:20:56 -04:00
Taylor Otwell 633c2bde83 Pass the path to the filter event. 2012-09-26 11:20:03 -04:00
Taylor Otwell a976c555e6 Added "view.filter" event so we can hook in final filters. 2012-09-26 10:43:34 -04:00
Taylor Otwell 14c6ff1692 Increment version and change log. 2012-09-26 10:13:30 -04:00
Taylor Otwell 3e3ee870ea Merge branch 'develop' of github.com:laravel/laravel into develop 2012-09-26 10:11:46 -04:00
Taylor Otwell d64d6c9092 Fix logging issue when using the laravel.log event. 2012-09-26 10:11:24 -04:00
Taylor Otwell 09500818e0 Merge pull request #1204 from bryantebeek/optimisation/str-class 
Performance enhancement for Str Class (see pull request #1180)
 2012-09-25 18:37:53 -07:00
Taylor Otwell fc9b0e1636 Merge pull request #1201 from JoostK/fix-1 
Fixed a problem with `Eloquent::get_dirty`
 2012-09-25 18:37:09 -07:00
Taylor Otwell 4b7dc2e824 Merge pull request #1226 from akuzemchak/bug/language-routes 
Fixes language URI routing issue
 2012-09-25 18:34:40 -07:00
Taylor Otwell 439f9c8055 Merge pull request #1236 from kuroi/patch-1 
Correct broken links in docs
 2012-09-25 18:33:48 -07:00
Taylor Otwell dad0bbc688 Merge pull request #1247 from dcelasun/patch-1 
Fix a tiny typo
 2012-09-25 18:33:14 -07:00
Taylor Otwell 9acf541653 Merge pull request #1255 from joual/develop 
Auth token now nulled on logout
 2012-09-25 18:32:36 -07:00
Taylor Otwell 5a1741e9d5 Merge pull request #1276 from rk/rk-issue-1261 
[#1261] get_key now pulls from $original instead
 2012-09-25 18:31:34 -07:00
Taylor Otwell c2a255c788 Merge branch 'develop' into staging 2012-09-25 20:24:50 -04:00
Taylor Otwell 9e0ff85b24 Merge branch 'master' of github.com:laravel/laravel into staging 2012-09-25 20:24:48 -04:00
Taylor Otwell 4eac00a009 Use hash_hmac on cookie hashes. 2012-09-25 16:43:58 -04:00
Taylor Otwell 064309c0ce Merge branch 'cookies' into develop 2012-09-25 08:44:53 -05:00
Taylor Otwell 04f22f086d Update change log. 2012-09-25 08:42:03 -05:00
Taylor Otwell ad313198df working on cookie fingerprinting. 2012-09-25 08:40:48 -05:00
Taylor Otwell 110966bd6a working on cookie fingerprinting. 2012-09-25 08:40:29 -05:00
Taylor Otwell 4f7dd1c8a4 Merge pull request #1233 from franzliedke/patch-51 
GitHub contribution guidelines
 2012-09-17 11:07:41 -07:00