summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9492 from owncloud/repait-innodb-masterThomas Müller2014-07-073-0/+117
|\
| * MySQL: adding repair step to convert MyIsam tables to InnoDBThomas Müller2014-07-073-0/+117
* | Merge pull request #9488 from owncloud/fix-ctrl-click-appJan-Christoph Borchardt2014-07-071-1/+3
|\ \
| * | fix loading spinner on ctrl click a app entry- fixes #9063Morris Jobke2014-07-071-1/+3
* | | Merge pull request #9479 from stephane84/fix-9147Morris Jobke2014-07-071-0/+1
|\ \ \ | |_|/ |/| |
| * | Bug 9147 owncloud/coreStephane V2014-07-061-0/+1
* | | Merge pull request #9468 from owncloud/fix_logout_error_messagesVincent Petry2014-07-071-1/+4
|\ \ \ | |_|/ |/| |
| * | fix phpDocBlock for OC_App::getAppInfoGeorg Ehrke2014-07-051-1/+1
| * | better validation: cadd extra check if appinfo/info.xml existsGeorg Ehrke2014-07-051-0/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0723-37/+46
* | | Merge pull request #9469 from owncloud/replace_uninstall_button_with_linkMorris Jobke2014-07-062-7/+7
|\ \ \
| * | | improvements for uninstall buttonGeorg Ehrke2014-07-052-7/+7
| |/ /
* | | Revert "fix version number - @karlitschek ;)"Morris Jobke2014-07-061-1/+1
* | | Merge pull request #9453 from owncloud/enc_fix_wrong_file_sizeFrank Karlitschek2014-07-062-6/+10
|\ \ \ | |_|/ |/| |
| * | improved unit testsBjoern Schiessle2014-07-041-4/+8
| * | always take unencrypted sizeBjoern Schiessle2014-07-041-2/+2
* | | Merge pull request #9466 from owncloud/design-fix-fieldset-legendVolkan Gezer2014-07-061-0/+10
|\ \ \
| * | | fix fieldset look, fix #8158Jan-Christoph Borchardt2014-07-051-0/+10
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0627-65/+69
* | | | Merge pull request #9446 from owncloud/fix-strengthifyJan-Christoph Borchardt2014-07-051-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | also make strengthify transparent on setup submit - fixes #9436Morris Jobke2014-07-041-0/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-05566-4058/+3617
* | | | 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