From: Jeremy Benoist Date: Mon, 22 Aug 2016 21:03:16 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into 2.1 X-Git-Tag: 2.1.0~59 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=79efca1e6ff28362d4bd2713f68205294cdd07de;hp=-c;p=github%2Fwallabag%2Fwallabag.git Merge remote-tracking branch 'origin/master' into 2.1 --- 79efca1e6ff28362d4bd2713f68205294cdd07de diff --combined .travis.yml index 69b4f919,73f9491a..65e7e304 --- a/.travis.yml +++ b/.travis.yml @@@ -15,37 -15,46 +15,54 @@@ cache directories: - vendor - $HOME/.composer/cache + - node_modules + - $HOME/.cache/bower + - $HOME/.npm php: - 5.5 - 5.6 - 7.0 + - 7.1 - nightly - - hhvm +node_js: + - "5" + env: - - DB=mysql - - DB=pgsql - - DB=sqlite + - DB=mysql ASSETS=nobuild + - DB=pgsql ASSETS=nobuild + - DB=sqlite ASSETS=nobuild matrix: fast_finish: true include: + # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency + - php: hhvm-3.12 + sudo: required + dist: trusty + group: edge + env: DB=mysql + addons: + apt: + packages: + - mysql-server-5.6 + - mysql-client-core-5.6 + - mysql-client-5.6 + services: + - mysql + - php: hhvm-3.12 + sudo: required + dist: trusty + group: edge + env: DB=sqlite - php: 7.0 - env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite + env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite ASSETS=nobuild + - php: 7.0 + env: DB=sqlite ASSETS=build - exclude: - - php: hhvm - env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency allow_failures: - - php: hhvm + - php: hhvm-3.12 + - php: nightly # exclude v1 branches branches: @@@ -53,21 -62,18 +70,23 @@@ - legacy before_script: - - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; - - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; - - if [ "$TRAVIS_PHP_VERSION" = "5.5" ]; then composer require "phpunit/phpunit:4.*" --no-update; fi; + - PHP=$TRAVIS_PHP_VERSION + - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; + # xdebug isn't enable for PHP 7.1 + - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi ++ - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi; - composer self-update --no-progress - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; +install: + - if [[ $ASSETS != nobuild ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi; + - if [[ $ASSETS != nobuild ]]; then npm install -g npm@latest; fi; + before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; script: - - travis_wait composer install --no-interaction --no-progress --prefer-dist -o + - travis_wait bash install.sh - ant prepare-$DB - phpunit -v - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; diff --combined app/Resources/static/themes/baggy/css/ratatouille.css index bf89d881,605eb641..b5aeb54e --- a/app/Resources/static/themes/baggy/css/ratatouille.css +++ b/app/Resources/static/themes/baggy/css/ratatouille.css @@@ -6,8 -6,8 +6,8 @@@ * { -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } html { @@@ -18,7 -18,7 +18,7 @@@ body { font-size: 1em; - line-height:1.5; + line-height: 1.5; margin: 0; } @@@ -35,7 -35,7 +35,7 @@@ h6:first-child p:first-child, ul:first-child, ol:first-child, -dl:first-child{ +dl:first-child { margin-top: 0; } @@@ -43,13 -43,14 +43,13 @@@ code kbd, pre, samp { - font-family: monospace, serif; + font-family: monospace, serif; } pre { - white-space: pre-wrap; + white-space: pre-wrap; } - .upper { text-transform: uppercase; } @@@ -60,13 -61,12 +60,12 @@@ .inner { margin: 0 auto; - max-width: 61.25em;/*980px*/ + max-width: 61.25em; /* 980px */ } - table, - img { + table, img, figure { max-width: 100%; - height :auto; + height: auto; } iframe { @@@ -93,13 -93,13 +92,13 @@@ button input, select, textarea { - font-family: inherit; - font-size: 100%; - margin: 0; + font-family: inherit; + font-size: 100%; + margin: 0; } input[type="search"] { - -webkit-appearance: textfield; + -webkit-appearance: textfield; } /* ========================================================================== @@@ -115,17 -115,11 +114,17 @@@ display: none; } -.dtable { display:table } +.dtable { + display: table; +} - .dtable > * { display:table-row; } +.dtable > * { + display: table-row; +} - .dtable > * > * { display:table-cell; } +.dtable > * > * { + display: table-cell; +} .element-invisible { border: 0; @@@ -139,60 -133,32 +138,60 @@@ } .small { - font-size:0.8em; + font-size: 0.8em; } .big { font-size: 1.2em; } -/*Width*/ +/* Width */ -.w100 { width:100%; } -.w90 { width:90%; } -.w80 { width:80%; } -.w70 { width:70%; } -.w60 { width:60%; } -.w50 { width:50%; } -.w40 { width:40%; } -.w30 { width:30%; } -.w20 { width:20%; } -.w10 { width:10%; } +.w100 { + width: 100%; +} + +.w90 { + width: 90%; +} + +.w80 { + width: 80%; +} +.w70 { + width: 70%; +} + +.w60 { + width: 60%; +} + +.w50 { + width: 50%; +} + +.w40 { + width: 40%; +} + +.w30 { + width: 30%; +} + +.w20 { + width: 20%; +} + +.w10 { + width: 10%; +} /* ========================================================================== Internet Explorer ========================================================================== */ -/*IE8 and IE9*/ +/* IE8 and IE9 */ article, aside, @@@ -206,20 -172,40 +205,20 @@@ main nav, section, summary { - display: block; + display: block; } -/*IE8 and IE9*/ +/* IE8 and IE9 */ audio, canvas, video { - display: inline-block; + display: inline-block; } -@media screen and (-webkit-min-device-pixel-ratio:0){ - select{ +@media screen and (-webkit-min-device-pixel-ratio: 0) { + select { -webkit-appearance: none; border-radius: 0; } } - -/* ========================================================================== - Medias Queries - ========================================================================== */ - -/*Desktop 1080px*/ - -@media screen and (max-width: 67.50em) { -} - -/*Tablet 800px*/ - -@media screen and (max-width: 50em) { -} - -/*Mobile 640px*/ - -@media screen and (max-width: 40em) { -} - diff --combined app/Resources/static/themes/material/css/main.css index 2ffe0b46,00000000..cade37f6 mode 100755,000000..100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@@ -1,657 -1,0 +1,658 @@@ +/* ========================================================================== + Sommaire + + 0 = Common + 1 = Nav + 2 = Side-nav + 3 = Filters slider + 4 = Cards + 5 = Article + 6 = Media queries + 7 = Font + 8 = Others + + ========================================================================== */ + +/* ========================================================================== + 0 = Common + ========================================================================== */ + +@font-face { + font-family: icomoon; + src: url("../fonts/icomoon.eot"); + src: + url("../fonts/icomoon.eot#iefix") format("embedded-opentype"), + url("../fonts/icomoon.ttf") format("truetype"), + url("../fonts/icomoon.woff") format("woff"), + url("../fonts/icomoon.svg#icomoon") format("svg"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Material Icons'; + font-style: normal; + font-weight: 400; + src: url(../fonts/MaterialIcons-Regular.eot); + + /* For IE6-8 */ + src: local("Material Icons"), local("MaterialIcons-Regular"), url(../fonts/MaterialIcons-Regular.woff2) format("woff2"), url(../fonts/MaterialIcons-Regular.woff) format("woff"), url(../fonts/MaterialIcons-Regular.ttf) format("truetype"); +} + +.material-icons { + font-family: 'Material Icons'; + font-weight: normal; + font-style: normal; + font-size: 24px; /* Preferred icon size */ + width: 1em; + height: 1em; + display: inline-block; + line-height: 1; + text-transform: none; + letter-spacing: normal; + word-wrap: normal; + white-space: nowrap; + direction: ltr; + + /* Support for all WebKit browsers. */ + -webkit-font-smoothing: antialiased; + + /* Support for Safari and Chrome. */ + text-rendering: optimizeLegibility; + + /* Support for Firefox. */ + -moz-osx-font-smoothing: grayscale; + + /* Support for IE. */ + font-feature-settings: 'liga'; +} + +[class^="icon-"], +[class*=" icon-"] { + font-family: icomoon; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +body { + display: flex; + min-height: 100vh; + flex-direction: column; + background: #f0f0f0; +} + +body.login main { + padding: 0; +} + +.border-bottom { + border-bottom: 1px solid #ddd; +} + +nav, +main, +footer { + padding-left: 240px; +} + +main, +#content, +.valign-wrapper { + height: 100%; +} + +#main { + flex: 1 0 auto; +} + +.results { + height: 1em; + line-height: 30px; +} + +.results .nb-results, +.results .pagination { + margin: 15px; + margin-bottom: 0; +} + +.pagination { + float: right; +} + +.pagination ul { + margin: 0 !important; +} + +.pagination li { + padding: 0; +} + +.pagination a { + padding: 0 10px; + height: 30px; + display: block; +} + +.pagination .disabled { + margin-right: 10px; + margin-left: 10px; +} + +div.pagination ul .prev.disabled, +div.pagination ul .next.disabled { + display: none; +} + +.pagination li.active span { + padding: 0 10px; + height: 30px; + display: block; + color: #fff; +} + +.page-footer .footer-copyright p { + display: inline; +} + +.hidden { + display: none; +} + +.picker__date-display { + display: none; +} + +footer.page-footer { + margin-top: 10px; + padding-top: 10px; +} + +footer .row { + margin-bottom: 10px; +} + +/* ========================================================================== + 1 = Nav + ========================================================================== */ + +nav input { + color: #aaa; +} + +.nav-wrapper .button-collapse { + padding: 0 15px; +} + +.nav-input { + display: none; +} + +.nav-panels { + overflow: hidden; +} + +.nav-panel-buttom li { + max-height: 64px; +} + +.nav-panels { + transition: background 0.2s ease; +} + +.nav-panel-add .add, +.nav-panel-search .search, +.nav-panels .close { + color: #444 !important; +} + +.nav-panels .action { + padding-left: 0.75rem; + font-size: 2.1rem; + white-space: nowrap; +} + +.nav-panels .input-field input { + display: block; + line-height: inherit; + padding-left: 4rem !important; + width: calc(100% - 8rem); +} + +.nav-panels .input-field input:focus { + background-color: #fff; + border: 0; + box-shadow: none; + color: #444; +} + +.input-field.nav-panel-add label { + left: 1rem; +} + +.input-field.nav-panel-add .close { + position: absolute; + top: 0; + right: 1rem; + color: transparent; + cursor: pointer; + font-size: 2rem; + transition: 0.3s color; +} + +#button_filters { + display: none; +} + +#button_export { + display: none; +} + +/* ========================================================================== + 2 = Side-nav + ========================================================================== */ + +.side-nav.fixed a { + font-size: 13px; + line-height: 44px; + height: 44px; +} + +.side-nav .collapsible-header, +.side-nav.fixed .collapsible-header { + height: 45px; + line-height: 44px; + padding: 0 20px; +} + +.bold > a { + font-weight: bold; +} + +.side-nav > li.logo { + line-height: 0; + text-align: center; +} + +#main .logo a { + height: 100pt; +} + +#main .logo img { + height: 100pt; + width: 100pt; +} + +#main .logo:hover { + background: transparent; +} + +.side-nav li { + padding: 0; +} + +.side-nav a { + margin: 0 1rem; +} + +/* ========================================================================== + * 3 = Filters slider + * ========================================================================== */ + +#filters button { + padding: 0; + width: 100%; +} + +.side-nav.fixed.right-aligned { + right: -250px; + left: auto !important; + overflow-y: visible; +} + +#filters div.with-checkbox { + height: 3rem; + margin-top: 0; +} + +/* ========================================================================== + 4 = Cards + ========================================================================== */ + +main #content { + padding: 0 0.5rem; +} + +main ul.row { + padding: 0 0.75rem; +} + +.data .card .card-body { + height: 22em; + overflow: hidden; +} + +.card .card-content .card-title { + line-height: 32px; +} + +.card .card-entry-labels { + position: absolute; + top: 10px; + z-index: 90; + max-width: 50%; +} + +.card .card-entry-labels li { + margin: 10px 10px 10px auto; + padding: 5px 12px 5px 16px; + background-color: rgba(0, 151, 167, 0.85); + border-radius: 0 3px 3px 0; + color: #fff; + cursor: default; + max-height: 2em; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.card .card-entry-labels-hidden { + margin-top: 5px; +} + +.card .card-entry-labels-hidden li { + display: inline-block; + background-color: rgba(0, 151, 167, 0.85); + margin: 0 5px; + padding: 5px 12px; + border-radius: 3px; + color: #fff; + max-height: 2em; + max-width: calc(100% - 15px); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.card .card-content .estimatedTime { + margin-bottom: 10px; +} + +.card .card-action .original { + line-height: 24px; +} + +.card .card-action ul.links { + margin: 0; + font-size: 24px; + line-height: 24px; +} + +.card .card-action a { + color: #fff; + margin: 0; +} + +.card .card-action a:hover { + color: #fff; +} + +.settings .div_tabs { + padding-bottom: 15px; +} + +.card.sw { + max-width: 370px; + margin-left: auto; + margin-right: auto; +} + +.card .card-image { + height: 14em; +} + +.card .card-image .preview { + height: 14em; + background-size: cover; + background-repeat: no-repeat; + background-position: 50%; +} + +/* ========================================================================== + 5 = Article + ========================================================================== */ + +#article { + font-size: 20px; + margin: 0 auto; + max-width: 40em; +} + - #article img { ++#article img, ++#article figure { + max-width: 100%; + height: auto; +} + +#article > header > h1 { + font-size: 2em; +} + +.reader-mode { + width: 95px !important; + transition: width 0.2s ease; +} + +.reader-mode:hover { + width: 240px !important; +} + +.reader-mode .collapsible-body { + height: 0; + overflow: hidden; +} + +.reader-mode:hover .collapsible-body { + height: auto; +} + +.reader-mode span { + opacity: 0; + transition: opacity 0.2s ease; +} + +.reader-mode:hover span { + opacity: 1; +} + +.progress { + position: fixed; + top: 0; + width: 100%; + height: 3px; + margin: 0; + z-index: 9999; +} + +#article aside .link { + color: #000; + font-size: 0.8em; + text-decoration: none; +} + +#article aside #list { + float: right; + margin: 0 15px 10px; +} + +#article aside .chip { + background-color: rgba(0, 151, 167, 0.85); + color: #fff; + padding: 0 15px 0 10px; +} + +#article aside .chip i { + color: #fff; +} + +/* ========================================================================== + 6 = Media queries + ========================================================================== */ + +@media only screen and (max-width: 992px) { + header, + main, + footer { + padding-left: 0; + } + nav, + main, + footer { + padding-left: 0; + } + .pagination { + width: auto; + } + .reader-mode { + width: 240px !important; + } + .reader-mode span { + opacity: 1; + } + .tabs { + display: inline-block; + height: auto; + } + .tab { + min-width: 100%; + } + .indicator { + display: none; + } + .pagination li.prev, + .pagination li.next { + width: auto; + } +} + +@media only screen and (min-width: 400px) { + .nav-panel-buttom { + float: right; + } +} + +@media only screen and (min-width: 993px) and (max-width: 1180px) { + .row .col.l1 { + width: 25%; + margin-left: 0; + } + .row .col.l2 { + width: 33.33333%; + margin-left: 0; + } + .row .col.l3 { + width: 41.66667%; + margin-left: 0; + } + .row .col.l4 { + width: 50%; + margin-left: 0; + } + .row .col.l5 { + width: 58.33333%; + margin-left: 0; + } + .row .col.l6 { + width: 66.66667%; + margin-left: 0; + } + .row .col.l7 { + width: 75%; + margin-left: 0; + } + .row .col.l8 { + width: 83.33333%; + margin-left: 0; + } + .row .col.l9 { + width: 91.66667%; + margin-left: 0; + } + .row .col.l10 { + width: 100%; + margin-left: 0; + } +} + +@media only screen and (max-width: 350px) { + .nb-results { + display: none; + } +} + +/* ========================================================================== + 7 = Font + ========================================================================== */ + +.icon-google-plus2::before { + content: "\ea89"; +} + +.icon-facebook2::before { + content: "\ea8d"; +} + +.icon-twitter::before { + content: "\ea91"; +} + +.icon-apple::before { + content: "\eabf"; +} + +.icon-android::before { + content: "\eac1"; +} + +.icon-chrome::before { + content: "\eae5"; +} + +.icon-firefox::before { + content: "\eae6"; +} + +footer [class^="icon-"], +footer [class*=" icon-"] { + font-size: 2em; + transition: text-shadow 0.2s ease; + padding-right: 10px; +} + +footer [class^="icon-"]:hover, +footer [class*=" icon-"]:hover { + text-shadow: 0 0 10px rgba(0, 0, 0, 0.3); +} + +/* ========================================================================== + 8 = Others + ========================================================================== */ + +/* force height on non-input field in the settings page */ +div.settings div.input-field div, +div.settings div.input-field ul { + margin-top: 40px; +} + +/* but avoid to kill all file input */ +div.settings div.file-field div { + margin-top: inherit; +} diff --combined app/config/config.yml index a1517e97,49b325a2..80754393 --- a/app/config/config.yml +++ b/app/config/config.yml @@@ -30,7 -30,7 +30,7 @@@ framework assets: ~ wallabag_core: - version: 2.0.5 + version: 2.0.7 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' @@@ -61,6 -61,19 +61,6 @@@ twig form_themes: - "LexikFormFilterBundle:Form:form_div_layout.html.twig" -# Assetic Configuration -assetic: - debug: "%kernel.debug%" - use_controller: false - bundles: [ ] - #java: /usr/bin/java - filters: - cssrewrite: ~ - #closure: - # jar: "%kernel.root_dir%/Resources/java/compiler.jar" - #yui_css: - # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" - # Doctrine Configuration doctrine: dbal: @@@ -138,6 -151,11 +138,11 @@@ nelmio_cors #origin_regex: false paths: '^/api/': + allow_origin: ['*'] + allow_headers: ['X-Custom-Auth'] + allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE'] + max_age: 3600 + '^/oauth/': allow_origin: ['*'] allow_headers: ['X-Custom-Auth'] allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 798d8cba,c066aaf7..c24475d2 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@@ -144,7 -144,8 +144,9 @@@ entry reading_time: 'estimeret læsetid' reading_time_minutes: 'estimeret læsetid: %readingTime% min' reading_time_less_one_minute: 'estimeret læsetid: < 1 min' + # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marker som læst' toogle_as_star: 'Skift favoritstatus' @@@ -177,7 -178,7 +179,7 @@@ back_to_homepage: 'Tilbage' set_as_read: 'Marker som læst' # set_as_unread: 'Mark as unread' - set_as_favorite: 'Marker som favorit' + set_as_starred: 'Marker som favorit' view_original_article: 'Originalartikel' # re_fetch_content: 'Re-fetch content' delete: 'Slet' @@@ -192,6 -193,7 +194,7 @@@ edit_title: 'Rediger titel' original_article: 'original' # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' + created_at: 'Oprettelsesdato' new: page_title: 'Gem ny artikel' placeholder: 'http://website.com' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 0b8516ee,28d826b6..384ec09a --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@@ -144,7 -144,8 +144,9 @@@ entry reading_time: 'geschätzte Lesezeit' reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min' reading_time_less_one_minute: 'geschätzte Lesezeit: < 1 min' + # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Gelesen-Status ändern' toogle_as_star: 'Favoriten-Status ändern' @@@ -177,7 -178,7 +179,7 @@@ back_to_homepage: 'Zurück' set_as_read: 'Als gelesen markieren' set_as_unread: 'Als ungelesen markieren' - set_as_favorite: 'Favorisieren' + set_as_starred: 'Favorisieren' view_original_article: 'Original-Artikel' re_fetch_content: 'Inhalt neu laden' delete: 'Löschen' @@@ -192,6 -193,7 +194,7 @@@ edit_title: 'Titel ändern' original_article: 'original' annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %nbAnnotations% Anmerkungen' + created_at: 'Erstellungsdatum' new: page_title: 'Neuen Artikel speichern' placeholder: 'https://website.de' @@@ -397,7 -399,7 +400,7 @@@ flashes entry: notice: entry_already_saved: 'Eintrag bereits am %date% gespeichert' - entry_saved: 'Eintag gespeichert' + entry_saved: 'Eintrag gespeichert' # entry_saved_failed: 'Failed to save entry' entry_updated: 'Eintrag aktualisiert' entry_reloaded: 'Eintrag neugeladen' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 2c087421,c6633f5b..ea860564 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@@ -144,10 -144,11 +144,12 @@@ entry reading_time: 'estimated reading time' reading_time_minutes: 'estimated reading time: %readingTime% min' reading_time_less_one_minute: 'estimated reading time: < 1 min' + number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Toggle mark as read' - toogle_as_star: 'Toggle favorite' + toogle_as_star: 'Toggle starred' delete: 'Delete' export_title: 'Export' filters: @@@ -177,7 -178,7 +179,7 @@@ back_to_homepage: 'Back' set_as_read: 'Mark as read' set_as_unread: 'Mark as unread' - set_as_favorite: 'Favorite' + set_as_starred: 'Toggle starred' view_original_article: 'Original article' re_fetch_content: 'Re-fetch content' delete: 'Delete' @@@ -192,6 -193,7 +194,7 @@@ edit_title: 'Edit title' original_article: 'original' annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' + created_at: 'Creation date' new: page_title: 'Save new entry' placeholder: 'http://website.com' @@@ -352,21 -354,19 +355,21 @@@ developer field_grant_types: 'Grant type allowed' no_client: 'No client yet.' remove: - warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !' + warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !' warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." - action: 'Remove this client' + action: 'Remove the client %name%' client: page_title: 'Developer > New client' page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.' form: - redirect_uris_label: 'Redirect URIs' + name_label: 'Name of the client' + redirect_uris_label: 'Redirect URIs (optional)' save_label: 'Create a new client' action_back: 'Back' client_parameter: page_title: 'Developer > Client parameters' page_description: 'Here are your client parameters.' + field_name: 'Client name' field_id: 'Client ID' field_secret: 'Client secret' back: 'Back' @@@ -419,5 -419,5 +422,5 @@@ flashes summary: 'Import summary: %imported% imported, %skipped% already saved.' developer: notice: - client_created: 'New client created.' - client_deleted: 'Client deleted' + client_created: 'New client %name% created.' + client_deleted: 'Client %name% deleted' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 5a755e6c,266b4af5..f64e95d5 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@@ -144,7 -144,8 +144,9 @@@ entry reading_time: 'tiempo estimado de lectura' reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min' reading_time_less_one_minute: 'tiempo estimado de lectura: < 1 min' + # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marcar como leído/ no leído' toogle_as_star: 'Marcar como favorito/ no favorito' @@@ -177,7 -178,7 +179,7 @@@ back_to_homepage: 'Regrese a la página principal' set_as_read: 'Marcar como leído' set_as_unread: 'Marcar como no leído' - set_as_favorite: 'Marcar como favorito' + set_as_starred: 'Marcar como favorito' view_original_article: 'Artículo original' re_fetch_content: 'Redescargar el contenido' delete: 'Suprimir' @@@ -192,6 -193,7 +194,7 @@@ edit_title: 'Modificar el título' original_article: 'original' annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %nbAnnotations% anotaciones' + created_at: 'Fecha de creación' new: page_title: 'Guardar un nuevo artículo' placeholder: 'http://website.com' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 5a8bc5c4,c2350019..e3592a78 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@@ -144,7 -144,8 +144,9 @@@ entry reading_time: 'زمان تخمینی برای خواندن' reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min' reading_time_less_one_minute: 'زمان تخمینی برای خواندن: < 1 min' + # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'خوانده‌شده/خوانده‌نشده' toogle_as_star: 'برگزیده/نابرگزیده' @@@ -177,7 -178,7 +179,7 @@@ back_to_homepage: 'بازگشت' set_as_read: 'خوانده‌شده' set_as_unread: 'به عنوان خوانده‌نشده علامت بزن' - set_as_favorite: 'برگزیده' + set_as_starred: 'برگزیده' view_original_article: 'مقالهٔ اصلی' re_fetch_content: 'مقاله‌ها را دوباره دریافت کن' delete: 'پاک کردن' @@@ -192,6 -193,7 +194,7 @@@ edit_title: 'ویرایش عنوان' original_article: 'اصلی' annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations' + created_at: 'زمان ساخت' new: page_title: 'ذخیرهٔ مقالهٔ تازه' placeholder: 'http://website.com' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 542f61c2,25d9ec59..9e47d600 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@@ -144,7 -144,8 +144,9 @@@ entry reading_time: 'durée de lecture' reading_time_minutes: 'durée de lecture: %readingTime% min' reading_time_less_one_minute: 'durée de lecture: < 1 min' + number_of_tags: '{1}et un autre tag|]1,Inf[et %count% autres tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marquer comme lu/non lu' toogle_as_star: 'Marquer comme favori' @@@ -177,7 -178,7 +179,7 @@@ back_to_homepage: 'Retour' set_as_read: 'Marquer comme lu' set_as_unread: 'Marquer comme non lu' - set_as_favorite: 'Mettre en favori' + set_as_starred: 'Mettre en favori' view_original_article: 'Article original' re_fetch_content: 'Recharger le contenu' delete: 'Supprimer' @@@ -192,6 -193,7 +194,7 @@@ edit_title: 'Modifier le titre' original_article: 'original' annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations' + created_at: 'Date de création' new: page_title: 'Sauvegarder un nouvel article' placeholder: 'http://website.com' @@@ -343,7 -345,7 +346,7 @@@ developer list_methods: "Lister toutes les méthodes de l'API" clients: title: 'Clients' - create_new: 'Créer une nouveau client' + create_new: 'Créer un nouveau client' existing_clients: title: 'Les clients existants' field_id: 'ID Client' @@@ -352,21 -354,19 +355,21 @@@ field_grant_types: 'Type de privilège accordé' no_client: 'Aucun client pour le moment' remove: - warn_message_1: 'Vous avez la possibilité de supprimer un client. Cette action est IRREVERSIBLE !' - warn_message_2: "Si vous supprimez un client, toutes les applications qui l'utilisaient ne fonctionneront plus avec votre compte wallabag." - action: 'Supprimer ce client' + warn_message_1: 'Vous avez la possibilité de supprimer le client %name%. Cette action est IRREVERSIBLE !' + warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l'utilisaient ne fonctionneront plus avec votre compte wallabag." + action: 'Supprimer le client %name%' client: page_title: 'Développeur > Nouveau client' page_description: "Vous allez créer un nouveau client. Merci de remplir l'url de redirection vers votre application." form: - redirect_uris_label: 'URLs de redirection' + name_label: "Nom du client" + redirect_uris_label: 'URLs de redirection (optionnel)' save_label: 'Créer un nouveau client' action_back: 'Retour' client_parameter: page_title: 'Développeur > Les paramètres de votre client' page_description: 'Voilà les paramètres de votre client' + field_name: 'Nom du client' field_id: 'ID Client' field_secret: 'Clé secrète' back: 'Retour' @@@ -419,5 -419,5 +422,5 @@@ flashes summary: "Rapport d'import: %imported% importés, %skipped% déjà présent." developer: notice: - client_created: 'Nouveau client créé' - client_deleted: 'Client supprimé' + client_created: 'Nouveau client %name% créé' + client_deleted: 'Client %name% supprimé' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 0bcc94a5,231ba759..3760c2d6 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@@ -144,7 -144,8 +144,9 @@@ entry reading_time: 'tempo di lettura stimato' reading_time_minutes: 'tempo di lettura stimato: %readingTime% min' reading_time_less_one_minute: 'tempo di lettura stimato: < 1 min' + # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'originale' toogle_as_read: 'Segna come da leggere' toogle_as_star: 'Segna come non preferito' @@@ -176,7 -177,7 +178,7 @@@ back_to_homepage: 'Indietro' set_as_read: 'Segna come già letto' set_as_unread: 'Segna come da leggere' - set_as_favorite: 'Segna come preferito' + set_as_starred: 'Segna come preferito' view_original_article: 'Contenuto originale' re_fetch_content: 'Ri-ottieni pagina' delete: 'Elimina' @@@ -191,6 -192,7 +193,7 @@@ edit_title: 'Modifica titolo' original_article: 'originale' annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %nbAnnotations% annotazioni' + created_at: 'Data di creazione' new: page_title: 'Salva un nuovo contenuto' placeholder: 'http://website.com' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index bf6b4100,6e71b850..1e23168b --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@@ -144,7 -144,8 +144,9 @@@ entry reading_time: 'durada de lectura' reading_time_minutes: 'durada de lectura : %readingTime% min' reading_time_less_one_minute: 'durada de lectura : < 1 min' + # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marcar coma legit/pas legit' toogle_as_star: 'Marcar coma favorit' @@@ -177,7 -178,7 +179,7 @@@ back_to_homepage: 'Tornar' set_as_read: 'Marcar coma legit' set_as_unread: 'Marcar coma pas legit' - set_as_favorite: 'Metre en favori' + set_as_starred: 'Metre en favori' view_original_article: 'Article original' re_fetch_content: 'Tornar cargar lo contengut' delete: 'Suprimir' @@@ -192,6 -193,7 +194,7 @@@ edit_title: 'Modificar lo títol' original_article: 'original' annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %nbAnnotations% anotacions" + created_at: 'Data de creacion' new: page_title: 'Enregistrar un novèl article' placeholder: 'http://website.com' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 09428c89,2db26cf1..0a325c57 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@@ -144,7 -144,8 +144,9 @@@ entry reading_time: 'szacunkowy czas czytania' reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min' reading_time_less_one_minute: 'szacunkowy czas czytania: < 1 min' + # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'oryginał' toogle_as_read: 'Oznacz jako przeczytane' toogle_as_star: 'Oznacz jako ulubione' @@@ -177,7 -178,7 +179,7 @@@ back_to_homepage: 'Cofnij' set_as_read: 'Oznacz jako przeczytane' set_as_unread: 'Oznacz jako nieprzeczytane' - set_as_favorite: 'Ulubione' + set_as_starred: 'Ulubione' view_original_article: 'Oryginalny artykuł' re_fetch_content: 'Pobierz ponownie treść' delete: 'Usuń' @@@ -192,6 -193,7 +194,7 @@@ edit_title: 'Edytuj tytuł' original_article: 'oryginalny' annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %nbAnnotations% adnotacji' + created_at: 'Czas stworzenia' new: page_title: 'Zapisz nowy wpis' placeholder: 'http://website.com' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index bc16eddc,d8f09bc9..42ad28ee --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@@ -144,7 -144,8 +144,9 @@@ entry reading_time: 'timp estimat de citire' reading_time_minutes: 'timp estimat de citire: %readingTime% min' reading_time_less_one_minute: 'timp estimat de citire: < 1 min' + # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Comută marcat ca citit' toogle_as_star: 'Comută marcat ca favorit' @@@ -177,7 -178,7 +179,7 @@@ back_to_homepage: 'Înapoi' set_as_read: 'Marchează ca citit' # set_as_unread: 'Mark as unread' - set_as_favorite: 'Favorit' + set_as_starred: 'Favorit' view_original_article: 'Articol original' # re_fetch_content: 'Re-fetch content' delete: 'Șterge' @@@ -192,6 -193,7 +194,7 @@@ edit_title: 'Editează titlul' original_article: 'original' # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' + created_at: 'Data creării' new: page_title: 'Salvează un nou articol' placeholder: 'http://website.com' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 240bc53a,074d13e2..a60dfc86 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@@ -144,7 -144,8 +144,9 @@@ entry reading_time: 'tahmini okuma süresi' reading_time_minutes: 'tahmini okuma süresi: %readingTime% min' reading_time_less_one_minute: 'tahmini okuma süresi: < 1 min' + # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'orijinal' toogle_as_read: 'Okundu/okunmadı olarak işaretle' toogle_as_star: 'Favorilere ekle/çıkar' @@@ -177,7 -178,7 +179,7 @@@ back_to_homepage: 'Back' set_as_read: 'Okundu olarak işaretle' set_as_unread: 'Okunmadı olarak işaretle' - set_as_favorite: 'Favorilere ekle/çıkar' + set_as_starred: 'Favorilere ekle/çıkar' view_original_article: 'Orijinal makale' re_fetch_content: 'İçeriği yenile' delete: 'Sil' @@@ -192,6 -193,7 +194,7 @@@ edit_title: 'Başlığı düzenle' original_article: 'orijinal' # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations' + created_at: 'Oluşturulma tarihi' new: page_title: 'Yeni makaleyi kaydet' placeholder: 'http://website.com' diff --combined src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 40f0ae16,a8abe8d3..f89265d4 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@@ -134,7 -134,8 +134,8 @@@ {% endif %} - {{ form_rest(form.user) }} + {{ form_widget(form.user._token) }} + {{ form_widget(form.user.save) }}

