diff options
| author | ringmaster <epithet@gmail.com> | 2014-05-08 09:42:55 -0400 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-02 12:53:58 +0200 |
| commit | c38548a1aa47fb53c61da8f54427ac923c7fdc64 (patch) | |
| tree | 2d2a02772f242c74a14da82ed130394109920d49 /settings | |
| parent | ad1c34db45f74a61e6a933ca54ebf24aac031309 (diff) | |
| download | nextcloud-server-c38548a1aa47fb53c61da8f54427ac923c7fdc64.tar.gz nextcloud-server-c38548a1aa47fb53c61da8f54427ac923c7fdc64.zip | |
Rebase cleanup.
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/users/users.js | 1 | ||||
| -rw-r--r-- | settings/templates/users/part.createuser.php | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js index cd81a4b7718..48586b485d5 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -455,7 +455,6 @@ $(document).ready(function () { // Implements User Search filter = new UserManagementFilter($('#usersearchform input'), UserList, GroupList); - filter.addResetButton($('.userFilterReset').first()); UserList.doSort(); UserList.availableGroups = $userList.data('groups'); diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php index adddc418a90..4d573168fc1 100644 --- a/settings/templates/users/part.createuser.php +++ b/settings/templates/users/part.createuser.php @@ -30,6 +30,5 @@ <?php endif; ?> <form autocomplete="off" id="usersearchform"> <input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" /> - <span class="svg icon-delete userFilterReset"></span> </form> </div>
\ No newline at end of file |