Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3684 from owncloud/pg_install_db_master | Morris Jobke | 2013-06-14 | 1 | -1/+7 |
|\ | |||||
| * | improve comment | Morris Jobke | 2013-06-14 | 1 | -1/+1 |
| * | Correct escaping | eMerzh | 2013-06-12 | 1 | -1/+1 |
| * | Try connection with specified db when postgres does not work | Brice Maron | 2013-06-12 | 1 | -1/+7 |
* | | Merge branch 'master' into move-maint-start | Thomas Mueller | 2013-06-14 | 90 | -1116/+2607 |
|\ \ | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-14 | 2 | -0/+2 |
| * | | Merge pull request #3690 from owncloud/use_execute_audited_in_filecache | Thomas Müller | 2013-06-13 | 7 | -122/+99 |
| |\ \ | |||||
| | * | | fix another double wrapped array | Jörn Friedrich Dreyer | 2013-06-12 | 1 | -1/+1 |
| | * | | remove additional array wrapping | Jörn Friedrich Dreyer | 2013-06-12 | 1 | -3/+3 |
| | * | | use executeAudited in files cache | Jörn Friedrich Dreyer | 2013-06-12 | 7 | -122/+99 |
| | |/ | |||||
| * | | Merge pull request #3686 from owncloud/minor_exception_cleanup | Thomas Müller | 2013-06-13 | 2 | -7/+3 |
| |\ \ | |||||
| | * | | PDOException has no previous(), oh the consistency ... | Jörn Friedrich Dreyer | 2013-06-13 | 1 | -1/+1 |
| | * | | minor cleanup for exception handling | Jörn Friedrich Dreyer | 2013-06-12 | 1 | -6/+2 |
| | |/ | |||||
| * | | Merge pull request #3687 from owncloud/template_updates | Björn Schießle | 2013-06-13 | 2 | -1/+76 |
| |\ \ | |||||
| | * | | short explanation about OC_Defaults | Björn Schießle | 2013-06-12 | 1 | -0/+5 |
| | * | | make main menu aware of the different owncloud editions | Björn Schießle | 2013-06-12 | 1 | -1/+2 |
| | * | | add default doc url | Björn Schießle | 2013-06-12 | 1 | -0/+10 |
| | * | | make footer and urls aware of ownCloud editions | Björn Schießle | 2013-06-12 | 1 | -0/+10 |
| | * | | keep all strings in one place to make it easier to change them | Björn Schießle | 2013-06-12 | 1 | -0/+49 |
| | |/ | |||||
| * | | Merge pull request #3640 from infoneo/master | Thomas Müller | 2013-06-13 | 1 | -16/+16 |
| |\ \ | | |/ | |/| | |||||
| | * | Update mapper.php | infoneo | 2013-06-08 | 1 | -25/+8 |
| | * | Fixed problems with a dots in a filenames | infoneo | 2013-05-12 | 1 | -6/+12 |
| | * | Dots in a filenames fix | infoneo | 2013-05-12 | 1 | -8/+19 |
| * | | Merge pull request #3654 from owncloud/clean_up_exceptions | Thomas Müller | 2013-06-12 | 4 | -62/+133 |
| |\ \ | |||||
| | * | | remove duplicate logging from db.php, now happens in entrypoints | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -4/+0 |
| | * | | clean up usage of DatabaseSetupException and catch Exceptions in entrypoints | Jörn Friedrich Dreyer | 2013-06-10 | 2 | -15/+13 |
| | * | | introduce and use executeAudited in db.php | Jörn Friedrich Dreyer | 2013-06-10 | 2 | -47/+124 |
| * | | | Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2 | Jörn Friedrich Dreyer | 2013-06-11 | 1 | -1/+7 |
| |\ \ \ | |||||
| | * | | | fix fetchRow checks to also work with MDB2 | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -1/+7 |
| * | | | | Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons | Jörn Friedrich Dreyer | 2013-06-11 | 2 | -5/+20 |
| |\ \ \ \ | |||||
| | * | | | | use to_char to allow comparing string to CLOB cloumns in oracle | Jörn Friedrich Dreyer | 2013-06-10 | 2 | -5/+20 |
| * | | | | | createUser() needs to return something; the user object or false | Björn Schießle | 2013-06-11 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #3647 from owncloud/missing_backticks | Morris Jobke | 2013-06-10 | 3 | -11/+11 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | add missing backticks all over the place | Jörn Friedrich Dreyer | 2013-06-10 | 3 | -11/+11 |
| | |/ / | |||||
| * | | | Merge pull request #3648 from owncloud/sql_limit_as_param | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | convert LIMIT to parameter | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge pull request #3610 from owncloud/encryption_recovery_for_ldap | Björn Schießle | 2013-06-10 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | always emit the preSetPassword hook, this should only indicate the intention.... | Björn Schießle | 2013-06-06 | 1 | -3/+3 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-08 | 2 | -0/+3 |
| * | | | Merge pull request #2919 from owncloud/hook-improvements | Michael Gapczynski | 2013-06-07 | 1 | -6/+8 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into hook-improvements | Michael Gapczynski | 2013-06-04 | 130 | -1836/+3597 |
| | |\ \ \ | |||||
| | * | | | | Don't unlink old renamed file if stream copy failed | Michael Gapczynski | 2013-04-13 | 1 | -1/+3 |
| | * | | | | Check if operation worked before sending post hooks, fixes #2484 | Michael Gapczynski | 2013-04-13 | 1 | -4/+4 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-07 | 2 | -0/+6 |
| | |_|/ / | |/| | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-06 | 2 | -0/+2 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-05 | 3 | -0/+24 |
| | |/ / | |/| | | |||||
| * | | | Cache: mount user mountpoints to make sure that // exists before accessing it... | Arthur Schiwon | 2013-06-03 | 1 | -0/+1 |
| * | | | Merge pull request #3444 from owncloud/share-fix | Jörn Friedrich Dreyer | 2013-06-03 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix undefined index for share mount point retrieval | Michael Gapczynski | 2013-05-21 | 1 | -1/+1 |
| * | | | | Merge pull request #3561 from owncloud/user | icewind1991 | 2013-06-03 | 6 | -411/+899 |
| |\ \ \ \ |