diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index 564a4e89e..cc602ef40 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index 32880fce0..6a589cddd 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index fa4dd4bee..d230d8451 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index 8699f74c6..badb7d883 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index a4aacd800..3bc3e7dff 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -857,7 +857,6 @@ return array( 'This chart show the task complexity over the time (Work Remaining).' => 'Ce graphique représente la complexité des tâches en fonction du temps (travail restant).', 'Screenshot taken %s' => 'Capture d\'écran prise le %s', 'Add a screenshot' => 'Ajouter une capture d\'écran', - 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => 'Copier/coller des images est uniquement supporté par Mozilla Firefox et Google Chrome.', 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => 'Prenez une capture d\'écran et appuyez sur CTRL+V ou ⌘+V pour coller ici.', 'Screenshot uploaded successfully.' => 'Capture d\'écran téléchargée avec succès.', 'SEK - Swedish Krona' => 'SEK - Couronne suédoise', diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index b0caa154f..558bb25ea 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index 8a117d0a3..c8df81ab3 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index 206d46501..11af3feb6 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index 3321f1b6e..37c7c69db 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 047e32dcf..366c63717 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index 2684724e8..87845f779 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index baedde36b..18fd6dfef 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index 281afb264..cb2d72879 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index 19437c713..e67402b2a 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -855,7 +855,6 @@ return array( 'This chart show the task complexity over the time (Work Remaining).' => 'Diagrammet visar uppgiftens svårighet över tid (återstående arbete).', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', 'SEK - Swedish Krona' => 'SEK - Svensk Krona', diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 9d055a5fe..024b211aa 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index f1050cb5d..c5c1c79e3 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index 15f0ab301..e61663356 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -855,7 +855,6 @@ return array( // 'This chart show the task complexity over the time (Work Remaining).' => '', // 'Screenshot taken %s' => '', // 'Add a screenshot' => '', - // 'Copy and paste images are only supported with Mozilla Firefox and Google Chrome.' => '', // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', // 'Screenshot uploaded successfully.' => '', // 'SEK - Swedish Krona' => '', diff --git a/app/Template/file/screenshot.php b/app/Template/file/screenshot.php index 386b83b69..299bf6157 100644 --- a/app/Template/file/screenshot.php +++ b/app/Template/file/screenshot.php @@ -15,5 +15,3 @@ a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> - -

\ No newline at end of file diff --git a/composer.lock b/composer.lock index 8058424a1..22602c496 100644 --- a/composer.lock +++ b/composer.lock @@ -190,12 +190,12 @@ "source": { "type": "git", "url": "https://github.com/fguillot/picoDb.git", - "reference": "35c8d2d3f70b713f66e1dc14c1d6481abe5db3ac" + "reference": "bc75f3dab79bf6beb6e07b5ace0252e1d0d374fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fguillot/picoDb/zipball/35c8d2d3f70b713f66e1dc14c1d6481abe5db3ac", - "reference": "35c8d2d3f70b713f66e1dc14c1d6481abe5db3ac", + "url": "https://api.github.com/repos/fguillot/picoDb/zipball/bc75f3dab79bf6beb6e07b5ace0252e1d0d374fa", + "reference": "bc75f3dab79bf6beb6e07b5ace0252e1d0d374fa", "shasum": "" }, "require": { @@ -209,7 +209,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "WTFPL" + "MIT" ], "authors": [ { @@ -219,7 +219,7 @@ ], "description": "Minimalist database query builder", "homepage": "https://github.com/fguillot/picoDb", - "time": "2015-04-12 02:46:43" + "time": "2015-04-14 01:59:06" }, { "name": "fguillot/simple-validator", @@ -227,12 +227,12 @@ "source": { "type": "git", "url": "https://github.com/fguillot/simpleValidator.git", - "reference": "41655dc7b9224395f5bb3b5623f6e428fe6d64e8" + "reference": "2f30078bb6e688cf123c150d58fda322792a1532" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fguillot/simpleValidator/zipball/41655dc7b9224395f5bb3b5623f6e428fe6d64e8", - "reference": "41655dc7b9224395f5bb3b5623f6e428fe6d64e8", + "url": "https://api.github.com/repos/fguillot/simpleValidator/zipball/2f30078bb6e688cf123c150d58fda322792a1532", + "reference": "2f30078bb6e688cf123c150d58fda322792a1532", "shasum": "" }, "require": { @@ -250,13 +250,12 @@ ], "authors": [ { - "name": "Frédéric Guillot", - "homepage": "http://fredericguillot.com" + "name": "Frédéric Guillot" } ], "description": "The most easy to use validator library for PHP :)", "homepage": "https://github.com/fguillot/simpleValidator", - "time": "2015-04-05 21:44:06" + "time": "2015-04-14 02:03:43" }, { "name": "fguillot/simpleLogger", diff --git a/docs/screenshots.markdown b/docs/screenshots.markdown index 5259f1f88..84bf605d0 100644 --- a/docs/screenshots.markdown +++ b/docs/screenshots.markdown @@ -22,5 +22,4 @@ On Mac OS X, you can use those shortcuts to take screenshots: There are also several third-party applications that can be used to take screenshots with annotations and shapes. -Note: this feature **works only with Mozilla Firefox and Google Chrome**. -If you use another browser, you have to upload an attachment manually. +Note: This feature doesn't works with all browsers.