summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-01-06Merge pull request #871 from narfbg/develop-helpers-effPhil Sturgeon3-95/+62
Improve email, file & form helpers
2012-01-06Merge pull request #872 from narfbg/develop-helpers-hilPhil Sturgeon3-76/+33
Improve html, inflector & language helpers
2012-01-06Merge pull request #873 from narfbg/develop-helpers-nssPhil Sturgeon3-34/+18
Improve number, path & security helpers
2012-01-06Merge pull request #832 from narfbg/develop-xmlrpcPhil Sturgeon2-239/+190
Improve the Xmlrpc library
2012-01-06Improve number, path & security helpersAndrey Andreev3-34/+18
2012-01-06Improve html, inflector & language helpersAndrey Andreev3-76/+33
2012-01-06Improve email, file & form helpersAndrey Andreev3-95/+62
2012-01-05Merge pull request #839 from GDmac/developGreg Aker1-2/+2
No need for eval to extend a class
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 ↵Eric Barnes1-2/+2
dixy-patch-1 Conflicts: user_guide_src/source/changelog.rst
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
Added a proper default config file for Cache_memcached - GWB
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
Add KMZ and KML (Google Earth) file types to mimes.php
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
Fix for issue #854
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
Added a "break 2;" when overriding the Driver file
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
Fix a bug and put some comments describing changes from pull #818
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-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 ↵Andrey Andreev1-6/+3
values are needed
2011-12-30Merge pull request #818 from narfbg/develop-image-libPhil Sturgeon3-146/+97
Improve the Image manipulation library
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 ↵Andrey Andreev1-9/+1
characters like we do in an indexed array anyways
2011-12-30Added support for 3-length hex color values format and a number of ↵Andrey Andreev3-44/+58
validation improvements
2011-12-30Some more optimizationsAndrey Andreev1-10/+5
2011-12-29Merge pull request #847 from WanWizard/feature/ar_parenthesesGreg Aker2-133/+295
added query grouping to Active Record
2011-12-28Updating Moscow and Samoa timezonesBrandon Jones1-4/+4
2011-12-28Merge pull request #824 from bergal/patch-1Greg Aker1-1/+1
Fix news item href
2011-12-28Turn "pconnect" off by default.Phil Sturgeon1-1/+1
Some users were complaining this was effecting their performance and having it on by default can potentially cause issues with people who don't understand what it does. Having it off by default means people are only effected if they want to be, which is safer.
2011-12-28added query grouping to Active RecordWanWizard2-133/+295
this is a feature that has been lacking for a very long time. lots of people complained about it over the years, but it never got added so you'd have to resort to handcrafted queries when you needed this feature. This is a port of code from DataMapper, in use since CI 1.6.
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
- _process_fields() was missing and add_column(), drop_column() was producing malformed queries.
2011-12-27Revert "Abstracting the loading of files in the config directory depending ↵Greg Aker13-135/+186
on environments." This reverts commit 5c1aa631c5f5ec2f6b75ba1158178418e50ba11a.
2011-12-27Merge pull request #823 from narfbg/develop-sessionPhil Sturgeon1-100/+66
Improve the Session library
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