summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-01-05Merge pull request #839 from GDmac/developGreg Aker1-2/+2
2012-01-05Merge upstream branchAndrey Andreev3-4/+58
2012-01-05Added pagination change log item back.Eric Barnes1-0/+3
2012-01-05Merge branch 'patch-1' of https://github.com/dixy/CodeIgniter-1 into dixy-pat...Eric Barnes1-2/+2
2012-01-04Fixed paging with prefix and suffix for real page numbers. Refs #677 Fixes #52Eric Barnes1-3/+4
2012-01-04Fixed prefix and suffix in pagination. Fixes #677Eric Barnes1-0/+5
2012-01-04Updated the memcached config file.Eric Barnes1-7/+31
2012-01-04Merge pull request #668 from GustavBertram/developEric Barnes1-0/+22
2012-01-03Update user_guide_src/source/changelog.rstRS711-0/+2
2012-01-03Update user_guide_src/source/libraries/security.rstRS711-0/+4
2012-01-03Merge remote-tracking branch 'upstream/develop' into develop-xmlrpcAndrey Andreev2-9/+12
2012-01-03Merge pull request #859 from narfbg/develop-701Eric Barnes2-9/+12
2012-01-03Update the changelogAndrey Andreev1-0/+1
2012-01-03Merge remote-tracking branch 'upstream/develop' into develop-xmlrpcAndrey Andreev160-2138/+1471
2012-01-03Replace htmlentities() with htmlspecialchars() to fix issue #561Andrey Andreev1-1/+8
2012-01-03Some additions to mimes.phpAndrey Andreev2-9/+12
2012-01-03Merge pull request #858 from narfbg/develop-854Greg Aker1-42/+4
2012-01-03Fix a comment and remove access description linesAndrey Andreev1-42/+4
2012-01-02Merge pull request #615 from onigoetz/patch-1Phil Sturgeon1-1/+1
2012-01-02Updating copyright date to 2012Greg Aker150-151/+151
2012-01-01Merge pull request #849 from narfbg/develop-image-lib-fixPhil Sturgeon1-4/+18
2012-01-01Cut some commentsAndrey Andreev1-5/+1
2011-12-31Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon8-285/+398
2011-12-31Added method chaining to DBForge.Phil Sturgeon1-28/+21
2011-12-31Update application/config/config.phpRS711-0/+2
2011-12-31Update system/core/Security.phpRS711-3/+8
2011-12-31Fix a comment typoAndrey Andreev1-1/+1
2011-12-31Fix a bug and put some comments describing changes from pull #818Andrey Andreev1-4/+22
2011-12-31Added SELECT version to migrations to make the query a billionth faster.Phil Sturgeon1-1/+1
2011-12-30Replace some list(...) = each(...) expressions with current(), where only val...Andrey Andreev1-6/+3
2011-12-30Merge pull request #818 from narfbg/develop-image-libPhil Sturgeon3-146/+97
2011-12-30Some alignment for readabilityAndrey Andreev1-2/+3
2011-12-30Another fix on a previous commit from this requestAndrey Andreev1-1/+2
2011-12-30Remove a str_split() from the previous commit - we can access string characte...Andrey Andreev1-9/+1
2011-12-30Added support for 3-length hex color values format and a number of validation...Andrey Andreev3-44/+58
2011-12-30Some more optimizationsAndrey Andreev1-10/+5
2011-12-29Merge pull request #847 from WanWizard/feature/ar_parenthesesGreg Aker2-133/+295
2011-12-28Updating Moscow and Samoa timezonesBrandon Jones1-4/+4
2011-12-28Merge pull request #824 from bergal/patch-1Greg Aker1-1/+1
2011-12-28Turn "pconnect" off by default.Phil Sturgeon1-1/+1
2011-12-28added query grouping to Active RecordWanWizard2-133/+295
2011-12-28Adding docblock to _process_fields() in the postgres dbforge file.Greg Aker1-0/+3
2011-12-28Fix #808 Postgresql DBForge Driver errors.Greg Aker1-55/+51
2011-12-27Revert "Abstracting the loading of files in the config directory depending on...Greg Aker13-135/+186
2011-12-27Merge pull request #823 from narfbg/develop-sessionPhil Sturgeon1-100/+66
2011-12-27Fixing a documentation linking error in the 3.0 upgrade notes.Greg Aker1-1/+1
2011-12-27Adding 3.0.0 release notes documentation file.Greg Aker1-0/+28
2011-12-27Merge pull request #827 from narfbg/develop-tableGreg Aker1-73/+43
2011-12-27Merge pull request #828 from narfbg/develop-trackbackGreg Aker1-53/+15
2011-12-27Merge pull request #830 from narfbg/develop-unit-testGreg Aker1-66/+36