diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-07-05 13:31:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 13:31:58 +0200 |
| commit | cbfcfb236f3e8ace6c64ab5a654b9a331a3ce1c0 (patch) | |
| tree | b86e43db95907d58f56fdb885316a01fdbfa7bac /apps/files | |
| parent | 86d9528bc93402a18a3202bb3ff17c812b94402e (diff) | |
| parent | f39dfc7ab8ced56de4935a56d87334b211df9b5e (diff) | |
| download | nextcloud-server-cbfcfb236f3e8ace6c64ab5a654b9a331a3ce1c0.tar.gz nextcloud-server-cbfcfb236f3e8ace6c64ab5a654b9a331a3ce1c0.zip | |
Merge pull request #9909 from nextcloud/feature/2192/allow_group_share_undeletion
Add API to undelete delete group shares
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/css/files.scss | 3 | ||||
| -rw-r--r-- | apps/files/img/unshare.svg | 1 | ||||
| -rw-r--r-- | apps/files/tests/Controller/ViewControllerTest.php | 15 |
3 files changed, 19 insertions, 0 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 01703df5bf1..24ecbf399e3 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -105,6 +105,9 @@ .nav-icon-trashbin { background-image: url('../img/delete.svg?v=1'); } +.nav-icon-deletedshares { + background-image: url('../img/unshare.svg?v=1'); +} #app-navigation .nav-files a.nav-icon-files { width: auto; diff --git a/apps/files/img/unshare.svg b/apps/files/img/unshare.svg new file mode 100644 index 00000000000..0c22ca64057 --- /dev/null +++ b/apps/files/img/unshare.svg @@ -0,0 +1 @@ +<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m12.5 1a2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 0.003906 0.12891l-4.9023 2.4512a2.5 2.5 0 0 0-1.6016-0.58008 2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 0.30469-0.021484l3.4395-1.7246-1.25-0.625a2.5 2.5 0 0 0 0.0058594-0.12891 2.5 2.5 0 0 0-0.0039062-0.12891l4.9023-2.4512a2.5 2.5 0 0 0 1.6016 0.58008 2.5 2.5 0 0 0 0.26562-0.013672l1.5625-0.7832a2.5 2.5 0 0 0 0.67188-1.7031 2.5 2.5 0 0 0-2.5-2.5zm0.25391 9.0156-3.7246 1.8672 0.97656 0.48828a2.5 2.5 0 0 0-0.005859 0.12891 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.2461-2.4844z"/><rect transform="rotate(-26.63)" x="-1.0586" y="11.891" width="11.687" height="2.0029" ry="0" style="paint-order:normal"/></svg> diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index a739e26bd90..eae627fd6a4 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -207,6 +207,17 @@ class ViewControllerTest extends TestCase { 'classes' => '', ], [ + 'id' => 'deletedshares', + 'appname' => 'files_sharing', + 'script' => 'list.php', + 'order' => 18, + 'name' => \OC::$server->getL10N('files_sharing')->t('Deleted shares'), + 'active' => false, + 'icon' => '', + 'type' => 'link', + 'classes' => '', + ], + [ 'id' => 'systemtagsfilter', 'appname' => 'systemtags', 'script' => 'list.php', @@ -270,6 +281,10 @@ class ViewControllerTest extends TestCase { 'content' => null, ], [ + 'id' => 'deletedshares', + 'content' => null, + ], + [ 'id' => 'systemtagsfilter', 'content' => null, ], |
