Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9492 from owncloud/repait-innodb-master | Thomas Müller | 2014-07-07 | 3 | -0/+117 |
|\ | |||||
| * | MySQL: adding repair step to convert MyIsam tables to InnoDB | Thomas Müller | 2014-07-07 | 3 | -0/+117 |
* | | Merge pull request #9488 from owncloud/fix-ctrl-click-app | Jan-Christoph Borchardt | 2014-07-07 | 1 | -1/+3 |
|\ \ | |||||
| * | | fix loading spinner on ctrl click a app entry- fixes #9063 | Morris Jobke | 2014-07-07 | 1 | -1/+3 |
* | | | Merge pull request #9479 from stephane84/fix-9147 | Morris Jobke | 2014-07-07 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Bug 9147 owncloud/core | Stephane V | 2014-07-06 | 1 | -0/+1 |
* | | | Merge pull request #9468 from owncloud/fix_logout_error_messages | Vincent Petry | 2014-07-07 | 1 | -1/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | fix phpDocBlock for OC_App::getAppInfo | Georg Ehrke | 2014-07-05 | 1 | -1/+1 |
| * | | better validation: cadd extra check if appinfo/info.xml exists | Georg Ehrke | 2014-07-05 | 1 | -0/+3 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-07 | 23 | -37/+46 |
* | | | Merge pull request #9469 from owncloud/replace_uninstall_button_with_link | Morris Jobke | 2014-07-06 | 2 | -7/+7 |
|\ \ \ | |||||
| * | | | improvements for uninstall button | Georg Ehrke | 2014-07-05 | 2 | -7/+7 |
| |/ / | |||||
* | | | Revert "fix version number - @karlitschek ;)" | Morris Jobke | 2014-07-06 | 1 | -1/+1 |
* | | | Merge pull request #9453 from owncloud/enc_fix_wrong_file_size | Frank Karlitschek | 2014-07-06 | 2 | -6/+10 |
|\ \ \ | |_|/ |/| | | |||||
| * | | improved unit tests | Bjoern Schiessle | 2014-07-04 | 1 | -4/+8 |
| * | | always take unencrypted size | Bjoern Schiessle | 2014-07-04 | 1 | -2/+2 |
* | | | Merge pull request #9466 from owncloud/design-fix-fieldset-legend | Volkan Gezer | 2014-07-06 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | fix fieldset look, fix #8158 | Jan-Christoph Borchardt | 2014-07-05 | 1 | -0/+10 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-06 | 27 | -65/+69 |
* | | | | Merge pull request #9446 from owncloud/fix-strengthify | Jan-Christoph Borchardt | 2014-07-05 | 1 | -0/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | also make strengthify transparent on setup submit - fixes #9436 | Morris Jobke | 2014-07-04 | 1 | -0/+4 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-05 | 566 | -4058/+3617 |
* | | | | Merge pull request #9419 from owncloud/fix_search_results_in_root_dir | Jörn Friedrich Dreyer | 2014-07-04 | 2 | -0/+7 |
|\ \ \ \ | |||||
| * | | | | deprecate OC_Search_Provider in favor of \OCP\Search\Provider | Jörn Friedrich Dreyer | 2014-07-03 | 1 | -0/+4 |
| * | | | | fix '' to '/' when determining parent for search result | Jörn Friedrich Dreyer | 2014-07-03 | 1 | -0/+3 |
* | | | | | Merge pull request #9455 from owncloud/breadcrumbs-backgroundsize | Jan-Christoph Borchardt | 2014-07-04 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fix size of breadcrumb separator | Morris Jobke | 2014-07-04 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #9357 from owncloud/sharing_unshare_on_delete | Björn Schießle | 2014-07-04 | 8 | -49/+65 |
|\ \ \ \ \ | |||||
| * | | | | | add owner as parameter for delShareKey | Bjoern Schiessle | 2014-07-04 | 3 | -11/+18 |
| * | | | | | make sure that the umount hook always contains the path relative to data/user... | Bjoern Schiessle | 2014-07-04 | 2 | -4/+14 |
| * | | | | | if a folder gets deleted we unshare all shared files/folders below | Bjoern Schiessle | 2014-07-04 | 4 | -34/+33 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #9445 from owncloud/filelist-auth-error | icewind1991 | 2014-07-04 | 3 | -8/+41 |
|\ \ \ \ \ | |||||
| * | | | | | Add machine readable error messages to OC\JSON | Robin Appelman | 2014-07-04 | 3 | -8/+41 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #9438 from owncloud/design-fix-appsloadingfeedback | Jan-Christoph Borchardt | 2014-07-04 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | show loading feedback also when clicking 'Apps' entry in app list | Jan-Christoph Borchardt | 2014-07-04 | 1 | -0/+1 |
* | | | | | | Merge pull request #9450 from owncloud/update-snap.js | Thomas Müller | 2014-07-04 | 1 | -566/+783 |
|\ \ \ \ \ \ | |||||
| * | | | | | | update snap.js to v2.0.0-rc1 | Thomas Müller | 2014-07-04 | 1 | -566/+783 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #9434 from owncloud/files-reloadpromiseissue | Morris Jobke | 2014-07-04 | 3 | -15/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix reload call for all subclasses | Vincent Petry | 2014-07-04 | 3 | -15/+7 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #8308 from owncloud/case_insensitive_search_oracle | Jörn Friedrich Dreyer | 2014-07-04 | 2 | -3/+27 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | make search case insensitive on postgres and oracle | Jörn Friedrich Dreyer | 2014-07-03 | 2 | -3/+27 |
* | | | | | | Merge pull request #9269 from owncloud/fix_versions_preview | Thomas Müller | 2014-07-04 | 4 | -3/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | introduce and use getCurrentConnection() | Jörn Friedrich Dreyer | 2014-07-01 | 3 | -1/+25 |
| * | | | | | | reset collection to 'root' after adding a route to the api | Jörn Friedrich Dreyer | 2014-07-01 | 1 | -0/+1 |
| * | | | | | | change order of registering api and capabilities to fix file version previews | Jörn Friedrich Dreyer | 2014-07-01 | 1 | -3/+3 |
* | | | | | | | Merge pull request #9441 from owncloud/install-sql-host-default | Thomas Müller | 2014-07-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | set localhost as default database host for installation | Robin Appelman | 2014-07-04 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #9444 from owncloud/design-fix-pointer | Morris Jobke | 2014-07-04 | 2 | -3/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix cursor for other elements in top right corner | Morris Jobke | 2014-07-04 | 1 | -0/+3 |
| * | | | | | | | fix 'remember' label being slightly off in log in | Jan-Christoph Borchardt | 2014-07-04 | 1 | -0/+1 |