summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Update lib/filestorage/common.phphkjolhede2013-01-271-2/+1
| * | | | | | Merge branch 'master' of https://github.com/owncloud/coreHenrik Kjölhede2013-02-0981-3485/+5567
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master'Henrik Kjölhede2013-01-2683-1909/+2759
| |\ \ \ \ \ \
| * | | | | | | Update lib/filestorage/common.phphkjolhede2013-01-261-0/+24
* | | | | | | | Merge pull request #1577 from owncloud/typo_catagoryLukas Reschke2013-02-101-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | TypoLukas Reschke2013-02-091-3/+3
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-102-0/+2
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #1546 from owncloud/fix-loading-hooksThomas Müller2013-02-092-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Always load the apps before trying to match a routeBart Visscher2013-02-081-0/+1
| * | | | | | | | Better way of getting the navigation entries for an appBart Visscher2013-02-081-0/+17
* | | | | | | | | Merge pull request #1543 from owncloud/utf8-locale-masterThomas Müller2013-02-092-8/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | some systems use en_US.UTF8 instead of en_US.UTF-8Thomas Müller2013-02-082-8/+7
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1569 from owncloud/clean-app-idThomas Müller2013-02-093-2/+11
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into clean-app-idThomas Müller2013-02-098-1/+626
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove invalid characters from app id to prevent loading of invalid resourcesBart Visscher2013-02-093-2/+11
* | | | | | | | | | added icons and mimetypes for .msi and .exe filesBernhard Posselt2013-02-091-0/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Revert "added exe and msi filetypes and icon"Bernhard Posselt2013-02-091-2/+0
* | | | | | | | | added exe and msi filetypes and iconBernhard Posselt2013-02-091-0/+2
* | | | | | | | | Merge pull request #1566 from owncloud/fixing-1505-masterThomas Müller2013-02-091-5/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | know your libraries ;-)Thomas Müller2013-02-091-5/+1
* | | | | | | | | Merge pull request #1572 from owncloud/fix_empty_path_handlingicewind19912013-02-091-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | fix empty path handlingJörn Friedrich Dreyer2013-02-091-1/+1
| |/ / / / / / /
* | | | | | | | Remove unneeded __destruct call in OC\Files\Storage\TemporaryBart Visscher2013-02-091-1/+0
* | | | | | | | Merge pull request #1481 from owncloud/fixing-1354-masterThomas Müller2013-02-093-0/+55
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | in case curl is not present we cannot testThomas Müller2013-02-081-0/+4
| * | | | | | | Merge branch 'master' into fixing-1354-masterThomas Mueller2013-02-078-14/+68
| |\ \ \ \ \ \ \
| * | | | | | | | Execute the post setup check after finishing the setupBart Visscher2013-02-062-22/+20
| * | | | | | | | basic WebDAV test in place nowThomas Mueller2013-02-052-0/+53
* | | | | | | | | Merge pull request #1512 from owncloud/mapped-filename-storageicewind19912013-02-094-0/+557
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | initial version of a local storage implementation which will use unique slugi...Thomas Mueller2013-02-064-0/+557
* | | | | | | | | Fix files router download linksBart Visscher2013-02-081-0/+14
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-masterThomas Müller2013-02-081-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | quick fixing this require_once.Thomas Mueller2013-02-081-1/+1
* | | | | | | | missing comma in sql statementThomas Müller2013-02-081-1/+1
* | | | | | | | Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsingicewind19912013-02-071-4/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | simplyfy mimetype parsing of 'file' outputJörn Friedrich Dreyer2013-02-071-4/+3
* | | | | | | | | Merge pull request #1514 from owncloud/fix-setupLukas Reschke2013-02-071-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move loading of js_config to templatelayoutBart Visscher2013-02-071-0/+3
* | | | | | | | | | Merge pull request #1530 from owncloud/fix-warning-displayname-layoutblizzz2013-02-071-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix warning with displayname in user layout templateBart Visscher2013-02-071-0/+3
| |/ / / / / / / / /
* | | | | | | | | | Fix previous commitRobin Appelman2013-02-071-1/+1
* | | | | | | | | | Use dummy request method in CLIRobin Appelman2013-02-071-1/+5
* | | | | | | | | | Don't try to use routes when called from cliRobin Appelman2013-02-071-8/+10
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1451 from eMerzh/fix_1065Thomas Müller2013-02-071-0/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Add Redirect to getUrlContent fix #1065Brice Maron2013-02-041-0/+3
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-071-0/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1500 from chriskoch/patch-1Frank Karlitschek2013-02-061-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update lib/public/util.phpChristian Koch2013-02-061-2/+2
* | | | | | | | | Merge pull request #1509 from owncloud/correct-public-contacts-testsLukas Reschke2013-02-061-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Correct lib/public/contacts.php testsBart Visscher2013-02-061-2/+2
| |/ / / / / / /