summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-02-29updated branchMichiel Vugteveen8-151/+277
2012-02-29docx and xlsx was already fixesMichiel Vugteveen2-2/+3
2012-02-29Merge pull request #1092 from narfbg/develop-force-downloadAndrey Andreev2-41/+43
2012-02-29Merge remote-tracking branch 'upstream/develop' into develop-issue-499Andrey Andreev6-84/+221
2012-02-29Merge upstream branchAndrey Andreev6-85/+221
2012-02-29Improved plural() and singular().Phil Sturgeon2-56/+98
2012-02-29Add an optional set_mime parameter to force_download()Andrey Andreev2-39/+42
2012-02-29Merged in 2.1-stable changes.Phil Sturgeon5-28/+123
2012-02-28tab separator in _config_delimiters dockblock.Mike Funk1-1/+1
2012-02-28using tabs as @item seperators in docblocks.Mike Funk1-2/+2
2012-02-28fixed some mismatched brackets.Mike Funk1-4/+4
2012-02-28changed _config_delimiters() to protected.Mike Funk1-1/+1
2012-02-28Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren2-28/+15
2012-02-28Merge upstream branchAndrey Andreev3-46/+28
2012-02-28Merge upstream branchAndrey Andreev2-28/+15
2012-02-28Merge pull request #1089 from narfbg/develop-issue-177Andrey Andreev2-28/+15
2012-02-28Replace AND with &&Andrey Andreev1-1/+1
2012-02-28Fix issue #177Andrey Andreev2-28/+15
2012-02-28mime types doc, docx, xlsx fixesMichiel Vugteveen1-3/+3
2012-02-27Add changelog entryAndrey Andreev1-0/+1
2012-02-27Do not create a CSRF cookie if CSRF protection is not enabledAndrey Andreev1-19/+20
2012-02-27Merge upstreamTimothy Warren7-32/+80
2012-02-27Merge pull request #1086 from narfbg/develop-commonAndrey Andreev1-18/+13
2012-02-27Just some style changes and removed a useless checkAndrey Andreev1-18/+13
2012-02-27Update the changelog entry with issue IDAndrey Andreev1-1/+1
2012-02-27Fixed a db_set_charset() bugAndrey Andreev10-140/+11
2012-02-24updated documentation to differentiate prefix and suffix more.Mike Funk1-2/+2
2012-02-24fixed suffix documentation.Mike Funk1-1/+1
2012-02-24added config process method checking for delimiter values, updated changelog ...Mike Funk3-1/+32
2012-02-24added config check, changelog entry, and user guide update.Mike Funk3-1/+18
2012-02-24fixed active record inconsistency.Mike Funk1-1/+1
2012-02-24Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developMike Funk6-14/+67
2012-02-24Merge pull request #1069 from narfbg/develop-db-selectAndrey Andreev6-14/+67
2012-02-24Update database property when switching to a new oneAndrey Andreev4-4/+48
2012-02-23Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developMike Funk190-7188/+9974
2012-02-22Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebirdTimothy Warren2-24/+11
2012-02-22Merge pull request #1072 from narfbg/develop-issue-1070Andrey Andreev2-24/+11
2012-02-22Fix issue 1070Andrey Andreev2-24/+11
2012-02-22Close services after using them, added dbutil->backup() methodTimothy Warren3-6/+23
2012-02-22Add an optional database name parameter to db_select()Andrey Andreev6-14/+23
2012-02-21More formatting fixesTimothy Warren3-4/+4
2012-02-21Made tranaaction functions return their actual valueTimothy Warren1-6/+2
2012-02-21More style fixes, replaced _protect_identifiers with protect_identifiers in d...Timothy Warren2-11/+11
2012-02-21Minor formatting fixesTimothy Warren1-4/+4
2012-02-20Fix counting issue, minor formattingTimothy Warren2-9/+15
2012-02-20Set protected visibility on applicable functions/propertiesTimothy Warren3-32/+30
2012-02-20Convert result_array to result_object instead of re-fetchingTimothy Warren1-1/+26
2012-02-20Revert previous commitTimothy Warren1-5/+1
2012-02-20Revert "Fix previous commit"Timothy Warren1-5/+1
2012-02-20Fixed insert_id possibly returning 0Timothy Warren1-1/+6