summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-08208-1589/+2793
|
* Merge pull request #9495 from owncloud/remove-moved-mountVincent Petry2014-07-073-8/+21
|\ | | | | When changing the mountpoint of an external storage, ensure the old one ...
| * When changing the mountpoint of an external storage, ensure the old one is ↵Robin Appelman2014-07-073-8/+21
| | | | | | | | removed
* | Merge pull request #9505 from stephane84/fix-9497Vincent Petry2014-07-071-0/+1
|\ \ | | | | | | Refocus input field after user creation
| * | Fixes #9497Stephane V2014-07-071-0/+1
| | |
* | | Merge pull request #9499 from owncloud/shares-hidetokenrecipientMorris Jobke2014-07-072-1/+45
|\ \ \ | | | | | | | | Do not show recipient for link shares in file list
| * | | Do not show recipient for link shares in file listVincent Petry2014-07-072-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the "Shared with link" section, the share_with field can contain a value when a password was set. This fix prevents this value to be shown as it is not intended for the end user.
* | | | Merge pull request #9502 from owncloud/add_ocsidsMorris Jobke2014-07-0715-7/+17
|\ \ \ \ | | | | | | | | | | Add ocsids for shipped apps in core repo
| * | | | add ocsids to info.xmlGeorg Ehrke2014-07-0715-7/+17
| |/ / /
* | | | Merge pull request #9415 from owncloud/external-sharedialogMorris Jobke2014-07-074-26/+69
|\ \ \ \ | | | | | | | | | | Improved external share dialog
| * | | | Improved external share dialogVincent Petry2014-07-071-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Changed title, label and buttons. Removed icon.
| * | | | Fixed dialogs styling, reversed buttonsVincent Petry2014-07-073-22/+38
| |/ / / | | | | | | | | | | | | Default dialog button is now on the right, other one on the left.
* | | | Merge pull request #9494 from owncloud/issue/9490Morris Jobke2014-07-073-8/+16
|\ \ \ \ | | | | | | | | | | [issues/9490] \OC::$WEBROOT is invalid when called from cron.php
| * | | | Add comment to overwrite* configs about CLI/cron problemsJoas Schilling2014-07-071-4/+4
| | | | |
| * | | | Only calculate the WEBROOT from scriptName if it contains $SUBURIJoas Schilling2014-07-071-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If not we are most likely in CLI mode. However to be able to still generate valid URLs, we need to use the overwrite webroot instead. Fix #9490
| * | | | Only overwrite serverHost when in unit testsJoas Schilling2014-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The intention of the original commit 12f7cb87679453fa96c796df857b7e7193d4ee09 was to fix tests. But cron should always return a valid host not localhost.
* | | | | Merge pull request #9501 from owncloud/shares-listsortMorris Jobke2014-07-071-3/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Fixed shared list sorting
| * | | | Fixed shared list sortingVincent Petry2014-07-071-3/+2
|/ / / / | | | | | | | | | | | | | | | | Use Array.sort instead of underscore's sortBy() as they don't use the same method/function signature.
* | | | Merge pull request #9492 from owncloud/repait-innodb-masterThomas Müller2014-07-073-0/+117
|\ \ \ \ | |_|_|/ |/| | | MySQL: adding repair step to convert MyIsam tables to InnoDB
| * | | 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 #9063
| * | | | 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
|\ \ \ \ | |_|/ / |/| | | Log table design glitch in date field
| * | | Bug 9147 owncloud/coreStephane V2014-07-061-0/+1
| | |/ | |/| | | | | | | Added class="date" in the latest column of the log table to get everything on one line (in the ajax request).
* | | Merge pull request #9468 from owncloud/fix_logout_error_messagesVincent Petry2014-07-071-1/+4
|\ \ \ | |_|/ |/| | better validation: cadd extra check if appinfo/info.xml exists
| * | 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 button
| * | | improvements for uninstall buttonGeorg Ehrke2014-07-052-7/+7
| |/ /
* | | Revert "fix version number - @karlitschek ;)"Morris Jobke2014-07-061-1/+1
| | | | | | | | | | | | This reverts commit f1b3e03f7fdb6272bbc4320d75b8bb0df4a05557.
* | | Merge pull request #9453 from owncloud/enc_fix_wrong_file_sizeFrank Karlitschek2014-07-062-6/+10
|\ \ \ | |_|/ |/| | [encryption] always take unencrypted size
| * | 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 #8158
| * | | 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 #9436
| * | | 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
|\ \ \ \ | | | | | | | | | | Fix search results in root dir & deprecate OC_Search_Provider
| * | | | 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 separator
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | [sharing] unshare childrens on delete
| * | | | | add owner as parameter for delShareKeyBjoern Schiessle2014-07-043-11/+18
| | | | | |
| * | | | | make sure that the umount hook always contains the path relative to ↵Bjoern Schiessle2014-07-042-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | data/user/files
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Reload the page when the files app encounters an authentication error