summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9419 from owncloud/fix_search_results_in_root_dirJörn Friedrich Dreyer2014-07-042-0/+7
|\
| * deprecate OC_Search_Provider in favor of \OCP\Search\ProviderJörn Friedrich Dreyer2014-07-031-0/+4
| * fix '' to '/' when determining parent for search resultJörn Friedrich Dreyer2014-07-031-0/+3
* | Merge pull request #9455 from owncloud/breadcrumbs-backgroundsizeJan-Christoph Borchardt2014-07-041-0/+1
|\ \
| * | fix size of breadcrumb separatorMorris Jobke2014-07-041-0/+1
|/ /
* | Merge pull request #9357 from owncloud/sharing_unshare_on_deleteBjörn Schießle2014-07-048-49/+65
|\ \
| * | add owner as parameter for delShareKeyBjoern Schiessle2014-07-043-11/+18
| * | make sure that the umount hook always contains the path relative to data/user...Bjoern Schiessle2014-07-042-4/+14
| * | if a folder gets deleted we unshare all shared files/folders belowBjoern Schiessle2014-07-044-34/+33
* | | Merge pull request #9445 from owncloud/filelist-auth-erroricewind19912014-07-043-8/+41
|\ \ \
| * | | Add machine readable error messages to OC\JSONRobin Appelman2014-07-043-8/+41
* | | | Merge pull request #9438 from owncloud/design-fix-appsloadingfeedbackJan-Christoph Borchardt2014-07-041-0/+1
|\ \ \ \
| * | | | show loading feedback also when clicking 'Apps' entry in app listJan-Christoph Borchardt2014-07-041-0/+1
* | | | | Merge pull request #9450 from owncloud/update-snap.jsThomas Müller2014-07-041-566/+783
|\ \ \ \ \
| * | | | | update snap.js to v2.0.0-rc1Thomas Müller2014-07-041-566/+783
| | |/ / / | |/| | |
* | | | | Merge pull request #9434 from owncloud/files-reloadpromiseissueMorris Jobke2014-07-043-15/+7
|\ \ \ \ \
| * | | | | Fix reload call for all subclassesVincent Petry2014-07-043-15/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #8308 from owncloud/case_insensitive_search_oracleJörn Friedrich Dreyer2014-07-042-3/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | make search case insensitive on postgres and oracleJörn Friedrich Dreyer2014-07-032-3/+27
* | | | | Merge pull request #9269 from owncloud/fix_versions_previewThomas Müller2014-07-044-3/+28
|\ \ \ \ \
| * | | | | introduce and use getCurrentConnection()Jörn Friedrich Dreyer2014-07-013-1/+25
| * | | | | reset collection to 'root' after adding a route to the apiJörn Friedrich Dreyer2014-07-011-0/+1
| * | | | | change order of registering api and capabilities to fix file version previewsJörn Friedrich Dreyer2014-07-011-3/+3
* | | | | | Merge pull request #9441 from owncloud/install-sql-host-defaultThomas Müller2014-07-041-1/+1
|\ \ \ \ \ \
| * | | | | | set localhost as default database host for installationRobin Appelman2014-07-041-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #9444 from owncloud/design-fix-pointerMorris Jobke2014-07-042-3/+9
|\ \ \ \ \ \
| * | | | | | fix cursor for other elements in top right cornerMorris Jobke2014-07-041-0/+3
| * | | | | | fix 'remember' label being slightly off in log inJan-Christoph Borchardt2014-07-041-0/+1
| * | | | | | fix icons being slightly off in log inJan-Christoph Borchardt2014-07-041-3/+2
| * | | | | | fix user menu name and image not showing clicky mouse pointerJan-Christoph Borchardt2014-07-041-0/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #9440 from owncloud/files-fileactionsdeepcopyMorris Jobke2014-07-042-10/+156
|\ \ \ \ \ \
| * | | | | | Fix FileActions merging overrideVincent Petry2014-07-042-10/+156
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #9426 from owncloud/design-remoteshare-confirmMorris Jobke2014-07-043-8/+35
|\ \ \ \ \ \
| * | | | | | IE8 fixesMorris Jobke2014-07-041-1/+10
| * | | | | | use icon-confirm instead of text for accepting remote share, works better wit...Jan-Christoph Borchardt2014-07-043-8/+26
* | | | | | | Merge pull request #9432 from owncloud/share-previewMorris Jobke2014-07-042-5/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Return and use isPreviewAvailable for share previewsVincent Petry2014-07-042-5/+10
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-04329-5719/+5442
* | | | | | fix version number - @karlitschek ;)Morris Jobke2014-07-041-1/+1
| |/ / / / |/| | | |
* | | | | master if 8.0 pre alpha nowFrank Karlitschek2014-07-031-2/+2
|/ / / /
* | | | Merge pull request #9410 from owncloud/shareownernamewidthJan-Christoph Borchardt2014-07-032-2/+129
|\ \ \ \
| * | | | Improved remote share owner displayVincent Petry2014-07-032-2/+129
* | | | | Merge pull request #9413 from owncloud/fix_hook_namesVincent Petry2014-07-031-2/+2
|\ \ \ \ \
| * | | | | fix hook namesBjoern Schiessle2014-07-031-2/+2
* | | | | | Merge pull request #9402 from owncloud/sharing_improved_dialogVincent Petry2014-07-031-6/+2
|\ \ \ \ \ \
| * | | | | | only show message if default expire date is enforcedBjoern Schiessle2014-07-031-6/+2
| |/ / / / /
* | | | | | Merge pull request #9408 from owncloud/redirectconsolelogfixVincent Petry2014-07-031-1/+0
|\ \ \ \ \ \
| * | | | | | Remove forgotten debug logVincent Petry2014-07-031-1/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #9420 from owncloud/trashbin-hidesummarysizeMorris Jobke2014-07-031-0/+3
|\ \ \ \ \ \
| * | | | | | Hide the size in the trashbin summary rowVincent Petry2014-07-031-0/+3