Transform route titles into real h1's, for #1651

.htaccess

@@ -10,4 +10,7 @@
   </ifModule>
 </filesMatch>
 # END Caching
-
+Header      unset X-Frame-Options
+Header always set X-Frame-Options "DENY"
+Header      unset Content-Security-Policy
+Header always set Content-Security-Policy "frame-ancestors 'none';"

CHANGELOG.md

@@ -4,6 +4,53 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [0.2.5]
+### Added
+- IE11 support https://github.com/owncloud/phoenix/pull/2082
+- Draw.io app integration https://github.com/owncloud/phoenix/pull/2083
+- New file menu entries for different file types https://github.com/owncloud/phoenix/pull/2111
+- Drone starlark https://github.com/owncloud/phoenix/pull/2112
+- Rename and delete will be disallowed in case the parent folder has no permissions fot these two operations https://github.com/owncloud/phoenix/pull/2129
+- Progress bar for upload https://github.com/owncloud/phoenix/pull/2176
+- Handle errors while deleting and renaming files https://github.com/owncloud/phoenix/pull/2177
+- Logout option on access denied page https://github.com/owncloud/phoenix/pull/2178
+- Download feedback spinner https://github.com/owncloud/phoenix/pull/2179
+- Remove rootFolder from breadcrumbs https://github.com/owncloud/phoenix/pull/2196
+- Send header X-Requested-With: XMLHttpRequest in all requests https://github.com/owncloud/phoenix/pull/2197
+- X-Frame-Options and Content-Security-Policy https://github.com/owncloud/phoenix/pull/2311
+
+### Fixed
+- IE11 support for media viewer app https://github.com/owncloud/phoenix/pull/2086
+- Files drop when link password is set https://github.com/owncloud/phoenix/pull/2096
+- Detection of public pages despite existing auth https://github.com/owncloud/phoenix/pull/2097
+- Public link access in incognito mode https://github.com/owncloud/phoenix/pull/2110
+- Password handling in public links https://github.com/owncloud/phoenix/pull/2117
+- More close options to file actions menu https://github.com/owncloud/phoenix/pull/2161
+- Reset search value on clear action https://github.com/owncloud/phoenix/pull/2198
+- Prevent duplicate token refresh calls https://github.com/owncloud/phoenix/pull/2205
+- Use PQueue to run only one create folder promise in folder upload https://github.com/owncloud/phoenix/pull/2210
+- Upon token refresh do not perform full login on sdk level https://github.com/owncloud/phoenix/pull/2211
+- Exit link on access denied page https://github.com/owncloud/phoenix/pull/2220
+- Structure of folders in folder upload https://github.com/owncloud/phoenix/pull/2224
+- Remove file from progress after download on IE11 https://github.com/owncloud/phoenix/pull/2310
+- Properly reset capabilities on logout https://github.com/owncloud/phoenix/pull/2116
+
+### Changed
+- For mounted folders use the full url as private link https://github.com/owncloud/phoenix/pull/2170
+- Store route in vuex before login in case user is unauthorized https://github.com/owncloud/phoenix/pull/2170
+- Use currentFolder path in breadcrumbs https://github.com/owncloud/phoenix/pull/2196
+- Switch to show instead of if in upload progress bar https://github.com/owncloud/phoenix/pull/2206
+- Key of file action buttons to ariaLabel https://github.com/owncloud/phoenix/pull/2219
+- Trigger add to progress before the folders creation https://github.com/owncloud/phoenix/pull/2221
+- Handle remove from progress in its own mutation https://github.com/owncloud/phoenix/pull/2225
+- Use oidc-client 1.9.1 https://github.com/owncloud/phoenix/pull/2261
+
+### Security
+- Added sanitization to markdown editor app https://github.com/owncloud/phoenix/pull/2233
+
+### Removed
+- Drag and drop in ie11 because of compatibility issues https://github.com/owncloud/phoenix/pull/2128
+
 ## [0.2.4]
 ### Added
 - Private link for the current folder to the app bar https://github.com/owncloud/phoenix/pull/2009
@@ -19,10 +66,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [0.2.3]
 ### Added
