Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | Update lib/filestorage/common.php | hkjolhede | 2013-01-27 | 1 | -2/+1 | |
| * | | | | | | Merge branch 'master' of https://github.com/owncloud/core | Henrik Kjölhede | 2013-02-09 | 81 | -3485/+5567 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' | Henrik Kjölhede | 2013-01-26 | 83 | -1909/+2759 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Update lib/filestorage/common.php | hkjolhede | 2013-01-26 | 1 | -0/+24 | |
* | | | | | | | | Merge pull request #1577 from owncloud/typo_catagory | Lukas Reschke | 2013-02-10 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Typo | Lukas Reschke | 2013-02-09 | 1 | -3/+3 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-10 | 2 | -0/+2 | |
| |_|_|_|_|_|/ / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #1546 from owncloud/fix-loading-hooks | Thomas Müller | 2013-02-09 | 2 | -0/+18 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Always load the apps before trying to match a route | Bart Visscher | 2013-02-08 | 1 | -0/+1 | |
| * | | | | | | | | Better way of getting the navigation entries for an app | Bart Visscher | 2013-02-08 | 1 | -0/+17 | |
* | | | | | | | | | Merge pull request #1543 from owncloud/utf8-locale-master | Thomas Müller | 2013-02-09 | 2 | -8/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | some systems use en_US.UTF8 instead of en_US.UTF-8 | Thomas Müller | 2013-02-08 | 2 | -8/+7 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #1569 from owncloud/clean-app-id | Thomas Müller | 2013-02-09 | 3 | -2/+11 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into clean-app-id | Thomas Müller | 2013-02-09 | 8 | -1/+626 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove invalid characters from app id to prevent loading of invalid resources | Bart Visscher | 2013-02-09 | 3 | -2/+11 | |
* | | | | | | | | | | added icons and mimetypes for .msi and .exe files | Bernhard Posselt | 2013-02-09 | 1 | -0/+2 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | Revert "added exe and msi filetypes and icon" | Bernhard Posselt | 2013-02-09 | 1 | -2/+0 | |
* | | | | | | | | | added exe and msi filetypes and icon | Bernhard Posselt | 2013-02-09 | 1 | -0/+2 | |
* | | | | | | | | | Merge pull request #1566 from owncloud/fixing-1505-master | Thomas Müller | 2013-02-09 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | know your libraries ;-) | Thomas Müller | 2013-02-09 | 1 | -5/+1 | |
* | | | | | | | | | Merge pull request #1572 from owncloud/fix_empty_path_handling | icewind1991 | 2013-02-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | fix empty path handling | Jörn Friedrich Dreyer | 2013-02-09 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Remove unneeded __destruct call in OC\Files\Storage\Temporary | Bart Visscher | 2013-02-09 | 1 | -1/+0 | |
* | | | | | | | | Merge pull request #1481 from owncloud/fixing-1354-master | Thomas Müller | 2013-02-09 | 3 | -0/+55 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | in case curl is not present we cannot test | Thomas Müller | 2013-02-08 | 1 | -0/+4 | |
| * | | | | | | | Merge branch 'master' into fixing-1354-master | Thomas Mueller | 2013-02-07 | 8 | -14/+68 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Execute the post setup check after finishing the setup | Bart Visscher | 2013-02-06 | 2 | -22/+20 | |
| * | | | | | | | | basic WebDAV test in place now | Thomas Mueller | 2013-02-05 | 2 | -0/+53 | |
* | | | | | | | | | Merge pull request #1512 from owncloud/mapped-filename-storage | icewind1991 | 2013-02-09 | 4 | -0/+557 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | initial version of a local storage implementation which will use unique slugi... | Thomas Mueller | 2013-02-06 | 4 | -0/+557 | |
* | | | | | | | | | Fix files router download links | Bart Visscher | 2013-02-08 | 1 | -0/+14 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-master | Thomas Müller | 2013-02-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | quick fixing this require_once. | Thomas Mueller | 2013-02-08 | 1 | -1/+1 | |
* | | | | | | | | missing comma in sql statement | Thomas Müller | 2013-02-08 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing | icewind1991 | 2013-02-07 | 1 | -4/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | simplyfy mimetype parsing of 'file' output | Jörn Friedrich Dreyer | 2013-02-07 | 1 | -4/+3 | |
* | | | | | | | | | Merge pull request #1514 from owncloud/fix-setup | Lukas Reschke | 2013-02-07 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Move loading of js_config to templatelayout | Bart Visscher | 2013-02-07 | 1 | -0/+3 | |
* | | | | | | | | | | Merge pull request #1530 from owncloud/fix-warning-displayname-layout | blizzz | 2013-02-07 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix warning with displayname in user layout template | Bart Visscher | 2013-02-07 | 1 | -0/+3 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Fix previous commit | Robin Appelman | 2013-02-07 | 1 | -1/+1 | |
* | | | | | | | | | | Use dummy request method in CLI | Robin Appelman | 2013-02-07 | 1 | -1/+5 | |
* | | | | | | | | | | Don't try to use routes when called from cli | Robin Appelman | 2013-02-07 | 1 | -8/+10 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #1451 from eMerzh/fix_1065 | Thomas Müller | 2013-02-07 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add Redirect to getUrlContent fix #1065 | Brice Maron | 2013-02-04 | 1 | -0/+3 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-07 | 1 | -0/+1 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #1500 from chriskoch/patch-1 | Frank Karlitschek | 2013-02-06 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update lib/public/util.php | Christian Koch | 2013-02-06 | 1 | -2/+2 | |
* | | | | | | | | | Merge pull request #1509 from owncloud/correct-public-contacts-tests | Lukas Reschke | 2013-02-06 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Correct lib/public/contacts.php tests | Bart Visscher | 2013-02-06 | 1 | -2/+2 | |
| |/ / / / / / / |