/var/sessions/*
!var/sessions/.gitkeep
!var/SymfonyRequirements.php
+ /bin/*
+ !/bin/console
+ !/bin/symfony_requirements
# Parameters
/app/config/parameters.yml
# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
composer.lock
+
+# assets stuff
+/node_modules/
+!app/Resources/static/lib
+app/Resources/static/lib/*
+/bin
+!/src/Wallabag/CoreBundle/Resources/public
+/src/Wallabag/CoreBundle/Resources/public/*
directories:
- vendor
- $HOME/.composer/cache
+ - node_modules
+ - $HOME/.cache/bower
+ - $HOME/.npm
php:
- 5.5
- 5.6
- 7.0
+ - 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:
- 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
- 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;
framework:
#esi: ~
- translator: { fallback: "%locale%" }
- secret: "%secret%"
+ translator:
+ enabled: true
+ fallback: "%locale%"
+ secret: "%secret%"
router:
resource: "%kernel.root_dir%/config/routing.yml"
strict_requirements: ~
- form: ~
+ form: ~
csrf_protection: ~
- validation: { enable_annotations: true }
+ validation:
+ enable_annotations: true
templating:
engines: ['twig']
- #assets_version: SomeVersionScheme
- default_locale: "%locale%"
- trusted_hosts: ~
+ default_locale: "%locale%"
+ trusted_hosts: ~
trusted_proxies: ~
session:
# handler_id set to null will use default session handler from php.ini
- handler_id: session.handler.native_file
- save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
- fragments: ~
+ handler_id: session.handler.native_file
+ save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
+ fragments: ~
http_method_override: true
assets: ~
# Twig Configuration
twig:
- debug: "%kernel.debug%"
+ debug: "%kernel.debug%"
strict_variables: "%kernel.debug%"
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:
- driver: "%database_driver%"
+ driver: "%database_driver%"
host: "%database_host%"
port: "%database_port%"
dbname: "%database_name%"
user: "%database_user%"
password: "%database_password%"
- charset: UTF8
- path: "%database_path%"
+ charset: UTF8
+ path: "%database_path%"
server_version: 5.6
orm:
# Swiftmailer Configuration
swiftmailer:
transport: "%mailer_transport%"
- host: "%mailer_host%"
- username: "%mailer_user%"
- password: "%mailer_password%"
- spool: { type: memory }
+ host: "%mailer_host%"
+ username: "%mailer_user%"
+ password: "%mailer_password%"
+ spool:
+ type: memory
fos_rest:
param_fetcher_listener: true
fos_user:
db_driver: orm
- firewall_name: main
+ firewall_name: secured_area
user_class: Wallabag\UserBundle\Entity\User
registration:
confirmation:
router:
resource: "%kernel.root_dir%/config/routing_dev.yml"
strict_requirements: true
- profiler: { only_exceptions: false }
+ profiler:
+ only_exceptions: false
web_profiler:
toolbar: true
monolog:
handlers:
main:
- type: stream
- path: "%kernel.logs_dir%/%kernel.environment%.log"
- level: debug
+ type: stream
+ path: "%kernel.logs_dir%/%kernel.environment%.log"
+ level: debug
channels: ['!event']
console:
- type: console
+ type: console
bubble: false
verbosity_levels:
VERBOSITY_VERBOSE: INFO
VERBOSITY_VERY_VERBOSE: DEBUG
channels: ['!event', '!doctrine']
console_very_verbose:
- type: console
+ type: console
bubble: false
verbosity_levels:
VERBOSITY_VERBOSE: NOTICE
VERBOSITY_DEBUG: DEBUG
channels: [doctrine]
-assetic:
- use_controller: true
-
swiftmailer:
# see http://mailcatcher.me/
transport: smtp
"doctrine/doctrine-bundle": "^1.6",
"doctrine/doctrine-cache-bundle": "^1.2",
"twig/extensions": "~1.0",
- "symfony/assetic-bundle": "~2.3",
"symfony/swiftmailer-bundle": "^2.3",
"symfony/monolog-bundle": "^2.8",
"sensio/distribution-bundle": "^5.0",
"grandt/phpepub": "~4.0",
"wallabag/php-mobi": "~1.0.0",
"kphoen/rulerz-bundle": "~0.10",
- "guzzlehttp/guzzle": "^5.2.0",
+ "guzzlehttp/guzzle": "^5.3.1",
"doctrine/doctrine-migrations-bundle": "^1.0",
"paragonie/random_compat": "~1.0",
"craue/config-bundle": "~1.4",
"mnapoli/piwik-twig-extension": "^1.0",
"lexik/maintenance-bundle": "~2.1",
"ocramius/proxy-manager": "1.*",
- "white-october/pagerfanta-bundle": "^1.0"
+ "white-october/pagerfanta-bundle": "^1.0",
+ "mouf/nodejs-installer": "~1.0"
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "~2.2",
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
],
"symfony-var-dir": "var",
"symfony-web-dir": "web",
"symfony-tests-dir": "tests",
- "symfony-assets-install": "relative",
"incenteev-parameters": {
"file": "app/config/parameters.yml"
}
entry:
page_titles:
- unread: 'Artúclos no leídos'
+ unread: 'ArtÃculos no leídos'
starred: 'Artículos favoritos'
archived: 'Artículos archivados'
filtered: 'Artículos filtrados'
reading_time: 'tiempo estimado de lectura'
reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min'
reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur"><</small> 1 min'
+ # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
original_article: 'original'
toogle_as_read: 'Marcar como leído/ no leído'
toogle_as_star: 'Marcar como favorito/ no favorito'
{% block css %}
{{ parent() }}
-
- <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/materialize.min.css') }}" media="screen,projection"/>
- <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/main.css') }}" media="all">
- <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/print.css') }}" media="print">
+ <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/style.min.css') }}" media="screen,projection,print"/>
{% endblock %}
{% block scripts %}
{{ parent() }}
-
- <script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script>
- <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script>
+ <script src="{{ asset('bundles/wallabagcore/themes/material/js/material.min.js') }}"></script>
{% endblock %}
{% block header %}
<ul id="slide-out" class="side-nav fixed">
{% block logo %}
<li class="logo border-bottom">
- <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}">
- <img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-square.png') }}" alt="wallabag logo" />
+ <a title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
+ <img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-square.png') }}" alt="wallabag logo" />
</a>
</li>
{% endblock %}
</li>
</ul>
<div class="nav-wrapper nav-panels">
- <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a>
+ <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></a>
<div class="left action">
{% block title %}
{% endblock %}
<ul>
<li class="bold">
<a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add">
- <i class="mdi-content-add"></i>
+ <i class="material-icons">add</i>
</a>
</li>
<!--<li>
<a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search">
- <i class="mdi-action-search"></i>
+ <i class="material-icons">search</i>
</a>
</li>-->
<li id="button_filters">
<a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right">
- <i class="mdi-content-filter-list"></i>
+ <i class="material-icons">filter_list</i>
</a>
</li>
<li id="button_export">
- <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export" class="nav-panel-menu button-collapse-right">
- <i class="mdi-file-file-download"></i>
+ <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export">
+ <i class="material-icons">file_download</i>
</a>
</li>
</ul>
<form method="get" action="index.php">
<div class="input-field nav-panel-search" style="display: none">
<input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}">
- <label for="search"><i class="mdi-action-search"></i></label>
- <i class="mdi-navigation-close"></i>
+ <label for="search"><i class="material-icons search">search</i></label>
+ <i class="material-icons close">clear</i>
</div>
</form>
<div class="input-field nav-panel-add" style="display: none">
{{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
- <label for="add" class="active"><i class="mdi-content-add"></i></label>
- <i class="mdi-navigation-close"></i>
+ <label for="add" class="active"><i class="material-icons add">add</i></label>
+ <i class="material-icons close">clear</i>
</div>
</div>
</nav>
<a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS">
<span class="icon-apple"></span>
</a>
- <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/firefox/addon/wallabag/" title="Firefox">
+ <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" title="Firefox">
<span class="icon-firefox"></span>
</a>
- <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome">
+ <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj" title="Chrome">
<span class="icon-chrome"></span>
</a>
</p>
projects / github / wallabag / wallabag.git / commitdiff
