summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #17026 from owncloud/update-config.sample.phpThomas Müller2015-06-191-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [config.sample.php] set correct default value for skeletondirectoryMorris Jobke2015-06-191-1/+1
| |/ / / /
* | | | | Merge pull request #16889 from owncloud/group-sorting-fixesJoas Schilling2015-06-197-11/+183
|\ \ \ \ \
| * | | | | Do not return backends but add a method to check for oneJoas Schilling2015-06-163-11/+23
| * | | | | Only sort by group name when LDAP is involvedJoas Schilling2015-06-167-11/+157
| * | | | | Always keep "Everyone" and "admin" at the top of the listJoas Schilling2015-06-161-0/+14
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1936-70/+36
* | | | | | Merge pull request #16963 from owncloud/fileinfo-lockVincent Petry2015-06-183-29/+57
|\ \ \ \ \ \
| * | | | | | remove unneeded normalizeRobin Appelman2015-06-181-2/+0
| * | | | | | unlock the file if the file doesnt existsRobin Appelman2015-06-181-0/+2
| * | | | | | use old cache data when lockedRobin Appelman2015-06-171-28/+49
| * | | | | | handle locked exceptions when getting file/directory info in sabreRobin Appelman2015-06-172-1/+8
* | | | | | | Merge pull request #17017 from owncloud/cache-update-write-lockVincent Petry2015-06-184-34/+47
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | dont update the cache on rename failRobin Appelman2015-06-181-1/+1
| * | | | | | update noopscannerRobin Appelman2015-06-181-3/+3
| * | | | | | extends phpdocRobin Appelman2015-06-181-3/+4
| * | | | | | update the file cache within the write lockRobin Appelman2015-06-183-31/+43
| |/ / / / /
* | | | | | Merge pull request #16692 from owncloud/add_social_media_buttonsBjörn Schießle2015-06-1811-6/+650
|\ \ \ \ \ \
| * | | | | | add id to urlBjoern Schiessle2015-06-182-7/+7