summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-10-31removed conflict markersJonatas Miguel1-24/+0
2012-10-25Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJonatas Miguel13-43/+115
2012-10-25Add missing delimiter in preg_quote() occurences (fix #1929)Andrey Andreev3-7/+7
2012-10-24Improve fix for #1811Andrey Andreev1-0/+1
2012-10-24Fix #1811Andrey Andreev2-6/+9
2012-10-24[ci skip] Document Query Builder method replace() (fix #1651)Andrey Andreev1-1/+30
2012-10-24Fix #1146Andrey Andreev2-6/+4
2012-10-24Fix #1255Andrey Andreev2-1/+8
2012-10-24Fix #191Andrey Andreev2-4/+5
2012-10-24[ci skip] Document get_csrf_token_name(), get_csrf_hash() (issue #715)Andrey Andreev2-8/+39
2012-10-24Fix #1268 (or rather enforce some security measures, there's nothing really ↵Andrey Andreev3-10/+12
broken)
2012-10-24documented routing changeJonatas Miguel1-0/+1
2012-10-24fix a conflict, part 1Jonatas Miguel1-84/+189
2012-10-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJonatas Miguel177-3221/+6673
Conflicts: user_guide_src/source/changelog.rst
2012-10-24updated changelog to reflect the changes in this commitJonatas Miguel1-2/+2
2012-10-24Fix insert_batch() test caseAndrey Andreev1-1/+1
2012-10-24An alternative to affected_rows() for insert_batch() and update_batch() (ref ↵Andrey Andreev3-12/+17
#126)
2012-10-24Fix #1922Andrey Andreev1-0/+25
2012-10-24Add zsh, 7zip, cdr, wma and jar to mimes.php (rel #1919, #1926)Andrey Andreev2-4/+9
2012-10-24[ci skip] Fix a docblockAndrey Andreev1-1/+1
2012-10-24[ci skip] style and phpdoc-related changes (rel #1295)Andrey Andreev43-156/+315
2012-10-24[ci skip] Fix an erroneous link in the docsAndrey Andreev1-1/+1
2012-10-24Fix issue #1925 (order_by() with = FALSE)Andrey Andreev1-1/+1
2012-10-23users' default values are now respected in callback routesJonatas Miguel1-0/+15
2012-10-23Fix issue #1917Andrey Andreev4-10/+86
2012-10-23Alter _compile_order_by() to re-fix MSSQL, SQLSRV limit()Andrey Andreev1-4/+6
2012-10-23Fix issues #134, #1911Andrey Andreev3-12/+7
2012-10-23[ci skip] Drop cheatsheets and quick_reference PDFs from the documentation ↵Andrey Andreev10-37/+1
(unmaintainable)
2012-10-23[ci skip] Add a note about routes.php not being a filterAndrey Andreev1-1/+6
2012-10-23Merge pull request #1744 from dchill42/load_config_unitsAndrey Andreev23-234/+999
Loader and Config Unit Test Improvements
2012-10-23Replaced evals with getMock usage in Loader testsdchill421-16/+8
Signed-off-by: dchill42 <dchill42@gmail.com>
2012-10-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into ↵dchill4234-798/+651
load_config_units
2012-10-23Fix issue #779Andrey Andreev3-11/+9
2012-10-23Fix a mock db entryAndrey Andreev2-3/+3
2012-10-23Add a test for issue #273Andrey Andreev2-1/+18
2012-10-22Fix #1913Andrey Andreev1-11/+8
2012-10-22Fix where() & having() escaping/prefixing literal values containing a periodAndrey Andreev1-4/+40
2012-10-22Add a changelog entryAndrey Andreev1-0/+1
2012-10-22Sync .travis.yml with developAndrey Andreev1-1/+1
2012-10-22Merge branch 'develop' of github.com:EllisLab/CodeIgniter into ↵Andrey Andreev23-209/+398
feature/db_qb_aliasing
2012-10-22Add is_https() as a common functionAndrey Andreev5-13/+38
2012-10-22Fix issues #1476, #1909Andrey Andreev2-2/+3
2012-10-22Added documentation of new unit test tools and VFS additionsdchill421-5/+72
Signed-off-by: dchill42 <dchill42@gmail.com>
2012-10-22Raised CI_Loader test coverage to 93%dchill426-135/+235
Signed-off-by: dchill42 <dchill42@gmail.com>
2012-10-21Merge branch 'load_config_units' of github.com:dchill42/CodeIgniter into ↵dchill420-0/+0
load_config_units
2012-10-21Raised CI_Config test coverage to 100%dchill421-39/+158
Signed-off-by: dchill42 <dchill42@gmail.com>
2012-10-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into ↵dchill4218-194/+357
load_config_units
2012-10-19Fix another mailing issue (based on #1281)Andrey Andreev2-6/+11
2012-10-19Fix issue #1409Andrey Andreev2-52/+62
2012-10-19Manually apply an improved version of PR #1797 (auto_link() URL helper)Andrey Andreev3-11/+16
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-09 13:23:18 +0100