summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-07-21Added support for IP Address Range Masks (e.g. 192.168.137.0/24) to the Proxy...Jordan Pittman1-2/+19
2012-07-19Enable travis for feature/* branchesAndrey Andreev1-1/+2
2012-07-18Merge pull request #1633 from vlakoff/htaccessAndrey Andreev3-3/+3
2012-07-17Improve the solution for issue #1631vlakoff3-3/+3
2012-07-17Merge branch 'develop' of github.com:EllisLab/CodeIgniter into codeigniter/de...Alex Bilbie2-2/+2
2012-07-17Updated .htaccess files with Apache 2.4+ safe deny statements. Fixes #1631Alex Bilbie3-3/+18
2012-07-17Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developEric Roberts3-3/+3
2012-07-16Merge pull request #1627 from aroche/patch-1Andrey Andreev1-1/+1
2012-07-16Fix on _update_batch() : wrong variable used for field selectionaroche1-1/+1
2012-07-16Merge pull request #1625 from jonnu/developAndrey Andreev1-1/+1
2012-07-16Inconsistency between log_message and show_error when encountering a non-exis...jonnu1-1/+1
2012-07-15Changed TRUE and FALSE values to be uppercaseAlex Bilbie2-2/+2
2012-07-15Changed double quotes to single quotes to meet style guidelinesAlex Bilbie8-142/+142
2012-07-15Merge pull request #1621 from vlakoff/docAndrey Andreev1-1/+1
2012-07-15Fix in index.php inline documentationvlakoff1-1/+1
2012-07-14Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developEric Roberts23-41/+59
2012-07-13Merge pull request #1617 from vlakoff/docAndrey Andreev5-5/+5
2012-07-13Some adjustments in inline documentationvlakoff5-5/+5
2012-07-13Merge pull request #1615 from joellimberg/patch-1Andrey Andreev1-2/+2
2012-07-13Loader::model() - rename foreach ($model AS $single_model) to ($model AS $cla...Joel Limberg1-2/+2
2012-07-13Add a changelog entry for issue #1605 (pull #1606) and remove some spacesAndrey Andreev2-4/+5
2012-07-13Merge pull request #1616 from appleboy/pageAndrey Andreev1-2/+2
2012-07-13fix issue #1605 covert page number type from float to intBo-Yi Wu1-2/+2
2012-07-13Rename $babe => $single_model, in foreach ($model AS $babe) {...}joellimberg1-2/+2
2012-07-13escape_identifiers() to not escape string literals inside double quotes as wellAndrey Andreev1-1/+1
2012-07-13Fix issue #1613Andrey Andreev2-1/+7
2012-07-12Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon18-42/+38
2012-07-12Added data-ci-pagination-page="x" to pagination output so JS frameworks can h...Phil Sturgeon1-7/+27
2012-07-12Merge pull request #1609 from vkeranov/developPhil Sturgeon12-22/+13
2012-07-12Update developvkeranov1-1/+0
2012-07-12Update developvkeranov1-1/+0
2012-07-12Fix some spaces herevkeranov1-6/+5
2012-07-12again... new linesvkeranov1-1/+0
2012-07-12Too many new lines here :)vkeranov1-2/+1
2012-07-12Cleaning againvkeranov1-4/+3
2012-07-12Cleaning...vkeranov1-1/+0
2012-07-12Cleaning time...vkeranov1-1/+0
2012-07-12Important space fix :)vkeranov1-1/+1
2012-07-12Wrong url againvkeranov1-1/+1
2012-07-12Another typo...vkeranov1-1/+1
2012-07-12Fixed typo in the commentsvkeranov1-2/+1
2012-07-11Merge pull request #1607 from vlakoff/developPhil Sturgeon1-1/+1
2012-07-11Fix a typo in Common.phpvlakoff1-1/+1
2012-07-11Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developEric Roberts78-1835/+4030
2012-07-11Merge pull request #1604 from thatleeguy/developPhil Sturgeon1-1/+1
2012-07-11Revert "Testing push. Will revert."Eric Roberts1-1/+1
2012-07-11Testing push. Will revert.Eric Roberts1-1/+1
2012-07-11Fixing typo in error for multiple migration conflict.lee Tengum1-1/+1
2012-07-10Reconnect to PostgreSQL database if connection droped.rwillert1-1/+9
2012-07-10Follow-up to #1398, #1548Andrey Andreev2-2/+6