summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-05-20Indended code to meet CI standardsThanasis Polychronakis1-2/+6
2012-05-14Load base config first, then environment's configThanasis Polychronakis1-9/+9
2012-05-13Improve the solution for issue #1342Andrey Andreev1-1/+1
2012-05-11Fix issue #1349Andrey Andreev2-3/+4
2012-05-11Remove a duplicate mobile user agent entryAndrey Andreev1-1/+0
2012-05-11User_agent library improvementsAndrey Andreev3-84/+89
2012-05-09Fix issue #1342Andrey Andreev1-1/+1
2012-05-07Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developWes Baker124-2149/+3858
Conflicts: system/core/Security.php
2012-05-07Merge pull request #1330 from dixy/develop-errorsPhil Sturgeon3-3/+3
Remove -webkit prefix for box-shadow
2012-05-05Remove -webkit prefix for box-shadowdixy3-3/+3
2012-05-05Merge pull request #1325 from st2/developAndrey Andreev1-1/+1
Update system/database/drivers/interbase/interbase_utility.php
2012-05-05Added a return false if an image doesn't pass XSS cleaning to prevent ↵Wes Baker1-1/+5
file_get_contents from returning a NULL and passing through unscathed.
2012-05-04Update system/database/drivers/interbase/interbase_utility.phpCusco1-1/+1
2012-05-04Merge pull request #1323 from IT-Can/fix-issue-1314Andrey Andreev2-22/+26
unset userdata when sess_destroy() is called
2012-05-04changelog entryMichiel Vugteveen1-1/+2
2012-05-04unset userdataMichiel Vugteveen1-21/+24
2012-05-02Merge pull request #1312 from petsagouris/fix-xmlrpc-typosAndrey Andreev1-3/+3
Fixing some typos in the xmlrpc class
2012-05-02Merge pull request #1313 from petsagouris/fix-form-validation-typoAndrey Andreev1-1/+1
Fixing a typo in Form Validation
2012-05-02Fixing some typos in the xmlrpc class.George Petsagourakis1-3/+3
Also, fputs is an alias for fwrite.
2012-05-02Fixing some typos.George Petsagourakis1-1/+1
2012-05-02Merge pull request #1311 from timw4mail/phpdocPhil Sturgeon1-5/+1
Fix phpdoc config file
2012-05-02Fix phpdoc config fileTimothy Warren1-5/+1
2012-05-02Changelog fixAndrey Andreev1-1/+0
2012-05-02Reverted rui_string change.Phil Sturgeon3-6/+5
This had knock-on effects as can be seen in #1306. Issue #122 has been reopend until it is fixed properly.
2012-05-02Added a phpDocumenter config filePhil Sturgeon1-0/+25
Allows API documentation to be built very easily. Wether or not CodeIgniter will support property docblocks or not is currently in question, but at least everything else will show up.
2012-05-02Fix a wrong variable nameAndrey Andreev1-1/+1
2012-05-02Merge pull request #876 from narfbg/develop-helpers-sstAndrey Andreev3-196/+156
Improve the smiley, string & text helpers
2012-05-02Merge pull request #1304 from petsagouris/minor-assignment-fixAndrey Andreev1-1/+1
Minor assignment fix.
2012-05-02Fix pagination anchor_class with multiple initializationsAndrey Andreev1-6/+5
2012-05-02Merge pull request #1285 from Kosmin/patch-1Andrey Andreev1-1/+1
Update system/libraries/Javascript.php
2012-05-02Update system/libraries/Javascript.phpCosmin Atanasiu1-8/+1
2012-05-01Update system/libraries/Javascript.phpCosmin Atanasiu1-8/+8
2012-05-01Update system/libraries/Javascript.phpCosmin Atanasiu1-1/+8
2012-04-30Reverted recent commit, cookie_prefix was breaking things.Phil Sturgeon1-1/+0
2012-04-28Minor assignment fix.George Petsagourakis1-1/+1
Can not use $array[] for reading.
2012-04-28Merge pull request #1302 from chrisberthe/important_spelling_fixPhil Sturgeon1-1/+1
Important spelling fix to CodeIgniter.php
2012-04-28Important spelling fix to CodeIgniter.php fileChris Berthe1-1/+1
2012-04-27Merge pull request #1299 from timw4mail/patchPhil Sturgeon10-671/+680
Fix helper docblocks
2012-04-27Fix docblocks A-HTimothy Warren10-671/+680
2012-04-27Merge pull request #1296 from timw4mail/library-cleanupPhil Sturgeon24-147/+1171
Library cleanup - adding additional docblocks
2012-04-27Fix calendar and session librariesTimothy Warren3-24/+199
2012-04-27Fixed Cart, Migration, Parser and Zip librariesTimothy Warren4-6/+137
2012-04-27Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into ↵Timothy Warren3-11/+17
library-cleanup
2012-04-27Fix Cache, Image_lib and Log librariesTimothy Warren3-2/+142
2012-04-27Merge pull request #1298 from zivyuan/patch-1Phil Sturgeon1-0/+1
Cookie $index should start with a prefix.
2012-04-27Merge pull request #993 from narfbg/develop-issue-128Andrey Andreev2-11/+16
Fix issue #128
2012-04-27Merge upstream branchAndrey Andreev228-7839/+8046
2012-04-27Update system/core/Input.php ziv1-0/+1
Fix a cookie get back problem. Cookie $index should start with a prefix.
2012-04-27Fix Config.php and partially fix Image_lib.phpTimothy Warren2-25/+205
2012-04-27Fix Table library docblocksTimothy Warren1-2/+50