adev
|
5872cd191c
|
Update .editorconfig for makefile
|
2017-11-01 14:47:06 +01:00 |
|
Jeremy Benoist
|
68003139e1
|
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
|
2016-11-19 15:30:49 +01:00 |
|
Thomas Citharel
|
5637a26e9a
|
Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page !
Also better indentation for js files (changed editorconfig for them).
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2016-11-15 21:55:10 +01:00 |
|
Thomas Citharel
|
3221b2e413
|
Fix resolution issues and 'title' issues
Also, modify editorconfig for css files.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2016-11-03 11:28:40 +01:00 |
|
Jeremy
|
daacffefa6
|
Use tagged version in composer
|
2015-01-31 19:02:59 +01:00 |
|