diff --git a/.eslintrc.json b/.eslintrc.json index 474a2c2b14..16685f5c7f 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -2,5 +2,8 @@ "extends": ["cozy-app/react"], "rules": { "no-console": 1 + }, + "globals": { + "fixture": false } } diff --git a/.travis.yml b/.travis.yml index 65550cebcd..07600fa3bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,11 @@ jobs: env: - COZY_APP_SLUG=drive addons: - firefox: latest + apt: + sources: + - google-chrome + packages: + - google-chrome-stable fluxbox before_install: - scripts/transifex.sh - scripts/decrypt.sh diff --git a/package.json b/package.json index 1c474e058d..0e25b535a5 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "devDependencies": { "@sentry/cli": "1.35.4", "babel-core": "7.0.0-bridge.0", + "chrome-remote-interface": "^0.27.1", "cordova": "7.1.0", "cordova-android": "7.1.4", "enzyme": "2.9.1", diff --git a/src/components/Menu/index.jsx b/src/components/Menu/index.jsx index 458b5a1f19..5da964baf2 100644 --- a/src/components/Menu/index.jsx +++ b/src/components/Menu/index.jsx @@ -73,6 +73,7 @@ export default class Menu extends Component { /> )}
+
{!isShared && canUpload && hasWriteAccess && } diff --git a/src/drive/web/modules/drive/Toolbar/components/AddFolderItem.jsx b/src/drive/web/modules/drive/Toolbar/components/AddFolderItem.jsx index c06065818d..25de7ff128 100644 --- a/src/drive/web/modules/drive/Toolbar/components/AddFolderItem.jsx +++ b/src/drive/web/modules/drive/Toolbar/components/AddFolderItem.jsx @@ -6,7 +6,11 @@ import { showNewFolderInput } from 'drive/web/modules/filelist/duck' const AddFolderItem = translate()(({ t, addFolder }) => { return ( - + {t('toolbar.menu_new_folder')} ) diff --git a/src/drive/web/modules/drive/Toolbar/delete/DeleteItem.jsx b/src/drive/web/modules/drive/Toolbar/delete/DeleteItem.jsx index e7127e6ab6..5ec5d17bf9 100644 --- a/src/drive/web/modules/drive/Toolbar/delete/DeleteItem.jsx +++ b/src/drive/web/modules/drive/Toolbar/delete/DeleteItem.jsx @@ -7,6 +7,7 @@ const DeleteItem = translate()( ({ t, isSharedWithMe, displayedFolder, trashFolder, onLeave }) => isSharedWithMe ? ( onLeave(displayedFolder).then(() => trashFolder(displayedFolder)) @@ -16,6 +17,7 @@ const DeleteItem = translate()( ) : ( trashFolder(displayedFolder)} > diff --git a/src/drive/web/modules/filelist/File.jsx b/src/drive/web/modules/filelist/File.jsx index 85af8946d6..1e7e71da85 100644 --- a/src/drive/web/modules/filelist/File.jsx +++ b/src/drive/web/modules/filelist/File.jsx @@ -157,7 +157,10 @@ const FileName = ({
-
+
{filename} {extension && ( {extension} diff --git a/src/drive/web/modules/filelist/FilenameInput.jsx b/src/drive/web/modules/filelist/FilenameInput.jsx index 2f6df82e75..3c5d4e9e99 100644 --- a/src/drive/web/modules/filelist/FilenameInput.jsx +++ b/src/drive/web/modules/filelist/FilenameInput.jsx @@ -68,7 +68,7 @@ export default class FilenameInput extends Component { render(props, { value, working, error }) { return ( -
+
( CozybarToolbar.propTypes = toolbarProptypes const DesktopToolbar = ({ onDownload, discoveryLink, isFile }, { t }) => ( -
+
{discoveryLink ? ( ) : ( diff --git a/src/drive/web/modules/upload/UploadButton.jsx b/src/drive/web/modules/upload/UploadButton.jsx index 3dc76d5955..28298e2cde 100644 --- a/src/drive/web/modules/upload/UploadButton.jsx +++ b/src/drive/web/modules/upload/UploadButton.jsx @@ -28,6 +28,7 @@ const UploadButton = ({ label, disabled, onUpload, className }) => ( {label} )} {doneCount >= queue.length && ( -
+
{t('UploadQueue.header_done', { done: successCount, diff --git a/src/photos/ducks/upload/UploadQueue.jsx b/src/photos/ducks/upload/UploadQueue.jsx index 017e10c69e..5d815eac39 100644 --- a/src/photos/ducks/upload/UploadQueue.jsx +++ b/src/photos/ducks/upload/UploadQueue.jsx @@ -71,7 +71,7 @@ const InProgressHeader = translate()(({ t, total, done }) => ( const FinishedHeader = translate()(({ t, total, successful, onClose }) => (
{t('UploadQueue.header_done', { done: successful, total })} @@ -95,7 +95,7 @@ class UploadQueue extends Component { const { collapsed } = this.state return (
(