From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 8 Mar 2016 17:02:34 +0100 Subject: manage assets through npm first draft remote assetic totally work nearly there use at least nodejs > 0.12 use proper version of grunt bump nodejs version for travis update npm workaround for materialize install node 5.0 add grunt-cli baggy theme & cache node modules cache bower & npm make travis build assets on php7 only exclude installing node & npm if not needed & use bash clean & try to make icomoon work on baggy ready config for travis rebase make travis work more travis work impove travis & update deps add missing pixrem deps add module through oddly lost ui updates install latest nodejs add install_dev.sh, link local binaries for npm/bower/grunt ui improvements (mostly baggy) fix travis build no need to install on travis Add unread filter to entries pages Add the ability to filter for unread pages in the filters menu. Add unread filter test to EntryControllerTest Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. Improve English translation Update FAQ -Fix grammar -Add notes about MTA, firewall, and SELinux Update installation instructions -Fix grammar -Add SELinux section add screenshots of android docu in English Fix the deletion of Tags/Entries relation when delete an entry Fix #2121 Move fixtures to the right place Display a message when saving an entry failed When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too. Change ManyToMany between entry & tag Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed Prepare wallabag 2.0.5 enforce older materialize version --- .../CoreBundle/Resources/views/themes/baggy/Static/about.html.twig | 1 - 1 file changed, 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig index 404d2857..918249dc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig @@ -37,7 +37,6 @@

{{ 'about.helping.description'|trans }}