{{ 'config.tab_menu.password'|trans }}

@@@ -204,6 -205,7 +205,6 @@@ {{ form_rest(form.new_tagging_rule) }} -

{{ 'config.form_rules.faq.title'|trans }}

diff --combined src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 8c06cf11,d7374dc7..ce47a677 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@@ -5,35 -5,48 +5,48 @@@ {% block content %}
-

{{ entry.title|raw }} ✎

+

{{ entry.title|raw }} ✎

-- --
++ ++
+
+ {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }} +
+ +
+ {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} + {% if readingTime > 0 %} + {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }} + {% else %} + {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} + {% endif %} +
+ {% set nbAnnotations = entry.annotations | length %} - {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} + comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}
@@@ -206,7 -206,7 +206,7 @@@ {{ 'config.form_rules.then_tag_as_label'|trans }} « {{ tagging_rule.tags|join(', ') }} » - + delete {% endfor %} diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index e9a2b183,c8e4a533..eca8924e --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@@ -26,21 -26,16 +26,21 @@@
{% if not entry.previewPicture is null %}
+
    + {% for tag in entry.tags | slice(0, 3) %} +
  • {{ tag.label }}
    • + {% endfor %} +
{% endif %}
{% if not entry.previewPicture is null %} - + more_vert {% endif %} - {{ entry.title|striptags|slice(0, 42)|raw }} + {{ entry.title|striptags|raw }}
@@@ -55,18 -50,13 +55,18 @@@ {% if entry.previewPicture is null %}

