summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-09-07Merge pull request #1720 from appleboy/docAlex Bilbie3-2/+3
fix issue #1719 and update ip address length on captcha helper
2012-09-07Merge pull request #1776 from eweap/db-display-errorAndrey Andreev2-1/+2
Database display error supporting "Loader.php" and "MY_Loader.php"
2012-09-07Merge pull request #1760 from vlakoff/develop-2Alex Bilbie1-1/+1
Better old captcha image test
2012-09-05Check for "Loader" in $call['class'] instead of $call['file']Jonathan Bonnefoy1-1/+1
2012-09-05Database display error supporting "Loader.php" and "MY_Loader.php"Jonathan Bonnefoy2-1/+2
2012-09-05Misc. style changesAndrey Andreev2-2/+2
2012-09-05Cleanup and optimize new Session classesAndrey Andreev3-128/+221
2012-09-05Merge pull request #1770 from dchill42/sessionAlex Bilbie1-0/+12
Session Fixes for #1711 and #1756
2012-09-05Merge pull request #1771 from pickupman/user_guide-migrationsAndrey Andreev1-1/+133
Add documation to user guide for Migrations class
2012-09-05Merge pull request #1750 from vlakoff/developAndrey Andreev1-1/+2
Simplification in Text Helper's character_limiter()
2012-09-04More complicated but faster methodvlakoff1-1/+2
Also added a comment to explain the reason for such a complicated method
2012-09-04Add documation to user guide for Migrations classJoe McFrederick1-1/+133
2012-09-04That doesn't go there. Put cache fix around correct query.dchill421-11/+11
Signed-off-by: dchill42 <dchill42@gmail.com>
2012-09-04Fixed issues #1756 and #1711dchill421-0/+12
Signed-off-by: dchill42 <dchill42@gmail.com>
2012-09-03Merge branch 'develop' of github.com:EllisLab/CodeIgniter into ↵Alex Bilbie6-28/+27
codeigniter/develop
2012-09-03Added Calendar library unit testAlex Bilbie2-0/+229
2012-09-03Merge pull request #1764 from WDC/patch-2Alex Bilbie1-8/+8
Whitespace Removal in config/constants.php
2012-09-03Merge pull request #1763 from pickupman/bugfix-form_validation-is_uniqueAlex Bilbie1-1/+0
Fix #1741 is_unique duplicated in documentation for Form_validation
2012-09-03Update application/config/constants.phpD. Marshall Lemcoe Jr.1-8/+8
Removed completely unnecessary whitespace. 
2012-09-03Fix #1741 is_unique duplicated in documentation for Form_validationpickupman1-1/+0
2012-09-03Slightly robuster testvlakoff1-1/+1
Also, single quotes per style conventions
2012-09-02Merge pull request #1727 from pickupman/bugfix-loader-view_fileAlex Bilbie2-3/+4
Fix bug #1000
2012-09-02Merge pull request #1728 from pickupman/bugfix-captcha_helperAlex Bilbie1-2/+1
Fix issue #1678
2012-09-02Merge pull request #1753 from vlakoff/langAlex Bilbie1-14/+14
A few forgotten double quotes in language strings
2012-09-01A few forgotten double quotes in language stringsvlakoff1-14/+14
Follow-up to commit 0875d69dc7b5138cc40ea2f248024b2a886a0d82 from 2012-07-15
2012-08-31Simplification in Text Helper's character_limiter()vlakoff1-1/+1
Because the "\s" regex character class includes \r and \n, there is no need for the str_replace() part
2012-08-31fix issue #1719 and update ip address length on captcha helperBo-Yi Wu3-2/+3
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2012-08-31Merge pull request #1732 from IT-Can/mysql-compressionAlex Bilbie6-3/+48
MySQL & MySQLi client compression
2012-08-30Merge pull request #1749 from dchill42/sess_configPhil Sturgeon4-16/+68
Added session driver config items
2012-08-30Added autoload drivers config, added Session and Loader changes to ↵dchill423-16/+63
changelog, added Session config items to upgrade guide Signed-off-by: dchill42 <dchill42@gmail.com>
2012-08-30Added session driver config itemsdchill421-0/+5
Signed-off-by: dchill42 <dchill42@gmail.com>
2012-08-30Merge branch 'refs/heads/alexbilbie/develop' into codeigniter/developAlex Bilbie4-0/+288
2012-08-30Added PHPUnit to the development requirements of composer.jsonAlex Bilbie1-1/+4
2012-08-30Finished the final tests (except do_upload)Alex Bilbie2-7/+46
2012-08-30Added initial upload library testsAlex Bilbie1-0/+231
2012-08-30Added lang mock and upload mockAlex Bilbie2-0/+18
2012-08-29Merge pull request #353 from dchill42/sessionPhil Sturgeon12-1063/+2484
Switched Sessions to use Drivers Adding native PHP sessions and keeping original-flavor CI cookie sessions
2012-08-29Fixed defaults and database check, reverted redundant shutdown featuredchill422-51/+5
Signed-off-by: dchill42 <dchill42@gmail.com>
2012-08-29Extracted cookie database saves to shutdown and cleaned up codedchill422-135/+169
Signed-off-by: dchill42 <dchill42@gmail.com>
2012-08-28Minor session test improvementsdchill421-65/+117
Signed-off-by: dchill42 <dchill42@gmail.com>
2012-08-28Fixed multi-driver load return and last-ditch library subdirectory retry ↵dchill421-3/+3
object names
2012-08-27Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into sessiondchill4211-26/+64
2012-08-27Fixed select_driver(), cookie sess_destroy(), and native cookie name conflictdchill424-7/+17
2012-08-23Merge branch 'feature/js-userguide-search' into developDerek Jones4-9/+29
2012-08-23Merge pull request #1733 from IT-Can/word-mime-fixAlex Bilbie2-2/+3
.docx mimetype updated
2012-08-21docx mimetype addedMichiel Vugteveen2-2/+3
2012-08-21changelog fixMichiel Vugteveen1-1/+1
2012-08-21driver fix + userguide + changelogMichiel Vugteveen3-5/+23
2012-08-21Switching to Sphinx's built in JavaScript searchDerek Jones4-9/+29
- disabled rST source copying, the contextual results for the search don't render, so they look goofy - added .highlighted class to CSS for highlighting search terms - replaced Google search form with native search form (and separated into its own theme file) - added body class to #content div for JS highlighter to hook onto
2012-08-20fixed RST indentation error in 3.0.0 upgrade instructions code sampleDerek Jones1-0/+1