-- Acceptance tests for public links https://github.com/owncloud/phoenix/pull/1886
 - Set X-Requested-With header - required ownCloud 10.3 https://github.com/owncloud/phoenix/pull/1984
 - Use 2 spaces instead of tab for feature files https://github.com/owncloud/phoenix/pull/2004
-- Test sharing a file via public link https://github.com/owncloud/phoenix/pull/1981
 - Handle OAuth/OpenIdConnect error in callback request query string https://github.com/owncloud/phoenix/pull/2011
 - Enable loading apps from external sites https://github.com/owncloud/phoenix/pull/1986
 - Add default client side sort https://github.com/owncloud/phoenix/pull/1972
@@ -36,7 +81,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Show error message when user tries to upload a folder in IE11 https://github.com/owncloud/phoenix/pull/1956
 - Error message if the folder or file name is empty in create dialog and added default value https://github.com/owncloud/phoenix/pull/1938
 - Bookmarks to menu https://github.com/owncloud/phoenix/pull/1949
-- Collaborators test for changing share permissions https://github.com/owncloud/phoenix/pull/1838
 
 ### Fixed
 - Redirect to access denied page if the user doesn't have access to Phoenix instance https://github.com/owncloud/phoenix/pull/1939

Dockerfile

@@ -1,15 +1,3 @@
-# build stage
-FROM node:10.15.3-alpine as build-stage
-RUN apk update && apk upgrade && \
-    apk add --no-cache bash git
+FROM webhippie/nginx:latest
 
-WORKDIR /app
-COPY . .
-RUN yarn install
-RUN yarn dist
-
-# production stage
-FROM nginx:1.13.12-alpine as production-stage
-COPY --from=build-stage /app/dist /usr/share/nginx/html
-EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+COPY dist /srv/www

Makefile.release

@@ -69,4 +69,7 @@ endif
 package:
 	rm -rf $(CURDIR)/release
 	mkdir $(CURDIR)/release
-	cd $(dist_dir) && tar -czf $(cur_dir)/release/$(app_name).tar.gz *
+	rm -rf $(CURDIR)/phoenix
+	mkdir $(CURDIR)/phoenix
+	cp -R $(dist_dir) $(CURDIR)/phoenix
+	tar -czf $(CURDIR)/release/$(app_name).tar.gz -C $(CURDIR) phoenix

README.md

@@ -76,24 +76,37 @@ In the local Phoenix checkout, copy the `config.json.sample` file to `config.jso
 
 ## Running acceptance tests
 
-- clone and install testing app into owncloud from http://github.com/owncloud/testing
-- set `skeletondirectory` of ownCloud to `<oc-root>/apps/testing/data/webUISkeleton` e.g. `occ config:system:set skeletondirectory --value=/var/www/owncloud/apps/testing/data/webUISkeleton`
+- clone and install testing app into ownCloud from http://github.com/owncloud/testing
 - build, configure and run phoenix
-- setup selenium & browser
-    - install the Chrome browser and let yarn start & run selenium OR
-    - use docker to start the browser and selenium e.g.: `docker run -d -p 4445:4444 -p 5900:5900 -v /dev/shm:/dev/shm --name selenium selenium/standalone-chrome-debug`
+- setup selenium and browser in either of the following ways:
+    1. `yarn run selenium`: This runs selenium-docker similar to command below.
+
+        Needs setting `SELENIUM_HOST` as `localhost` and `SERVER_HOST` in the format `http://<ip_addr>:8300`. To find ip of the docker host, use
+
+        ```sh
+          docker inspect -f "{{ .NetworkSettings.Gateway }}" selenium
+        ```
+
+    2. use docker to start the browser and selenium e.g.:
+        ```sh
+        docker run -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm -v <repo_path>/tests/acceptance/filesForUpload:/uploads --name selenium selenium/standalone-chrome-debug
+        ```
+    3. install the Chrome browser and let yarn start & run selenium (remember to set `LOCAL_UPLOAD_DIR` though)
+    4. Use standalone selenium server (remember to set `SELENIUM_HOST`, `SELENIUM_PORT` and `LOCAL_UPLOAD_DIR`).
 - run `yarn run acceptance-tests <feature-files-to-test>`
 - available settings to be set by environment variables:
 
