aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-2466-82/+44
* Merge pull request #17095 from owncloud/proper-error-handlingMorris Jobke2015-06-233-11/+19
|\
| * [updater] keep maintenance active on failure and mark failure in redMorris Jobke2015-06-232-2/+3
| * [updater] propagate error case properlyMorris Jobke2015-06-232-8/+15
| * Added error message on initMountpoints exceptionMorris Jobke2015-06-231-1/+1
* | Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-messageVincent Petry2015-06-232-0/+19
|\ \
| * | adding correct blocking logic for fffClark Tomlinson2015-06-222-0/+19
* | | Merge pull request #17045 from owncloud/enc_improvementsBjörn Schießle2015-06-233-7/+66
|\ \ \
| * | | make sure that we always read the header from the original fileBjoern Schiessle2015-06-232-6/+65
| * | | remove files_encryption from database at the end of the migration processBjoern Schiessle2015-06-191-1/+1
* | | | Merge pull request #17090 from owncloud/upgrade-app-infoJörn Friedrich Dreyer2015-06-232-0/+4
|\ \ \ \
| * | | | [upgrade] print update message before running the update codeMorris Jobke2015-06-232-0/+4
| | |_|/ | |/| |
* | | | Merge pull request #17092 from owncloud/fix-language-experimentalJoas Schilling2015-06-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Accept this language change at your own riskJoas Schilling2015-06-231-1/+1
|/ / /
* | | Merge pull request #17081 from owncloud/issue-17079-risky-test-sabre-objecttreeLukas Reschke2015-06-231-1/+2
|\ \ \
| * | | Make an assertion in risky test testGetNodeForPathRootJoas Schilling2015-06-221-1/+2
* | | | Merge pull request #17085 from owncloud/use-trusted-mimetypeMorris Jobke2015-06-231-1/+1
|\ \ \ \
| * | | | Use trusted mimetypeLukas Reschke2015-06-221-1/+1
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2318-16/+78
* | | | Merge pull request #16940 from owncloud/ext-s3-touchmtimefixThomas Müller2015-06-221-8/+13
|\ \ \ \
| * | | | Properly set mtime on S3 for touch operationVincent Petry2015-06-151-8/+13
* | | | | Merge pull request #17068 from owncloud/fix_16878VicDeo2015-06-222-0/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | remove whitespace on bottom when no search results, fix laylout, fix #16878Jan-Christoph Borchardt2015-06-222-2/+6
| * | | | add filter-empty class if no search result in current folderBjoern Schiessle2015-06-221-0/+2
| | |/ / | |/| |
* | | | Merge pull request #12546 from oparoz/patch-1Björn Schießle2015-06-222-21/+51
|\ \ \ \
| * | | | Remove unneeded returns from private cropping methodsOlivier Paroz2015-06-192-20/+15
| * | | | Remove unneeded returns from private cropping methodsOlivier Paroz2015-06-181-16/+6
| * | | | Move media type icon preview creation to its own methodOlivier Paroz2015-06-182-4/+46
| * | | | Send the mime icon if we can't generate a previewOlivier Paroz2015-06-181-1/+4
* | | | | Merge pull request #16657 from owncloud/view-emit-pathThomas Müller2015-06-222-2/+33
|\ \ \ \ \
| * | | | | fix check if hooks should be emited in runHooksRobin Appelman2015-06-151-1/+2
| * | | | | emit hooks from a view as long as the path is inside the default rootRobin Appelman2015-06-022-1/+31
* | | | | | Merge pull request #17056 from owncloud/appframework-type-castBernhard Posselt2015-06-222-1/+15
|\ \ \ \ \ \
| * | | | | | AppFramework annotation whitespace unit testRobin McCorkell2015-06-211-0/+14
| * | | | | | Allow multiple whitespace in type hints in AppFrameworkRobin McCorkell2015-06-201-1/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-224-4/+20
* | | | | | | Merge pull request #17025 from owncloud/sftp-rmdir-emptydirRobin McCorkell2015-06-212-1/+12
|\ \ \ \ \ \ \
| * | | | | | | Workaround for empty dir deletion for SFTPVincent Petry2015-06-182-1/+12
* | | | | | | | Merge pull request #17052 from owncloud/fix-phpdoc-groupmgmRobin McCorkell2015-06-212-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use proper typeLukas Reschke2015-06-192-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2116-8/+96
| |_|/ / / / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2028-28/+172
|/ / / / / /
* | | | | | Merge pull request #17041 from owncloud/ocp-since-checkerMorris Jobke2015-06-1911-1/+146
|\ \ \ \ \ \
| * | | | | | move the OCPSinceChecker.php to build/Morris Jobke2015-06-192-1/+1
| * | | | | | Fix missing @since tags in OCPMorris Jobke2015-06-199-1/+28
| * | | | | | Add tool to check OCP for missing @since tagMorris Jobke2015-06-192-0/+118
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-uploadThomas Müller2015-06-191-0/+4
|\ \ \ \ \ \
| * | | | | | Verify if path existsLukas Reschke2015-06-181-0/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #17040 from owncloud/fix-param-namingThomas Müller2015-06-191-5/+5
|\ \ \ \ \ \
| * | | | | | Fix naming of param in private/server.phpMorris Jobke2015-06-191-5/+5
| | |/ / / / | |/| | | |