summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Yet another cleanupThomas Tanghus2014-03-052-22/+33
* | | | | | Merge pull request #8496 from owncloud/fix-folder-iconJan-Christoph Borchardt2014-05-091-5/+4
|\ \ \ \ \ \
| * | | | | | fix folder icon (file had a big background rectangle before)Jan-Christoph Borchardt2014-05-071-5/+4
* | | | | | | Merge pull request #8512 from owncloud/fix-memcached-hasKeyAndreas Fischer2014-05-091-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Memcached hasKey should test for success, the get can fail for other reasons.Bart Visscher2014-05-081-1/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0927-137/+186
* | | | | | | Merge pull request #8499 from owncloud/shareextstoragemountpointfixVincent Petry2014-05-083-6/+65
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix getPathById for OracleVincent Petry2014-05-081-0/+4
| * | | | | | Added unit test for sharing ext storage mount pointsVincent Petry2014-05-081-2/+55
| * | | | | | Fix sharing of ext storage mount pointsVincent Petry2014-05-081-4/+6
* | | | | | | Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-...Andreas Fischer2014-05-081-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Use strict type comparisonLukas Reschke2014-05-071-2/+2
| |/ / / / /
* | | | | | Merge pull request #8293 from owncloud/files_external_fix_readDataVincent Petry2014-05-081-19/+18
|\ \ \ \ \ \
| * | | | | | Permit personal mount points to be used for sharingRobin McCorkell2014-04-211-19/+18
* | | | | | | Merge pull request #8221 from owncloud/type-hinting-sharingVincent Petry2014-05-085-168/+179
|\ \ \ \ \ \ \
| * | | | | | | Use 'boolean' as type instead of 'bool'Bart Visscher2014-05-071-21/+21
| * | | | | | | TypoBart Visscher2014-05-061-1/+1
| * | | | | | | Correct return type for getFilePathBart Visscher2014-05-011-1/+1
| * | | | | | | Better documentation for isValidSource functionBart Visscher2014-05-011-4/+1
| * | | | | | | Some more params are optionalBart Visscher2014-05-011-3/+3
| * | | | | | | Merge branch 'master' into type-hinting-sharingBart Visscher2014-04-281045-20063/+51293
| |\ \ \ \ \ \ \
| * | | | | | | | Fix PHPdoc in OC\Share\Share and OCP\ShareBart Visscher2014-04-152-155/+158
| * | | | | | | | Fix PHPdoc in apps/files_sharingBart Visscher2014-04-154-1/+15
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0814-17/+20
* | | | | | | | | Merge pull request #8497 from owncloud/sharing_cleanupBjörn Schießle2014-05-073-24/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanupBjoern Schiessle2014-05-072-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix endless loop on windows serversJoas Schilling2014-05-072-2/+2
| * | | | | | | | | remove error_log outputBjoern Schiessle2014-05-071-2/+1
| |/ / / / / / / /
| * / / / / / / / we can take the permission directly from the share, no need to call the share...Bjoern Schiessle2014-05-071-20/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #8488 from owncloud/sabre-notfoundloglevelLukas Reschke2014-05-072-6/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Some expected Sabre exceptions are now logged with DEBUG levelVincent Petry2014-05-072-6/+20
* | | | | | | | | Merge pull request #8223 from owncloud/fix_linkToPublicVincent Petry2014-05-073-5/+231
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused varThomas Tanghus2014-04-161-5/+0
| * | | | | | | | | Add tests for linkTo, linkToPublic, linkToRemote, linkToRemoteBaseThomas Tanghus2014-04-162-0/+223
| * | | | | | | | | Also fix linkToAbsoluteThomas Tanghus2014-04-161-3/+7
| * | | | | | | | | Fix linkToPublic. Refs #8218Thomas Tanghus2014-04-151-2/+6
* | | | | | | | | | Merge pull request #8489 from owncloud/share_updater_ignore_part_filesVincent Petry2014-05-072-1/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | check if we have a fileinfoBjoern Schiessle2014-05-071-1/+5
| * | | | | | | | | | ignore part filesBjoern Schiessle2014-05-071-0/+6
|/ / / / / / / / / /
* | | | | | / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-05-0755-225/+341
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uriVincent Petry2014-05-061-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Send URI instead of filepath to NGINX for X-Acceljosh4trunks2014-04-031-1/+4
* | | | | | | | | | Merge pull request #8466 from owncloud/fix-installation-caretMorris Jobke2014-05-061-2/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix enlarged caret on installation pageJan-Christoph Borchardt2014-05-061-2/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #8459 from owncloud/fix-getUserFolderMorris Jobke2014-05-051-2/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix getUserFolder() of server containerMorris Jobke2014-05-051-2/+10
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #8456 from owncloud/extstorage-unittestssuiteThomas Müller2014-05-054-6/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added ext storage app in autotest unit test runVincent Petry2014-05-054-6/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #8458 from snai/masterVincent Petry2014-05-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated Owncloud Mailinglist URLMartin Grohmann2014-05-051-1/+1