-| setting            | meaning                                                                | default               |
-|--------------------| -----------------------------------------------------------------------| ----------------------|
-| `SERVER_HOST`      | phoenix URL                                                            | http://localhost:8300 |
-| `BACKEND_HOST`     | owncloud server URL                                                    | http://localhost:8080 |
-| `BACKEND_USERNAME` | owncloud administrator username                                        | admin                 |
-| `BACKEND_PASSWORD` | owncloud administrator password                                        | admin                 |
-| `SELENIUM_HOST`    | selenium server host, if not set yarn will start selenum automatically<br/>if running the selenium docker container as mentioned above set to `localhost` |                       |
-| `SELENIUM_PORT`    | port of selenium server                                                | 4445                  |
-| `SCREEN_RESOLUTION`| width and height in px to set the browser resulution to e.g. 375x812   | empty = fullscreen    |
+| setting             | meaning                                                                | default               |
+|-------------------- | -----------------------------------------------------------------------| ----------------------|
+| `SERVER_HOST`       | phoenix URL                                                            | http://localhost:8300 |
+| `BACKEND_HOST`      | ownCloud server URL                                                    | http://localhost:8080 |
+| `BACKEND_USERNAME`  | ownCloud administrator username                                        | admin                 |
+| `BACKEND_PASSWORD`  | ownCloud administrator password                                        | admin                 |
+| `SELENIUM_HOST`     | selenium server host, if not set yarn will start selenium automatically<br/>if running the selenium docker container as mentioned above set to `localhost` |                       |
+| `SELENIUM_PORT`     | port of selenium server                                                   | 4444                  |
+| `SCREEN_RESOLUTION` | width and height in px to set the browser resolution to e.g. 375x812      | empty = fullscreen    |
+| `REMOTE_UPLOAD_DIR` | path to `filesForUpload` directory, used when uploading files through api | `./tests/acceptance/filesForUpload` |
+| `LOCAL_UPLOAD_DIR`  | `filesForUpload` directory available for selenium for direct uploads<br/>If using selenium-docker and example above, set it as `/uploads`.<br/>If running local selenium, set value same as `REMOTE_UPLOAD_DIR` (please, remember to use absolute path)| `/uploads` |
 
 ## Updating dependencies
 

appinfo/info.xml

@@ -9,10 +9,10 @@ This is an early release with known limitations and missing features.
 Please report and findings in https://talk.owncloud.com/channel/phoenix	</description>
 	<licence>AGPLv3</licence>
 	<author>Felix Heidecke, Oshan Mudannayake, Thomas Müller, Lukáš Hirt, Julian Müller</author>
-	<version>0.2.4</version>
+	<version>0.2.5</version>
 	<category>tools</category>
 	<dependencies>
-		<owncloud min-version="10.2.1" max-version="10" />
+		<owncloud min-version="10.3" max-version="10" />
 	</dependencies>
 	<navigation>
 		<static>index.html</static>

apps/draw-io/src/app.js

@@ -20,7 +20,12 @@ const appInfo = {
   extensions: [{
     extension: 'drawio',
     newTab: true,
-    routeName: 'draw-io-edit'
+    routeName: 'draw-io-edit',
+    newFileMenu: {
+      menuTitle ($gettext) {
+        return $gettext('Create new draw.io document…')
+      }
+    }
   }
   ]
 }

apps/draw-io/webpack.common.js

@@ -27,7 +27,27 @@ module.exports = {
     }, {
       test: /\.vue$/,
       loader: 'vue-loader'
-    }, {
+    },
+    {
+      test: /\.jsx?$/,
+      include: /node_modules\/(?=(query-string|split-on-first|strict-uri-encode)\/).*/,
+      use: {
+        loader: 'babel-loader',
+        options: {
+          presets: [
+            [
+              '@babel/preset-env',
+              {
+                targets: {
+                  ie: '11'
+                }
+              }
+            ]
+          ]
+        }
+      }
+    },
+    {
       test: /\.css$/,
       use: [
         'vue-style-loader',