Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into doctrine | Bart Visscher | 2013-06-24 | 76 | -1130/+2373 |
|\ | |||||
| * | Merge pull request #3792 from owncloud/scanfolder-remove | Thomas Müller | 2013-06-20 | 1 | -0/+14 |
| |\ | |||||
| | * | remove deleted files when re-scanning a folder | Robin Appelman | 2013-06-20 | 1 | -0/+14 |
| * | | Merge pull request #3779 from shkdee/patch-1 | blizzz | 2013-06-20 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Update user.php | shkdee | 2013-06-18 | 1 | -1/+1 |
| * | | | add missing backticks | Jörn Friedrich Dreyer | 2013-06-20 | 1 | -1/+1 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-20 | 1 | -0/+2 |
| | |/ | |/| | |||||
| * | | Merge pull request #3764 from owncloud/scanfolder-existing | icewind1991 | 2013-06-19 | 1 | -31/+48 |
| |\ \ | |||||
| | * | | add tests for reusing existing data in scanner | Robin Appelman | 2013-06-17 | 1 | -4/+2 |
| | * | | scanner: give more percision about what data is reused during scanning | Robin Appelman | 2013-06-14 | 1 | -17/+29 |
| | * | | split of scanning the childs of a folder | Robin Appelman | 2013-06-14 | 1 | -17/+24 |
| * | | | also use the default theme if the theme is set to an empty string in the con... | Björn Schießle | 2013-06-19 | 1 | -2/+2 |
| * | | | Merge pull request #3661 from owncloud/fixing-windows-server-master | Jörn Friedrich Dreyer | 2013-06-19 | 3 | -3/+12 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | dirname('/test.txt') returns '\' on windows whereas on linux we get back '.' | Thomas Mueller | 2013-06-14 | 1 | -1/+1 |
| | * | | restore Updater functionality on non-Windows platforms | Thomas Mueller | 2013-06-13 | 1 | -4/+4 |
| | * | | [Fixing unit tests in Windows] | Thomas Mueller | 2013-06-10 | 1 | -0/+6 |
| | * | | [Fixing Updater Unit Tests on Windows] | Thomas Mueller | 2013-06-10 | 1 | -3/+3 |
| | * | | [Fixing Updater Unit Tests on Windows] | Thomas Mueller | 2013-06-10 | 1 | -1/+4 |
| | * | | Let's just use '/' as we do almost everywhere - this change fixes two failing... | Thomas Mueller | 2013-06-10 | 1 | -2/+2 |
| * | | | remove dangling AND in SQL statement | Jörn Friedrich Dreyer | 2013-06-18 | 1 | -1/+1 |
| * | | | Merge pull request #3621 from owncloud/path-mimetype | Thomas Müller | 2013-06-16 | 1 | -12/+22 |
| |\ \ \ | |||||
| | * | | | actually return result | Robin Appelman | 2013-06-07 | 1 | -2/+2 |
| | * | | | fix variable name | Robin Appelman | 2013-06-07 | 1 | -2/+2 |
| | * | | | seperate mimetype guessing from filename | Robin Appelman | 2013-06-06 | 1 | -12/+22 |
| * | | | | Merge pull request #3721 from owncloud/oracle_setup_fixes | Thomas Müller | 2013-06-14 | 4 | -25/+41 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | remove default tablespace in parameter | Jörn Friedrich Dreyer | 2013-06-14 | 1 | -3/+3 |
| | * | | | adding default to $hint within ctor of DatabaseSetupException | Thomas Mueller | 2013-06-14 | 1 | -1/+1 |
| | * | | | coding style | Thomas Mueller | 2013-06-14 | 1 | -1/+4 |
| | * | | | use executeAudited in sabredav lock | Jörn Friedrich Dreyer | 2013-06-14 | 1 | -13/+12 |
| | * | | | add missing backticks, use executeAudited in post_deleteGroup and post_remove... | Jörn Friedrich Dreyer | 2013-06-14 | 1 | -6/+6 |
| | * | | | use USERS tablespace whn none is given, only needed when we need to create a ... | Jörn Friedrich Dreyer | 2013-06-14 | 1 | -5/+8 |
| | * | | | oracle does not need sequence suffix, manually set database name to allow fet... | Jörn Friedrich Dreyer | 2013-06-14 | 1 | -1/+12 |
| * | | | | 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 |