summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into doctrineBart Visscher2013-06-2476-1130/+2373
|\
| * Merge pull request #3792 from owncloud/scanfolder-removeThomas Müller2013-06-201-0/+14
| |\
| | * remove deleted files when re-scanning a folderRobin Appelman2013-06-201-0/+14
| * | Merge pull request #3779 from shkdee/patch-1blizzz2013-06-201-1/+1
| |\ \
| | * | Update user.phpshkdee2013-06-181-1/+1
| * | | add missing backticksJörn Friedrich Dreyer2013-06-201-1/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-201-0/+2
| | |/ | |/|
| * | Merge pull request #3764 from owncloud/scanfolder-existingicewind19912013-06-191-31/+48
| |\ \
| | * | add tests for reusing existing data in scannerRobin Appelman2013-06-171-4/+2
| | * | scanner: give more percision about what data is reused during scanningRobin Appelman2013-06-141-17/+29
| | * | split of scanning the childs of a folderRobin Appelman2013-06-141-17/+24
| * | | also use the default theme if the theme is set to an empty string in the con...Björn Schießle2013-06-191-2/+2
| * | | Merge pull request #3661 from owncloud/fixing-windows-server-masterJörn Friedrich Dreyer2013-06-193-3/+12
| |\ \ \ | | |_|/ | |/| |
| | * | dirname('/test.txt') returns '\' on windows whereas on linux we get back '.'Thomas Mueller2013-06-141-1/+1
| | * | restore Updater functionality on non-Windows platformsThomas Mueller2013-06-131-4/+4
| | * | [Fixing unit tests in Windows]Thomas Mueller2013-06-101-0/+6
| | * | [Fixing Updater Unit Tests on Windows]Thomas Mueller2013-06-101-3/+3
| | * | [Fixing Updater Unit Tests on Windows]Thomas Mueller2013-06-101-1/+4
| | * | Let's just use '/' as we do almost everywhere - this change fixes two failing...Thomas Mueller2013-06-101-2/+2
| * | | remove dangling AND in SQL statementJörn Friedrich Dreyer2013-06-181-1/+1
| * | | 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