Skip to content

Commit

Permalink
Merge pull request #39808 from nextcloud/feat/f2v/files
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Aug 17, 2023
2 parents a820e3d + 74c2f61 commit a8fc62f
Show file tree
Hide file tree
Showing 129 changed files with 1,953 additions and 2,588 deletions.
120 changes: 0 additions & 120 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1591,126 +1591,6 @@ trigger:
- pull_request
- push

---
kind: pipeline
name: acceptance-app-files

steps:
- name: submodules
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
commands:
- git submodule update --init
- name: acceptance-app-files
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature

services:
- name: selenium
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
environment:
# Reduce default log level for Selenium server (INFO) as it is too
# verbose.
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: acceptance-app-files-sharing

steps:
- name: submodules
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
commands:
- git submodule update --init
- name: acceptance-app-files-sharing
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing.feature

services:
- name: selenium
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
environment:
# Reduce default log level for Selenium server (INFO) as it is too
# verbose.
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: acceptance-app-files-sharing-link

steps:
- name: submodules
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
commands:
- git submodule update --init
- name: acceptance-app-files-sharing-link
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing-link --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing-link.feature

services:
- name: selenium
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
environment:
# Reduce default log level for Selenium server (INFO) as it is too
# verbose.
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: acceptance-app-files-tags

steps:
- name: submodules
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
commands:
- git submodule update --init
- name: acceptance-app-files-tags
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-tags --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-tags.feature

services:
- name: selenium
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
environment:
# Reduce default log level for Selenium server (INFO) as it is too
# verbose.
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: acceptance-header
Expand Down
3 changes: 3 additions & 0 deletions __tests__/jest-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ import '@testing-library/jest-dom'

// Mock `window.location` with Jest spies and extend expect
import 'jest-location-mock'

// Mock `window.fetch` with Jest
import 'jest-fetch-mock'
6 changes: 2 additions & 4 deletions apps/files/appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,14 @@
'verb' => 'GET'
],
[
'name' => 'view#index',
'name' => 'view#indexView',
'url' => '/{view}',
'verb' => 'GET',
'postfix' => 'view',
],
[
'name' => 'view#index',
'name' => 'view#indexViewFileid',
'url' => '/{view}/{fileid}',
'verb' => 'GET',
'postfix' => 'fileid',
],
],
'ocs' => [
Expand Down
2 changes: 1 addition & 1 deletion apps/files/css/files.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files/css/files.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 0 additions & 38 deletions apps/files/css/files.scss
Original file line number Diff line number Diff line change
Expand Up @@ -140,44 +140,6 @@
background-color: var(--color-primary-element-light) !important;
}

/* icons for sidebar */
.nav-icon-files {
@include icon-color('folder', 'files', variables.$color-black);
}
.nav-icon-recent {
@include icon-color('recent', 'files', variables.$color-black);
}
.nav-icon-favorites {
@include icon-color('starred', 'actions', variables.$color-black, 2, true);
}
.nav-icon-sharinginOld,
.nav-icon-sharingoutOld,
.nav-icon-pendingsharesOld,
.nav-icon-shareoverviewOld {
@include icon-color('share', 'files', variables.$color-black);
}
.nav-icon-sharinglinksOld {
@include icon-color('public', 'files', variables.$color-black);
}
.nav-icon-extstoragemounts {
@include icon-color('external', 'files', variables.$color-black);
}
.nav-icon-trashbin {
@include icon-color('delete', 'files', variables.$color-black);
}
.nav-icon-trashbin-starred {
@include icon-color('delete', 'files', #ff0000);
}
.nav-icon-deletedsharesOld {
@include icon-color('unshare', 'files', variables.$color-black);
}
.nav-icon-favorites-starred {
@include icon-color('starred', 'actions', variables.$color-yellow, 2, true);
}

#app-navigation .nav-files a.nav-icon-files {
width: auto;
}
/* button needs overrides due to navigation styles */
#app-navigation .nav-files a.new {
width: 40px;
Expand Down
2 changes: 1 addition & 1 deletion apps/files/css/merged.css

Large diffs are not rendered by default.

Loading

0 comments on commit a8fc62f

Please sign in to comment.