Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use better way to check for the existence of smbclient | Robin Appelman | 2015-02-16 | 1 | -7/+2 |
| | |||||
* | New SMB storage backend | Robin Appelman | 2015-02-16 | 75 | -628/+5407 |
| | |||||
* | Merge pull request #14201 from owncloud/propagator-dont-decrease-mtime | Thomas Müller | 2015-02-16 | 3 | -4/+29 |
|\ | | | | | Dont lower the mtime of a folder when propagating changes | ||||
| * | update test | Robin Appelman | 2015-02-13 | 1 | -0/+2 |
| | | |||||
| * | Dont lower the mtime of a folder when propagating changes | Robin Appelman | 2015-02-13 | 2 | -4/+27 |
| | | |||||
* | | Merge pull request #13809 from owncloud/fix-autoloader-message | Thomas Müller | 2015-02-16 | 1 | -1/+4 |
|\ \ | | | | | | | Properly show the warning about the missing composer autoloader | ||||
| * | | Properly show the warning about the missing composer autoloader | Morris Jobke | 2015-01-31 | 1 | -1/+4 |
| | | | |||||
* | | | Merge pull request #13922 from owncloud/smb-autotest-external | Thomas Müller | 2015-02-16 | 5 | -13/+112 |
|\ \ \ | | | | | | | | | [files_external] add SMB autotest | ||||
| * | | | [files_external] add SMB autotest | Morris Jobke | 2015-02-10 | 5 | -13/+112 |
| | | | | |||||
* | | | | Merge pull request #14138 from owncloud/fix-image-flip-php53 | Thomas Müller | 2015-02-16 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Don't flip image in PHP 5.4 | ||||
| * | | | | Check if imageflip is available | Morris Jobke | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * imageflip() isn't available in PHP < 5.5 * fixes #14130 | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-16 | 6 | -22/+30 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-15 | 36 | -48/+98 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-14 | 30 | -70/+128 |
| | | | | | |||||
* | | | | | Merge pull request #14206 from owncloud/issue/14204-revert-14171 | Thomas Müller | 2015-02-13 | 2 | -17/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Issue/14204 revert #14171 | ||||
| * | | | | Update version to a higher one then before | Joas Schilling | 2015-02-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Revert "Improve: Index for file_map" | Joas Schilling | 2015-02-13 | 1 | -18/+0 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit c9b56084051ad33f15ad8a1a7fee95d38ba0d954. | ||||
| * | | | | Revert "Incorporate review changes" | Joas Schilling | 2015-02-13 | 2 | -1/+3 |
|/ / / / | | | | | | | | | | | | | This reverts commit f6a452cabf02e4a8005f874a77754f68abbc8fa5. | ||||
* | | | | Merge pull request #14178 from RealRancor/fix_config_sample | Morris Jobke | 2015-02-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Removed anchor in config.sample.php | ||||
| * | | | | Removed anchor in config.sample.php | RealRancor | 2015-02-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #14197 from ↵ | Lukas Reschke | 2015-02-13 | 2 | -1/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/ensure-that-passed-file-path-is-always-a-string Ensure that passed argument is always a string | ||||
| * | | | | | Ensure that passed argument is always a string | Lukas Reschke | 2015-02-13 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour. Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well. | ||||
* | | | | | | Merge pull request #14086 from hlop/master | Lukas Reschke | 2015-02-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | App install behind a Proxy | ||||
| * | | | | | App install behind a Proxy | Witali Rott | 2015-02-11 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #14171 from owncloud/fix/11639 | Joas Schilling | 2015-02-13 | 2 | -1/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Improve: Index for file_map | ||||
| * | | | | | | Incorporate review changes | Lukas Reschke | 2015-02-12 | 2 | -3/+1 |
| | | | | | | | |||||
| * | | | | | | Improve: Index for file_map | windaishi | 2015-02-12 | 1 | -0/+18 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | Added two indices for file_map, that improve syncing and uploading and deleting files | ||||
* / | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-13 | 98 | -148/+22 |
|/ / / / / | |||||
* | | | | | Merge pull request #13771 from owncloud/fix-humanfileSize | Lukas Reschke | 2015-02-12 | 2 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | generate valid human readable text for 0 | ||||
| * | | | | | generate valid human readable text for 0 - fixed #9342 | Thomas Müller | 2015-01-29 | 2 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #13780 from owncloud/cmreflector-inheritance | Lukas Reschke | 2015-02-12 | 1 | -2/+58 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Additional controllermethodreflector inheritance tests | ||||
| * | | | | | | another test for overriding the docblock | Bernhard Posselt | 2015-01-29 | 1 | -0/+14 |
| | | | | | | | |||||
| * | | | | | | additional inheritance tests | Bernhard Posselt | 2015-01-29 | 1 | -2/+44 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #14145 from owncloud/no-whitespace-from-themes-master | Lukas Reschke | 2015-02-12 | 2 | -11/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | catch any whitespaces which might get written to the output buffer while... | ||||
| * | | | | | | | catch any whitespaces which might get written to the output buffer while ↵ | Thomas Müller | 2015-02-12 | 2 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loading a theme | ||||
* | | | | | | | | Merge pull request #14159 from owncloud/remove-internal | Thomas Müller | 2015-02-12 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove internal annotation | ||||
| * | | | | | | | | Remove internal annotation | Lukas Reschke | 2015-02-12 | 1 | -5/+3 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | PHPStorm complained about those functions being declared as Internal. I doubt that this is actually the case since they are even in the public API. | ||||
* | | | | | | | | Merge pull request #14121 from Zillode/app-favicon | Morris Jobke | 2015-02-12 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Disable application-specific favicons for non-user pages | ||||
| * | | | | | | | | Disable application-specific favicons for non-user pages | Lode Hoste | 2015-02-11 | 2 | -4/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #9038 from owncloud/add_tag_file | Lukas Reschke | 2015-02-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add .tag file to make tar balls tracable | ||||
| * | | | | | | | | | Add .tag file to make tar balls tracable | Daniel Molkentin | 2014-06-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "git archive" operation will substitute the contents of this file with the hash sum of the commit that this tar ball is based on. This improves tracebility and allows to retrospectively set tags. It has proven to be a valuable asset in mirall. | ||||
* | | | | | | | | | | Merge pull request #14071 from owncloud/add_timeout_for_post_requests | Björn Schießle | 2015-02-12 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | add timeout to curl request | ||||
| * | | | | | | | | | | add timeout to curl request | Bjoern Schiessle | 2015-02-12 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #13913 from rullzer/showusergroups | Lukas Reschke | 2015-02-12 | 2 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | Added overview of groups a user is member of | ||||
| * | | | | | | | | | | Added overview of groups a user is a member of | Roeland Jago Douma | 2015-02-12 | 2 | -0/+14 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #14135 from cmeh/master | Morris Jobke | 2015-02-12 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Clean-up of messages (orthography, format) | ||||
| * | | | | | | | | | | | Orthography: "Back-end" -> Backend (without hyphen) and correction of ↵ | cmeh | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "users" to the genitive "user's" | ||||
| * | | | | | | | | | | | Adding a missing space between value and unit | cmeh | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the missing space between value and unit, as it is formatted in all other places across ownCloud. | ||||
* | | | | | | | | | | | | Merge pull request #10993 from owncloud/scanner-reuse-fileid | Morris Jobke | 2015-02-12 | 2 | -73/+124 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse known fileids and cache data in the scanner | ||||
| * | | | | | | | | | | | | only read permissions once | Robin Appelman | 2015-02-11 | 1 | -2/+3 |
| | | | | | | | | | | | | |