-
{{ 'about.helping.description'|trans }}
{{ 'about.helping.by_contributing_2'|trans }} {{ 'about.helping.by_contributing'|trans }}
{{ 'about.helping.by_paypal'|trans }}
-- cgit v1.2.3 From 209ec7cedd8bcf050223b869a54940c9f2d03899 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 1 Sep 2016 12:07:35 +0200 Subject: Add Readability to Quickstart page --- .../CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig index b3d3d5a0..ea1c1cbe 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig @@ -39,6 +39,7 @@
  • {{ 'quickstart.migrate.pocket'|trans }}
  • {{ 'quickstart.migrate.wallabag_v1'|trans }}
  • {{ 'quickstart.migrate.wallabag_v2'|trans }}
    • +
  • {{ 'quickstart.migrate.readability'|trans }}

    • {{ 'quickstart.developer.title'|trans }}

    -- cgit v1.2.3 From 2ff9991a1dfac0d3463662b96f529aac70c66f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 30 Sep 2016 09:38:08 +0200 Subject: Removed duplicated templates files --- .../views/themes/baggy/Static/about.html.twig | 169 --------------------- .../views/themes/baggy/Static/howto.html.twig | 28 ---- .../views/themes/baggy/Static/quickstart.html.twig | 67 -------- 3 files changed, 264 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig deleted file mode 100644 index 918249dc..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig +++ /dev/null @@ -1,169 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'about.page_title'|trans }}{% endblock %} - -{% block content %} -

    {{ 'about.top_menu.who_behind_wallabag'|trans }}

    - -
    -
    {{ 'about.who_behind_wallabag.developped_by'|trans }}
    -
    Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
    -
    Thomas Citharel — {{ 'about.who_behind_wallabag.website'|trans }}
    -
    Jérémy Benoist — {{ 'about.who_behind_wallabag.website'|trans }}
    - -
    {{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}
    - -
    {{ 'about.who_behind_wallabag.project_website'|trans }}
    -
    https://www.wallabag.org
    - -
    {{ 'about.who_behind_wallabag.license'|trans }}: MIT
    - -
    {{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}
    -
    - -

    {{ 'about.top_menu.getting_help'|trans }}

    - -
    -
    {{ 'about.getting_help.documentation'|trans }}
    -
    english
    -
    français
    - -
    {{ 'about.getting_help.bug_reports'|trans }}
    -
    {{ 'about.getting_help.support'|trans|raw }}
    -
    - -

    {{ 'about.top_menu.helping'|trans }}

    - -

    {{ 'about.helping.description'|trans }}

    - -
    -
    {{ 'about.helping.by_contributing_2'|trans }} {{ 'about.helping.by_contributing'|trans }}
    -
    {{ 'about.helping.by_paypal'|trans }}
    -
    - -

    {{ 'about.top_menu.contributors'|trans }}

    -

    {{ 'about.contributors.description'|trans }}

    - -

    {{ 'about.top_menu.third_party'|trans }}

    -

    {{ 'about.third_party.description'|trans }}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{ 'about.third_party.package'|trans }}{{ 'about.third_party.license'|trans }}
    behat/transliteratorArtistic 1.0
    CraueConfigBundleMIT
    doctrine/annotationsMIT
    doctrine/cacheMIT
    doctrine/collectionsMIT
    doctrine/commonMIT
    doctrine/dbalMIT
    doctrine/doctrine-bundleMIT
    doctrine/doctrine-cache-bundleMIT
    doctrine/doctrine-migrations-bundleMIT
    doctrine/inflectorMIT
    doctrine/instantiatorMIT
    doctrine/lexerMIT
    doctrine/migrationsLGPL-2.1
    doctrine/ormMIT
    friendsofsymfony/oauth-server-bundleMIT
    friendsofsymfony/oauth2-phpMIT
    friendsofsymfony/rest-bundleMIT
    friendsofsymfony/user-bundleMIT
    gedmo/doctrine-extensionsMIT
    grandt/binstringLGPL-2.1
    grandt/phpepubLGPL-2.1
    grandt/phpresizegifLGPL-2.1
    grandt/phpzipmergeLGPL-2.1
    grandt/relativepathLGPL-2.1
    guzzlehttp/guzzleMIT
    guzzlehttp/ringphpMIT
    guzzlehttp/streamsMIT
    hoa/compilerBSD-3-Clause
    hoa/consistencyBSD-3-Clause
    hoa/eventBSD-3-Clause
    hoa/exceptionBSD-3-Clause
    hoa/fileBSD-3-Clause
    hoa/iteratorBSD-3-Clause
    hoa/mathBSD-3-Clause
    hoa/protocolBSD-3-Clause
    hoa/regexBSD-3-Clause
    hoa/rulerBSD-3-Clausev -
    hoa/streamBSD-3-Clause
    hoa/ustringBSD-3-Clause
    hoa/visitorBSD-3-Clause
    hoa/zformatBSD-3-Clause
    htmlawed/htmlawedGPL-2.0+ or LGPL-3.0
    incenteev/composer-parameter-handlerMIT
    j0k3r/grabyAGPL-3.0
    j0k3r/graby-site-configAGPL-3.0
    j0k3r/php-readabilityApache-2.0
    j0k3r/safecurlMIT
    jdorn/sql-formatterMIT
    jms/metadataApache
    jms/parser-libApache2
    jms/serializerApache2
    jms/serializer-bundleApache2
    kphoen/rulerzMIT
    kphoen/rulerz-bundleMIT
    kriswallsmith/asseticMIT
    lexik/form-filter-bundleMIT
    liip/theme-bundleMIT
    mgargano/simplehtmldomMIT
    michelf/php-markdownBSD-3-Clause
    monolog/monologMIT
    neitanod/forceutf8BSD-3-Clause
    nelmio/api-doc-bundleMIT
    nelmio/cors-bundleMIT
    ocramius/proxy-managerMIT
    pagerfanta/pagerfantaMIT
    paragonie/random_compatMIT
    phpcollection/phpcollectionApache2
    phpoption/phpoptionApache2
    phpzip/phpzipLGPL-2.1
    psr/logMIT
    react/promiseMIT
    scheb/two-factor-bundleMIT
    sensio/distribution-bundleMIT
    sensio/framework-extra-bundleMIT
    sensiolabs/security-checkerMIT
    simplepie/simplepieBSD-3-Clause
    smalot/pdfparserGPL-3.0
    sonata-project/google-authenticatorMIT
    stof/doctrine-extensions-bundleMIT
    swiftmailer/swiftmailerMIT
    symfony/assetic-bundleMIT
    symfony/monolog-bundleMIT
    All of SymfonyMIT-licenced
    tecnickcom/tcpdfLGPLv3
    twig/extensionsMIT
    twig/twigBSD-3-Clause
    wallabag/php-mobiApache-2.0
    willdurand/hateoasMIT
    willdurand/hateoas-bundleMIT
    willdurand/jsonp-callback-validatorMIT
    willdurand/negotiationMIT
    zendframework/zend-codeBSD-3-Clause
    zendframework/zend-eventmanagerBSD-3-Clause
    doctrine/data-fixturesMIT
    doctrine/doctrine-fixtures-bundleMIT
    phpdocumentor/reflection-docblockMIT
    phpspec/prophecyMIT
    phpunit/php-code-coverageBSD-3-Clause
    phpunit/php-file-iteratorBSD-3-Clause
    phpunit/php-text-templateBSD-3-Clause
    phpunit/php-timerBSD-3-Clause
    phpunit/php-token-streamBSD-3-Clause
    phpunit/phpunitBSD-3-Clause
    phpunit/phpunit-mock-objectsBSD-3-Clause
    sebastian/comparatorBSD-3-Clause
    sebastian/diffBSD-3-Clause
    sebastian/environmentBSD-3-Clause
    sebastian/exporterBSD-3-Clause
    sebastian/global-stateBSD-3-Clause
    sebastian/recursion-contextBSD-3-Clause
    sebastian/versionBSD-3-Clause
    sensio/generator-bundleMIT
    symfony/phpunit-bridgeMIT
    -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig deleted file mode 100644 index b529a0ac..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'howto.page_title'|trans }}{% endblock %} - -{% block content %} -

    {{ 'howto.page_title'|trans }}

    - -

    {{ 'howto.page_description'|trans }}

    - -

    {{ 'howto.top_menu.browser_addons'|trans }}

    - -

    {{ 'howto.top_menu.mobile_apps'|trans }}

    - -

    {{ 'howto.top_menu.bookmarklet'|trans }}

    -

    - {{ 'howto.bookmarklet.description'|trans }} - {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} - -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig deleted file mode 100644 index ea1c1cbe..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig +++ /dev/null @@ -1,67 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %} - -{% block content %} - -

    {{ 'quickstart.intro.title'|trans }}

    -

    {{ 'quickstart.intro.paragraph_1'|trans }}

    -

    {{ 'quickstart.intro.paragraph_2'|trans }}

    - -

    {{ 'quickstart.configure.title'|trans }}

    - - - {% if is_granted('ROLE_SUPER_ADMIN') %} -

    {{ 'quickstart.admin.title'|trans }}

    -

    {{ 'quickstart.admin.description'|trans }}

    - - {% endif %} - -

    {{ 'quickstart.first_steps.title'|trans }}

    - - -

    {{ 'quickstart.migrate.title'|trans }}

    -

    {{ 'quickstart.migrate.description'|trans }}

    - - -

    {{ 'quickstart.developer.title'|trans }}

    - - -

    {{ 'quickstart.docs.title'|trans }}

    - - -

    {{ 'quickstart.support.title'|trans }}

    -

    {{ 'quickstart.support.description'|trans }}

    - - -{% endblock %} -- cgit v1.2.3