{{ entry.content|striptags|slice(0, 300)|raw }}…

+
    + {% for tag in entry.tags | slice(0, 2) %} +
  • {{ tag.label }}
    • + {% endfor %} +
{% endif %}
{% if not entry.previewPicture is null %}
- + clear {{ entry.title|raw }}
@@@ -76,12 -66,6 +76,12 @@@

{{ entry.content|striptags|slice(0, 300)|raw }}…

+ +
    + {% for tag in entry.tags %} +
  • {{ tag.label }}
    • + {% endfor %} +
{% endif %} @@@ -90,11 -74,11 +90,11 @@@ {{ entry.domainName|removeWww|truncate(18) }} -
diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 2a5cdfac,2ee615aa..5dd2afb3 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@@ -13,24 -13,24 +13,24 @@@ @@@ -39,7 -39,7 +39,7 @@@
- + {% endblock %} diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 56382096,a5c16792..50134357 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@@ -2,12 -2,17 +2,12 @@@ {% block css %} {{ parent() }} - - - - + {% endblock %} {% block scripts %} {{ parent() }} - - - + {% endblock %} {% block header %} @@@ -26,8 -31,8 +26,8 @@@
- + menu
{% block title %} {% endblock %} @@@ -80,22 -85,22 +80,22 @@@ @@@ -103,59 -108,19 +103,19 @@@
{% endblock %} {% block footer %} - + {{ render(controller("WallabagCoreBundle:Footer:index")) }} {% endblock %} diff --combined tests/Wallabag/CoreBundle/Command/InstallCommandTest.php index 2413d735,089a1c5f..c0133af4 --- a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php +++ b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php @@@ -28,16 -28,32 +28,32 @@@ class InstallCommandTest extends Wallab * * http://stackoverflow.com/a/14374832/569101 */ - $this->markTestSkipped('PostgreSQL spotted: can find a good way to drop current database, skipping.'); + $this->markTestSkipped('PostgreSQL spotted: can\'t find a good way to drop current database, skipping.'); } } + /** + * Ensure next tests will have a clean database + */ public static function tearDownAfterClass() { $application = new Application(static::$kernel); $application->setAutoExit(false); - $code = $application->run(new ArrayInput([ + $application->run(new ArrayInput([ + 'command' => 'doctrine:schema:drop', + '--no-interaction' => true, + '--force' => true, + '--env' => 'test', + ]), new NullOutput()); + + $application->run(new ArrayInput([ + 'command' => 'doctrine:schema:create', + '--no-interaction' => true, + '--env' => 'test', + ]), new NullOutput()); + + $application->run(new ArrayInput([ 'command' => 'doctrine:fixtures:load', '--no-interaction' => true, '--env' => 'test', @@@ -71,6 -87,7 +87,6 @@@ $this->assertContains('Setting up database.', $tester->getDisplay()); $this->assertContains('Administration setup.', $tester->getDisplay()); $this->assertContains('Config setup.', $tester->getDisplay()); - $this->assertContains('Installing assets.', $tester->getDisplay()); } public function testRunInstallCommandWithReset() @@@ -102,6 -119,7 +118,6 @@@ $this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay()); $this->assertContains('Administration setup.', $tester->getDisplay()); $this->assertContains('Config setup.', $tester->getDisplay()); - $this->assertContains('Installing assets.', $tester->getDisplay()); // we force to reset everything $this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay()); @@@ -146,6 -164,7 +162,6 @@@ $this->assertContains('Setting up database.', $tester->getDisplay()); $this->assertContains('Administration setup.', $tester->getDisplay()); $this->assertContains('Config setup.', $tester->getDisplay()); - $this->assertContains('Installing assets.', $tester->getDisplay()); // the current database doesn't already exist $this->assertContains('Creating database and schema, clearing the cache', $tester->getDisplay()); @@@ -183,6 -202,7 +199,6 @@@ $this->assertContains('Setting up database.', $tester->getDisplay()); $this->assertContains('Administration setup.', $tester->getDisplay()); $this->assertContains('Config setup.', $tester->getDisplay()); - $this->assertContains('Installing assets.', $tester->getDisplay()); $this->assertContains('Droping schema and creating schema', $tester->getDisplay()); } @@@ -237,6 -257,7 +253,6 @@@ $this->assertContains('Setting up database.', $tester->getDisplay()); $this->assertContains('Administration setup.', $tester->getDisplay()); $this->assertContains('Config setup.', $tester->getDisplay()); - $this->assertContains('Installing assets.', $tester->getDisplay()); $this->assertContains('Creating schema', $tester->getDisplay()); } @@@ -269,5 -290,6 +285,5 @@@ $this->assertContains('Setting up database.', $tester->getDisplay()); $this->assertContains('Administration setup.', $tester->getDisplay()); $this->assertContains('Config setup.', $tester->getDisplay()); - $this->assertContains('Installing assets.', $tester->getDisplay()); } }