Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-19 | 2 | -24/+122 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | Changed display for material theme | Nicolas Lœuillet | 2016-11-14 | 1 | -2/+1 |
| | | |||||
| * | Added creation date on entries view | Nicolas Lœuillet | 2016-11-14 | 2 | -2/+3 |
| | | |||||
| * | Display a bigger image in case of image content | Jeremy Benoist | 2016-11-08 | 1 | -1/+6 |
| | | | | | | | | | | | | If the content is only an image, we can display a bigger preview image because we won’t have text to display. Also, split different card view to avoid too much complexity in the entries.html.twig | ||||
| * | Remove the left margin of tag | Jeremy Benoist | 2016-11-08 | 1 | -0/+4 |
| | | | | | | | | In the entries list, the first tag below the link isn’t stick to the left. Now it is. | ||||
| * | Deal with more resolution issues | Thomas Citharel | 2016-11-03 | 1 | -1/+17 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | Fix resolution issues and 'title' issues | Thomas Citharel | 2016-11-03 | 1 | -2/+9 |
| | | | | | | | | | | | | Also, modify editorconfig for css files. Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | Re-add bottom pagination | Jeremy Benoist | 2016-10-22 | 1 | -1/+0 |
| | | | | | | | | Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template | ||||
| * | remove padding on small widths | Thomas Citharel | 2016-10-22 | 1 | -1/+0 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | WIP | Thomas Citharel | 2016-10-22 | 1 | -17/+85 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Added CSS class on links | Nicolas Lœuillet | 2016-11-16 | 2 | -8/+8 |
| | | |||||
* | | Fix keyboard navigation on quickstart view | Thomas Citharel | 2016-11-15 | 1 | -0/+5 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | fix next/prev page | Thomas Citharel | 2016-11-15 | 2 | -13/+6 |
| | | |||||
* | | Bring navigation (with right, left and enter) on material entries page. ↵ | Thomas Citharel | 2016-11-15 | 7 | -24/+105 |
| | | | | | | | | | | | | | | | | 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> | ||||
* | | Reorganized JS folders for shortcuts | Nicolas Lœuillet | 2016-11-15 | 9 | -46/+71 |
| | | |||||
* | | es6 imports | Thomas Citharel | 2016-11-15 | 6 | -39/+44 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Added new shortcuts | Nicolas Lœuillet | 2016-11-15 | 1 | -1/+36 |
| | | |||||
* | | Added shortcuts | Nicolas Lœuillet | 2016-11-15 | 1 | -0/+12 |
| | | |||||
* | | Added unmark.it sharing | Nicolas Lœuillet | 2016-11-09 | 3 | -0/+10 |
| | | | | | | | | Fix #668 | ||||
* | | avoid eslint warning by disabling line | Thomas Citharel | 2016-11-03 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Added translations and baggy part | Nicolas Lœuillet | 2016-10-31 | 1 | -1/+1 |
| | | |||||
* | | Added QRCode and link to configure android application | Nicolas Lœuillet | 2016-10-31 | 1 | -0/+2 |
|/ | |||||
* | Fix baggy on small screens | Thomas Citharel | 2016-10-15 | 1 | -0/+8 |
| | |||||
* | fix stylelint | Thomas Citharel | 2016-10-15 | 1 | -1/+1 |
| | |||||
* | Improved side menu, reduced the font size on small screens, fixed a form to ↵ | Alexandr Danilov | 2016-10-15 | 1 | -1/+21 |
| | | | | add links on small screens | ||||
* | CS | Jeremy Benoist | 2016-10-09 | 1 | -1/+2 |
| | |||||
* | Optimize the way tag list is rendered | Jeremy Benoist | 2016-10-09 | 1 | -2/+3 |
| | | | | | | Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query. Also change the layout of the tag list in material design | ||||
* | better tags on material | Thomas Citharel | 2016-10-05 | 1 | -0/+9 |
| | |||||
* | better tags on baggy | Thomas Citharel | 2016-10-04 | 1 | -1/+15 |
| | |||||
* | typo and build on test | Thomas Citharel | 2016-10-04 | 1 | -1/+1 |
| | |||||
* | use airbnb base rules and update eslint | Thomas Citharel | 2016-10-04 | 2 | -3/+6 |
| | |||||
* | Fixed icon position in share menu | Nicolas Lœuillet | 2016-10-04 | 1 | -2/+5 |
| | |||||
* | fix icons | Thomas Citharel | 2016-10-04 | 1 | -1/+2 |
| | |||||
* | Add eslint & stylelint tests (fix a few things) and move dependencies to dev | Thomas Citharel | 2016-10-04 | 3 | -7/+8 |
| | |||||
* | shaarli instead of Diaspora | Jeremy Benoist | 2016-10-04 | 1 | -1/+1 |
| | |||||
* | Basically, fix everything | Thomas Citharel | 2016-10-03 | 3 | -6/+83 |
| | | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed | ||||
* | Fixed CSS for quickstart links | Nicolas Lœuillet | 2016-10-03 | 1 | -2/+6 |
| | |||||
* | Merge pull request #2314 from wallabag/assets | Nicolas Lœuillet | 2016-10-03 | 16 | -383/+414 |
|\ | | | | | Assets work | ||||
| * | fonts & ligatures | Thomas Citharel | 2016-09-29 | 3 | -13/+3 |
| | | |||||
| * | remove autocomplete and bring fonts through npm | Thomas Citharel | 2016-09-28 | 1 | -1/+6 |
| | | |||||
| * | Assets work | Thomas Citharel | 2016-09-28 | 15 | -369/+405 |
| | | | | | | | | | | | | | | | | | | | | * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231 | ||||
* | | Changed quickstart layout | Nicolas Lœuillet | 2016-10-01 | 1 | -2/+2 |
| | | |||||
* | | Remove CSS class who caused long loading on Firefox | Nicolas Lœuillet | 2016-09-27 | 1 | -1/+0 |
|/ | | | | Fix #2302 #2281 | ||||
* | Remove footer part | Nicolas Lœuillet | 2016-09-13 | 1 | -1/+1 |
| | |||||
* | Merge pull request #2002 from wallabag/feature-display-itemsNumber | Jeremy Benoist | 2016-09-03 | 1 | -0/+4 |
|\ | | | | | Feature display items number | ||||
| * | Display entries number for each category | Nicolas Lœuillet | 2016-08-23 | 1 | -0/+4 |
| | | |||||
* | | Fixed different font-size for labels in config screen | Nicolas Lœuillet | 2016-09-02 | 1 | -0/+4 |
| | | | | | | | | Fix #1788 | ||||
* | | Merge pull request #2252 from wallabag/fix-last-merge | Nicolas Lœuillet | 2016-09-02 | 1 | -1/+1 |
|\ \ | | | | | | | Fixed last merge who caused CSS/JS bugs | ||||
| * | | Fixed last merge who caused CSS/JS bugs | Nicolas Lœuillet | 2016-08-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2242 from wallabag/fix-minor-css | Jeremy Benoist | 2016-09-01 | 2 | -2/+17 |
|\ \ \ | |/ / |/| | | Fix print / article views |