summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* comment out old codeGeorg Ehrke2013-06-191-1/+3
* implemenet getNoCoverThumbnailGeorg Ehrke2013-06-191-3/+8
* use ppt icon instead of previewGeorg Ehrke2013-06-181-17/+4
* remove opendocument.phpGeorg Ehrke2013-06-182-13/+0
* Merge branch 'master' into oc_previewGeorg Ehrke2013-06-1724-263/+457
|\
| * Merge pull request #3621 from owncloud/path-mimetypeThomas Müller2013-06-161-12/+22
| |\
| | * actually return resultRobin Appelman2013-06-071-2/+2
| | * fix variable nameRobin Appelman2013-06-071-2/+2
| | * seperate mimetype guessing from filenameRobin Appelman2013-06-061-12/+22
| * | Merge pull request #3721 from owncloud/oracle_setup_fixesThomas Müller2013-06-144-25/+41
| |\ \
| | * | remove default tablespace in parameterJörn Friedrich Dreyer2013-06-141-3/+3
| | * | adding default to $hint within ctor of DatabaseSetupExceptionThomas Mueller2013-06-141-1/+1
| | * | coding styleThomas Mueller2013-06-141-1/+4
| | * | use executeAudited in sabredav lockJörn Friedrich Dreyer2013-06-141-13/+12
| | * | add missing backticks, use executeAudited in post_deleteGroup and post_remove...Jörn Friedrich Dreyer2013-06-141-6/+6
| | * | use USERS tablespace whn none is given, only needed when we need to create a ...Jörn Friedrich Dreyer2013-06-141-5/+8
| | * | oracle does not need sequence suffix, manually set database name to allow fet...Jörn Friedrich Dreyer2013-06-141-1/+12
| * | | Merge pull request #3684 from owncloud/pg_install_db_masterMorris Jobke2013-06-141-1/+7
| |\ \ \
| | * | | improve commentMorris Jobke2013-06-141-1/+1
| | * | | Correct escapingeMerzh2013-06-121-1/+1
| | * | | Try connection with specified db when postgres does not workBrice Maron2013-06-121-1/+7
| * | | | Merge branch 'master' into move-maint-startThomas Mueller2013-06-1490-1116/+2607
| |\ \ \ \
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-142-0/+2
| | | |/ / | | |/| |
| | * | | Merge pull request #3690 from owncloud/use_execute_audited_in_filecacheThomas Müller2013-06-137-122/+99
| | |\ \ \
| | | * | | fix another double wrapped arrayJörn Friedrich Dreyer2013-06-121-1/+1
| | | * | | remove additional array wrappingJörn Friedrich Dreyer2013-06-121-3/+3
| | | * | | use executeAudited in files cacheJörn Friedrich Dreyer2013-06-127-122/+99
| | | |/ /
| | * | | Merge pull request #3686 from owncloud/minor_exception_cleanupThomas Müller2013-06-132-7/+3
| | |\ \ \
| | | * | | PDOException has no previous(), oh the consistency ...Jörn Friedrich Dreyer2013-06-131-1/+1
| | | * | | minor cleanup for exception handlingJörn Friedrich Dreyer2013-06-121-6/+2
| | | |/ /
| | * | | Merge pull request #3687 from owncloud/template_updatesBjörn Schießle2013-06-132-1/+76
| | |\ \ \
| | | * | | short explanation about OC_DefaultsBjörn Schießle2013-06-121-0/+5
| | | * | | make main menu aware of the different owncloud editionsBjörn Schießle2013-06-121-1/+2
| | | * | | add default doc urlBjörn Schießle2013-06-121-0/+10
| | | * | | make footer and urls aware of ownCloud editionsBjörn Schießle2013-06-121-0/+10
| | | * | | keep all strings in one place to make it easier to change themBjörn Schießle2013-06-121-0/+49
| | | |/ /
| | * | | Merge pull request #3640 from infoneo/masterThomas Müller2013-06-131-16/+16
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Update mapper.phpinfoneo2013-06-081-25/+8
| | | * | Fixed problems with a dots in a filenamesinfoneo2013-05-121-6/+12
| | | * | Dots in a filenames fixinfoneo2013-05-121-8/+19
| | * | | Merge pull request #3654 from owncloud/clean_up_exceptionsThomas Müller2013-06-124-62/+133
| | |\ \ \
| | | * | | remove duplicate logging from db.php, now happens in entrypointsJörn Friedrich Dreyer2013-06-101-4/+0
| | | * | | clean up usage of DatabaseSetupException and catch Exceptions in entrypointsJörn Friedrich Dreyer2013-06-102-15/+13
| | | * | | introduce and use executeAudited in db.phpJörn Friedrich Dreyer2013-06-102-47/+124
| | * | | | Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2Jörn Friedrich Dreyer2013-06-111-1/+7
| | |\ \ \ \
| | | * | | | fix fetchRow checks to also work with MDB2Jörn Friedrich Dreyer2013-06-101-1/+7
| | * | | | | Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisonsJörn Friedrich Dreyer2013-06-112-5/+20
| | |\ \ \ \ \
| | | * | | | | use to_char to allow comparing string to CLOB cloumns in oracleJörn Friedrich Dreyer2013-06-102-5/+20
| | * | | | | | createUser() needs to return something; the user object or falseBjörn Schießle2013-06-111-1/+1
| | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #3647 from owncloud/missing_backticksMorris Jobke2013-06-103-11/+11
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |