summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3721 from owncloud/oracle_setup_fixesThomas Müller2013-06-144-25/+41
|\ | | | | Oracle setup fixes
| * 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 ↵Jörn Friedrich Dreyer2013-06-141-6/+6
| | | | | | | | post_removeFromGroup
| * use USERS tablespace whn none is given, only needed when we need to create a ↵Jörn Friedrich Dreyer2013-06-141-5/+8
| | | | | | | | user, does not need to be stored in config
| * oracle does not need sequence suffix, manually set database name to allow ↵Jörn Friedrich Dreyer2013-06-141-1/+12
| | | | | | | | fetching db schema, don't shutdown db - we are using utf8 to connect
* | Merge pull request #3684 from owncloud/pg_install_db_masterMorris Jobke2013-06-141-1/+7
|\ \ | | | | | | Try connection with specified db when postgres does not work
| * | 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
| | | | | | | | | | | | | | | | | | Conflicts: lib/setup.php
* | | Merge branch 'master' into move-maint-startThomas Mueller2013-06-1490-1116/+2607
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: lib/util.php
| * | | [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
| |\ \ | | | | | | | | use executeAudited in files cache
| | * | 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
| |\ \ | | | | | | | | minor cleanup for exception handling
| | * | 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
| |\ \ | | | | | | | | Make templates aware of different owncloud editions
| | * | 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
| |\ \ | | |/ | |/| Folders with multiple periods problem fix
| | * Update mapper.phpinfoneo2013-06-081-25/+8
| | | | | | | | | Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).
| | * 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
| |\ \ | | | | | | | | Introduce more robust SQL execution and exception handling
| | * | 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 MDB2
| | * | | 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 oracle
| | * | | | 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
| |\ \ \ \ | | |_|/ / | |/| | | add missing backticks all over the place
| | * | | add missing backticks all over the placeJörn Friedrich Dreyer2013-06-103-11/+11
| | |/ /
| * | | Merge pull request #3648 from owncloud/sql_limit_as_paramJörn Friedrich Dreyer2013-06-101-1/+1
| |\ \ \ | | | | | | | | | | convert LIMIT to parameter
| | * | | convert LIMIT to parameterJörn Friedrich Dreyer2013-06-101-1/+1
| | |/ /
| * | | Merge pull request #3610 from owncloud/encryption_recovery_for_ldapBjörn Schießle2013-06-101-3/+3
| |\ \ \ | | |/ / | |/| | recover encryption keys if ownCloud can't change the log-in password
| | * | always emit the preSetPassword hook, this should only indicate the ↵Björn Schießle2013-06-061-3/+3
| | | | | | | | | | | | | | | | intention. Finally the post-hooks indicate if it was successful or not
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-082-0/+3
| | | |
| * | | Merge pull request #2919 from owncloud/hook-improvementsMichael Gapczynski2013-06-071-6/+8
| |\ \ \ | | | | | | | | | | Hook improvements
| | * \ \ Merge branch 'master' into hook-improvementsMichael Gapczynski2013-06-04130-1836/+3597
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/view.php
| | * | | | Don't unlink old renamed file if stream copy failedMichael Gapczynski2013-04-131-1/+3
| | | | | |