summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-03-01Merge upstream branchAndrey Andreev1-2/+4
2012-03-01Fix issue #129 (ODBC num_rows() returning -1 in some cases)Andrey Andreev2-4/+17
2012-03-01Merge upstream branchAndrey Andreev7-219/+146
2012-03-01Fix issue #81 (ODBC list_fields(), field_data())Andrey Andreev2-20/+20
2012-03-01Fix an Oracle escape_str() bug (#68, #414)Andrey Andreev2-8/+7
2012-03-01Some other minor improvements to the Email libraryAndrey Andreev1-81/+67
2012-03-01Switch ANDs to &&, || to OR in the Email classAndrey Andreev1-14/+13
2012-03-01Remove access lines and fix method description blocks in the Email classAndrey Andreev1-84/+25
2012-03-01Switch private properties in the Email class to protectedAndrey Andreev1-24/+25
2012-02-29Change end() usage due to E_STRICT messagesAndrey Andreev2-2/+4
2012-02-29Merge pull request #1093 from IT-Can/upload-double-slash-fixAndrey Andreev1-1/+1
2012-02-29removed changelogMichiel Vugteveen1-1/+0
2012-02-29Add a changelog entry for num_rows()Andrey Andreev1-1/+1
2012-02-29Merge remote-tracking branch 'upstream/develop' into develop-db-odbcAndrey Andreev3-42/+45
2012-02-29Fix ODBC num_rows() for subdrivers that return -1Andrey Andreev1-1/+12
2012-02-29removed double slashMichiel Vugteveen2-1/+2
2012-02-29Merge pull request #1088 from IT-Can/word-mime-fixAndrey Andreev2-1/+2
2012-02-29changelog fixMichiel Vugteveen1-1/+1
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-db-odbcAndrey 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-28Merge upstream branchAndrey Andreev3-46/+28
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-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-24Merge upstream branchAndrey Andreev6-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-22Merge upstream branchAndrey Andreev4-32/+12
2012-02-22Merge pull request #1072 from narfbg/develop-issue-1070Andrey Andreev2-24/+11
2012-02-22Fix issue 1070Andrey Andreev2-24/+11
2012-02-22Add an optional database name parameter to db_select()Andrey Andreev6-14/+23
2012-02-17Merge pull request #1051 from toopay/mysql_utilPhil Sturgeon1-1/+1
2012-02-17Syntax error, causing MySQL utility could not usedTaufan Aditya1-1/+1
2012-02-17Merge pull request #1050 from marcosgdf/developPhil Sturgeon1-7/+0
2012-02-17Fixed issue #960Marcos Garcia1-7/+0
2012-02-16Merge upstream branchAndrey Andreev5-12/+14
2012-02-16Merge pull request #934 from wilburhimself/developPhil Sturgeon1-1/+1
2012-02-16Merge pull request #1046 from YorickPeterse/developPhil Sturgeon1-1/+1
2012-02-16Merge pull request #1040 from narfbg/develop-issue-1039Phil Sturgeon3-10/+12
2012-02-15Lowered the file permissions for file caches.Yorick Peterse1-1/+1
2012-02-14Fix another issueAndrey Andreev1-1/+1