diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-07-08 16:56:13 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-07-08 16:56:13 +0200 |
| commit | 0ddbf5c9812d869db7df4473637927edaa0da9b1 (patch) | |
| tree | 11953abeeb8b14eac7b50a1219272e3fa56a3743 /settings/js/authtoken_view.js | |
| parent | 830c1f2fbfe560f42912315dc423b30578125905 (diff) | |
| download | nextcloud-server-0ddbf5c9812d869db7df4473637927edaa0da9b1.tar.gz nextcloud-server-0ddbf5c9812d869db7df4473637927edaa0da9b1.zip | |
[stable9.1] Revert invalid commits from master->stable9.1 merge (#25420)
* Revert "Merge pull request #25240 from owncloud/remove-svg"
This reverts commit 8b8d2b679a12f703141de9da71340f1f02151f3d, reversing
changes made to a35747b6fa8f7704bf7333f16a2b867b76acb187.
* Revert "Merge pull request #25253 from owncloud/users-fixotherquotadropdown"
This reverts commit a35747b6fa8f7704bf7333f16a2b867b76acb187, reversing
changes made to a573b6863cbb4eb21feb7fe5a17a9b8fc60cf059.
* Revert "Merge pull request #25314 from owncloud/files_external-backends-config"
This reverts commit a573b6863cbb4eb21feb7fe5a17a9b8fc60cf059, reversing
changes made to 8147eefaeba3822c9331283e973006ad3aeac1f5.
* Revert "Add all properties while creating a subscription (#25318)"
This reverts commit aaf4c3073af2511ab895e982cadae8dc6a143e55.
* Revert "Merge pull request #25276 from owncloud/delete-own-session-token"
This reverts commit e42ce62ce2855c95861eeae669508e5c20f99be4, reversing
changes made to aaf4c3073af2511ab895e982cadae8dc6a143e55.
* Revert "Merge pull request #25262 from owncloud/fed-sharing-error"
This reverts commit 027715f9acba4dc314a7e4c63ac41a58d4e33f22, reversing
changes made to e42ce62ce2855c95861eeae669508e5c20f99be4.
Diffstat (limited to 'settings/js/authtoken_view.js')
| -rw-r--r-- | settings/js/authtoken_view.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index 472b841c230..01fc1b2ea34 100644 --- a/settings/js/authtoken_view.js +++ b/settings/js/authtoken_view.js @@ -29,11 +29,7 @@ '<tr data-id="{{id}}">' + '<td class="has-tooltip" title="{{name}}"><span class="token-name">{{name}}</span></td>' + '<td><span class="last-activity has-tooltip" title="{{lastActivityTime}}">{{lastActivity}}</span></td>' - + '{{#if canDelete}}' + '<td><a class="icon-delete has-tooltip" title="' + t('core', 'Disconnect') + '"></a></td>' - + '{{else}}' - + '<td></td>' - + '{{/if}}' + '<tr>'; var SubView = OC.Backbone.View.extend({ |