diff options
25 files changed, 81 insertions, 22 deletions
diff --git a/README.md b/README.md index 36e7bb59892..15812c6c22d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Depencencies: [](https://www.versioneye.com/user/projects/54d1f76f3ca0840b190000c0) ### Installation instructions -https://doc.owncloud.org/server/8.0/developer_manual/app/index.html +https://doc.owncloud.org/server/8.1/developer_manual/app/index.html ### Contribution Guidelines https://owncloud.org/contribute/ @@ -35,4 +35,4 @@ https://www.transifex.com/projects/p/owncloud/ [](https://www.transifex.com/projects/p/owncloud/) For more detailed information about translations: -http://doc.owncloud.org/server/8.0/developer_manual/core/translation.html +http://doc.owncloud.org/server/8.1/developer_manual/core/translation.html diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index d6f7e4b1320..28c64cbb1b4 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/apps/files_sharing/appinfo/info.xml @@ -19,5 +19,4 @@ Turning the feature off removes shared files and folders on the server for all s <files>public.php</files> <webdav>publicwebdav.php</webdav> </public> - <ocsid>166050</ocsid> </info> diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version index ee6cdce3c29..b6160487433 100644 --- a/apps/files_sharing/appinfo/version +++ b/apps/files_sharing/appinfo/version @@ -1 +1 @@ -0.6.1 +0.6.2 diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index a649ecfe885..a5cf57d0ac5 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -72,7 +72,7 @@ thead { } /* keep long file names in one line to not overflow download button on mobile */ -.directDownload #download { +.directDownload #downloadFile { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 11c3170c2f0..0c7d5f3c576 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -151,7 +151,7 @@ var permissions = $tr.data('permissions'); var hasLink = !!(shareStatus && shareStatus.link); OC.Share.markFileAsShared($tr, true, hasLink); - if ((permissions & OC.PERMISSION_SHARE) === 0) { + if ((permissions & OC.PERMISSION_SHARE) === 0 && $tr.attr('data-share-owner')) { // if no share action exists because the admin disabled sharing for this user // we create a share notification action to inform the user about files // shared with him otherwise we just update the existing share action. diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index dd0b2eebe21..ffe0472b2b1 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -100,7 +100,7 @@ $thumbSize = 1024; <div id="imgframe"></div> <?php endif; ?> <div class="directDownload"> - <a href="<?php p($_['downloadURL']); ?>" id="download" class="button"> + <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> <img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/> <?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>) </a> diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js index 1b1e363b792..1bbf4ffca09 100644 --- a/apps/files_sharing/tests/js/shareSpec.js +++ b/apps/files_sharing/tests/js/shareSpec.js @@ -206,6 +206,23 @@ describe('OCA.Sharing.Util tests', function() { expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg'); expect($action.find('img').length).toEqual(1); }); + it('do not show static share text when share exists but neither permission nor owner is available', function() { + var $action, $tr; + fileList.setFiles([{ + id: 1, + type: 'dir', + name: 'One', + path: '/subdir', + mimetype: 'text/plain', + size: 12, + permissions: OC.PERMISSION_CREATE, + etag: 'abc' + }]); + $tr = fileList.$el.find('tbody tr:first'); + expect($tr.find('.action-share').length).toEqual(0); + $action = $tr.find('.action-share-notification'); + expect($action.length).toEqual(0); + }); }); describe('Share action', function() { var showDropDownStub; diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index 8735b61e2db..f8bc5e7d3d2 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/apps/files_trashbin/appinfo/info.xml @@ -18,5 +18,4 @@ To prevent a user from running out of disk space, the ownCloud Deleted files app <documentation> <user>user-trashbin</user> </documentation> - <ocsid>166052</ocsid> </info> diff --git a/apps/files_trashbin/appinfo/version b/apps/files_trashbin/appinfo/version index b6160487433..844f6a91acb 100644 --- a/apps/files_trashbin/appinfo/version +++ b/apps/files_trashbin/appinfo/version @@ -1 +1 @@ -0.6.2 +0.6.3 diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml index 9aed8069b9b..8eab29b0ec6 100644 --- a/apps/files_versions/appinfo/info.xml +++ b/apps/files_versions/appinfo/info.xml @@ -18,5 +18,4 @@ In addition to the expiry of versions, ownCloud’s versions app makes certain n <user>user-versions</user> </documentation> <default_enable/> - <ocsid>166053</ocsid> </info> diff --git a/apps/files_versions/appinfo/version b/apps/files_versions/appinfo/version index 90a27f9cea6..af0b7ddbffd 100644 --- a/apps/files_versions/appinfo/version +++ b/apps/files_versions/appinfo/version @@ -1 +1 @@ -1.0.5 +1.0.6 diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml index 88462902421..89c1a4ea3ff 100644 --- a/apps/user_ldap/appinfo/info.xml +++ b/apps/user_ldap/appinfo/info.xml @@ -17,7 +17,6 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce <documentation> <admin>admin-ldap</admin> </documentation> - <ocsid>166061</ocsid> <dependencies> <lib>ldap</lib> </dependencies> diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version index a918a2aa18d..ee6cdce3c29 100644 --- a/apps/user_ldap/appinfo/version +++ b/apps/user_ldap/appinfo/version @@ -1 +1 @@ -0.6.0 +0.6.1 diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml index 755a6d5bfb4..b0827fb51f8 100644 --- a/apps/user_webdavauth/appinfo/info.xml +++ b/apps/user_webdavauth/appinfo/info.xml @@ -12,5 +12,4 @@ <types> <authentication/> </types> - <ocsid>166062</ocsid> </info> diff --git a/apps/user_webdavauth/appinfo/version b/apps/user_webdavauth/appinfo/version index 238afc2b279..a3fdef3af89 100644 --- a/apps/user_webdavauth/appinfo/version +++ b/apps/user_webdavauth/appinfo/version @@ -1 +1 @@ -1.1.0.1 +1.1.0.2 diff --git a/bower.json b/bower.json index e039b5f223b..bd7b960aad2 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ownCloud", - "version": "8.0 pre alpha", + "version": "8.1", "homepage": "https://www.owncloud.org", "license": "AGPL", "private": true, diff --git a/core/command/upgrade.php b/core/command/upgrade.php index ac0d72a8940..32691b8aa5d 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -169,6 +169,15 @@ class Upgrade extends Command { $output->writeln("<error>$message</error>"); }); + if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) { + $updater->listen('\OC\Updater', 'repairInfo', function ($message) use($output) { + $output->writeln('<info>Repair info: ' . $message . '</info>'); + }); + $updater->listen('\OC\Updater', 'repairStep', function ($message) use($output) { + $output->writeln('<info>Repair step: ' . $message . '</info>'); + }); + } + $success = $updater->upgrade(); $this->postUpgradeCheck($input, $output); diff --git a/lib/private/app.php b/lib/private/app.php index d5e07ffdbcc..e45d9ac07ba 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -1174,6 +1174,8 @@ class OC_App { $appData = self::getAppInfo($appId); if (array_key_exists('ocsid', $appData)) { OC_Appconfig::setValue($appId, 'ocsid', $appData['ocsid']); + } elseif(OC_Appconfig::getValue($appId, 'ocsid', null) !== null) { + OC_Appconfig::deleteKey($appId, 'ocsid'); } foreach ($appData['remote'] as $name => $path) { OCP\CONFIG::setAppValue('core', 'remote_' . $name, $appId . '/' . $path); diff --git a/lib/private/server.php b/lib/private/server.php index 6a65895cd69..c08940bb756 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -150,6 +150,8 @@ class Server extends SimpleContainer implements IServerContainer { }); $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { \OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID())); + //Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks + \OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID())); }); return $groupManager; }); diff --git a/lib/private/share/hooks.php b/lib/private/share/hooks.php index 6eff4cc246f..b0d4f0677f5 100644 --- a/lib/private/share/hooks.php +++ b/lib/private/share/hooks.php @@ -63,12 +63,12 @@ class Hooks extends \OC\Share\Constants { $itemTarget = $sourceExists['item_target']; } else { $itemTarget = Helper::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER, $arguments['uid'], - $item['owner'], null, $item['parent']); + $item['uid_owner'], null, $item['parent']); // do we also need a file target if ($item['item_type'] === 'file' || $item['item_type'] === 'folder') { $fileTarget = Helper::generateTarget('file', $item['file_target'], self::SHARE_TYPE_USER, $arguments['uid'], - $item['owner'], null, $item['parent']); + $item['uid_owner'], null, $item['parent']); } else { $fileTarget = null; } diff --git a/lib/private/updater.php b/lib/private/updater.php index fa9c1a5176a..cba87434165 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -239,6 +239,12 @@ class Updater extends BasicEmitter { $repair->listen('\OC\Repair', 'error', function ($description) { $this->emit('\OC\Updater', 'repairError', array($description)); }); + $repair->listen('\OC\Repair', 'info', function ($description) { + $this->emit('\OC\Updater', 'repairInfo', array($description)); + }); + $repair->listen('\OC\Repair', 'step', function ($description) { + $this->emit('\OC\Updater', 'repairStep', array($description)); + }); } /** diff --git a/lib/repair/collation.php b/lib/repair/collation.php index e28ee3ab114..7eb14f0ded2 100644 --- a/lib/repair/collation.php +++ b/lib/repair/collation.php @@ -60,6 +60,7 @@ class Collation extends BasicEmitter implements \OC\RepairStep { $tables = $this->getAllNonUTF8BinTables($this->connection); foreach ($tables as $table) { + $this->emit('\OC\Repair', 'info', array("Change collation for $table ...")); $query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;'); $query->execute(); } diff --git a/settings/js/apps.js b/settings/js/apps.js index 7849e1b7573..d1de3d727c0 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -86,11 +86,12 @@ OC.Settings.Apps = OC.Settings.Apps || { }), { type:'GET', success: function (apps) { - var appList = _.map(_.indexBy(apps.apps, 'id'), function(app) { + var appListWithIndex = _.indexBy(apps.apps, 'id'); + OC.Settings.Apps.State.apps = appListWithIndex; + var appList = _.map(appListWithIndex, function(app) { // default values for missing fields return _.extend({level: 0}, app); }); - OC.Settings.Apps.State.apps = appList; var source = $("#app-template").html(); var template = Handlebars.compile(source); diff --git a/settings/tests/js/appsSpec.js b/settings/tests/js/appsSpec.js index 60e3692def4..907d441ff4d 100644 --- a/settings/tests/js/appsSpec.js +++ b/settings/tests/js/appsSpec.js @@ -159,6 +159,32 @@ describe('OC.Settings.Apps tests', function() { var results = getResultsFromDom(); expect(results.length).toEqual(5); expect(results).toEqual(['alpha', 'delta', 'zork', 'foo', 'nolevel']); + expect(OC.Settings.Apps.State.apps).toEqual({ + 'foo': { + id: 'foo', + name: 'Foo app', + level: 0 + }, + 'alpha': { + id: 'alpha', + name: 'Alpha app', + level: 300 + }, + 'nolevel': { + id: 'nolevel', + name: 'No level' + }, + 'zork': { + id: 'zork', + name: 'Some famous adventure game', + level: 200 + }, + 'delta': { + id: 'delta', + name: 'Mathematical symbol', + level: 200 + } + }); }); }); diff --git a/version.php b/version.php index 1564f451bd3..0abfe313c0d 100644 --- a/version.php +++ b/version.php @@ -22,10 +22,10 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version=array(8, 1, 0, 7); +$OC_Version=array(8, 1, 0, 8); // The human readable string -$OC_VersionString='8.1 RC1'; +$OC_VersionString='8.1.0'; // The ownCloud channel $OC_Channel='git'; |