Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-08 | 208 | -1589/+2793 |
| | |||||
* | Merge pull request #9495 from owncloud/remove-moved-mount | Vincent Petry | 2014-07-07 | 3 | -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 Appelman | 2014-07-07 | 3 | -8/+21 |
| | | | | | | | | removed | ||||
* | | Merge pull request #9505 from stephane84/fix-9497 | Vincent Petry | 2014-07-07 | 1 | -0/+1 |
|\ \ | | | | | | | Refocus input field after user creation | ||||
| * | | Fixes #9497 | Stephane V | 2014-07-07 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #9499 from owncloud/shares-hidetokenrecipient | Morris Jobke | 2014-07-07 | 2 | -1/+45 |
|\ \ \ | | | | | | | | | Do not show recipient for link shares in file list | ||||
| * | | | Do not show recipient for link shares in file list | Vincent Petry | 2014-07-07 | 2 | -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_ocsids | Morris Jobke | 2014-07-07 | 15 | -7/+17 |
|\ \ \ \ | | | | | | | | | | | Add ocsids for shipped apps in core repo | ||||
| * | | | | add ocsids to info.xml | Georg Ehrke | 2014-07-07 | 15 | -7/+17 |
| |/ / / | |||||
* | | | | Merge pull request #9415 from owncloud/external-sharedialog | Morris Jobke | 2014-07-07 | 4 | -26/+69 |
|\ \ \ \ | | | | | | | | | | | Improved external share dialog | ||||
| * | | | | Improved external share dialog | Vincent Petry | 2014-07-07 | 1 | -4/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Changed title, label and buttons. Removed icon. | ||||
| * | | | | Fixed dialogs styling, reversed buttons | Vincent Petry | 2014-07-07 | 3 | -22/+38 |
| |/ / / | | | | | | | | | | | | | Default dialog button is now on the right, other one on the left. | ||||
* | | | | Merge pull request #9494 from owncloud/issue/9490 | Morris Jobke | 2014-07-07 | 3 | -8/+16 |
|\ \ \ \ | | | | | | | | | | | [issues/9490] \OC::$WEBROOT is invalid when called from cron.php | ||||
| * | | | | Add comment to overwrite* configs about CLI/cron problems | Joas Schilling | 2014-07-07 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Only calculate the WEBROOT from scriptName if it contains $SUBURI | Joas Schilling | 2014-07-07 | 1 | -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 tests | Joas Schilling | 2014-07-07 | 1 | -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-listsort | Morris Jobke | 2014-07-07 | 1 | -3/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fixed shared list sorting | ||||
| * | | | | Fixed shared list sorting | Vincent Petry | 2014-07-07 | 1 | -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-master | Thomas Müller | 2014-07-07 | 3 | -0/+117 |
|\ \ \ \ | |_|_|/ |/| | | | MySQL: adding repair step to convert MyIsam tables to InnoDB | ||||
| * | | | 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 | ||||
| * | | | | 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 |
|\ \ \ \ | |_|/ / |/| | | | Log table design glitch in date field | ||||
| * | | | Bug 9147 owncloud/core | Stephane V | 2014-07-06 | 1 | -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_messages | Vincent Petry | 2014-07-07 | 1 | -1/+4 |
|\ \ \ | |_|/ |/| | | better validation: cadd extra check if appinfo/info.xml exists | ||||
| * | | 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 | ||||
| * | | | 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 |
| | | | | | | | | | | | | This reverts commit f1b3e03f7fdb6272bbc4320d75b8bb0df4a05557. | ||||
* | | | Merge pull request #9453 from owncloud/enc_fix_wrong_file_size | Frank Karlitschek | 2014-07-06 | 2 | -6/+10 |
|\ \ \ | |_|/ |/| | | [encryption] always take unencrypted size | ||||
| * | | 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 | ||||
| * | | | 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 | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | Fix search results in root dir & deprecate OC_Search_Provider | ||||
| * | | | | 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 | ||||
| * | | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | [sharing] unshare childrens on delete | ||||
| * | | | | | 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 ↵ | Bjoern Schiessle | 2014-07-04 | 2 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | data/user/files | ||||
| * | | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Reload the page when the files app encounters an authentication error |