Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2017-01-26 | 2 | -5/+5 |
|\ | |||||
| * | Fixed possible JS injection via the title edition | Nicolas Lœuillet | 2017-01-17 | 2 | -5/+5 |
| | | |||||
* | | Fix double overlay on expanded right sidenav | Simounet | 2016-12-30 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2725 from lapineige/master | Nicolas Lœuillet | 2016-12-30 | 1 | -1/+1 |
|\ \ | | | | | | | Share to Shaarli - Include tags | ||||
| * | | Share tags to Shaarli - Baggy theme | lapineige | 2016-12-28 | 1 | -1/+1 |
| |/ | |||||
* | | Renamed view_mode by list_mode and hide excerpt | Nicolas Lœuillet | 2016-11-28 | 1 | -5/+5 |
| | | |||||
* | | Hide article text on mobile with list mode | Nicolas Lœuillet | 2016-11-28 | 1 | -1/+1 |
| | | |||||
* | | Added list view | Nicolas Lœuillet | 2016-11-28 | 1 | -2/+4 |
| | | |||||
* | | Added tests | Nicolas Lœuillet | 2016-11-19 | 2 | -1/+3 |
| | | |||||
* | | Added search engine in baggy theme | Nicolas Lœuillet | 2016-11-19 | 3 | -12/+24 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-19 | 4 | -15/+49 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | Added tooltips for baggy theme | Nicolas Lœuillet | 2016-11-17 | 1 | -0/+18 |
| | | |||||
| * | Added help on config screen | Nicolas Lœuillet | 2016-11-17 | 1 | -0/+4 |
| | | |||||
| * | Changed display for material theme | Nicolas Lœuillet | 2016-11-14 | 1 | -1/+3 |
| | | |||||
| * | Added creation date on entries view | Nicolas Lœuillet | 2016-11-14 | 1 | -0/+5 |
| | | |||||
| * | Merge pull request #2460 from wallabag/ui-changes | Nicolas Lœuillet | 2016-11-04 | 2 | -14/+16 |
| |\ | | | | | | | UI Changes | ||||
| | * | Re-add bottom pagination | Jeremy Benoist | 2016-10-22 | 2 | -14/+16 |
| | | | | | | | | | | | | Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template | ||||
* | | | Added http_status in Entry entity | Nicolas Lœuillet | 2016-11-18 | 1 | -0/+7 |
| | | | |||||
* | | | Added a configuration to define the redirection after archiving an entry | Nicolas Lœuillet | 2016-11-16 | 1 | -0/+8 |
| | | | | | | | | | | | | Fix #496 | ||||
* | | | Added CSS class on links | Nicolas Lœuillet | 2016-11-16 | 1 | -3/+3 |
| | | | |||||
* | | | Added unmark.it sharing | Nicolas Lœuillet | 2016-11-09 | 1 | -0/+1 |
| | | | | | | | | | | | | Fix #668 | ||||
* | | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-03 | 1 | -8/+16 |
|\| | | |||||
| * | | Fixed entries export filtered with a tag | Nicolas Lœuillet | 2016-10-29 | 1 | -7/+11 |
| | | | | | | | | | | | | Fix #2505 | ||||
| * | | Renamed variable for page title | Nicolas Lœuillet | 2016-10-26 | 1 | -3/+3 |
| | | | |||||
| * | | Added tag label in the page title | Nicolas Lœuillet | 2016-10-26 | 1 | -1/+5 |
| |/ | | | | | | | Fix #2472 | ||||
* | | Fixed review | Nicolas Lœuillet | 2016-10-31 | 1 | -7/+7 |
| | | |||||
* | | Added translations and baggy part | Nicolas Lœuillet | 2016-10-31 | 1 | -0/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-24 | 1 | -14/+14 |
|\| | |||||
| * | Fix baggy on small screens | Thomas Citharel | 2016-10-15 | 1 | -14/+14 |
| | | |||||
* | | Add baggy reset part | Jeremy Benoist | 2016-10-22 | 1 | -0/+22 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-11 | 2 | -2/+1 |
|\| | |||||
| * | Optimize the way tag list is rendered | Jeremy Benoist | 2016-10-09 | 1 | -1/+1 |
| | | | | | | | | | | | | 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 | ||||
| * | Show number of annotations instead of nbAnnotations placeholder | Krzysztof Szafranek | 2016-10-09 | 1 | -1/+0 |
| | | | | | | | | When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number. | ||||
* | | Better display and description | Jeremy Benoist | 2016-10-08 | 1 | -3/+9 |
| | | | | | | | | Confirmation message isn’t required since it is written in the delete description | ||||
* | | Changed tests | Nicolas Lœuillet | 2016-10-08 | 1 | -1/+1 |
| | | |||||
* | | Added check if there is only one user | Nicolas Lœuillet | 2016-10-08 | 1 | -0/+3 |
|/ | | | | Added translations and documentation | ||||
* | better tags on baggy | Thomas Citharel | 2016-10-04 | 2 | -4/+6 |
| | |||||
* | Fixed calendar icon position with baggy theme | Nicolas Lœuillet | 2016-10-04 | 1 | -1/+2 |
| | |||||
* | Basically, fix everything | Thomas Citharel | 2016-10-03 | 1 | -10/+12 |
| | | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed | ||||
* | Merge pull request #2314 from wallabag/assets | Nicolas Lœuillet | 2016-10-03 | 2 | -20/+2 |
|\ | | | | | Assets work | ||||
| * | Assets work | Thomas Citharel | 2016-09-28 | 2 | -20/+2 |
| | | | | | | | | | | | | | | | | | | | | * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231 | ||||
* | | Cleanup & add link on baggy menu | Jeremy Benoist | 2016-10-02 | 1 | -0/+1 |
| | | |||||
* | | Add users management UI | Jeremy Benoist | 2016-10-02 | 1 | -42/+0 |
| | | | | | | | | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) | ||||
* | | Add ability to edit a tagging rule | Jeremy Benoist | 2016-10-01 | 1 | -0/+1 |
| | | |||||
* | | Customize errors templates | Jeremy Benoist | 2016-10-01 | 1 | -0/+24 |
| | | | | | | | | All error goes to the same template which only display the error message and the status code. | ||||
* | | Removed duplicated templates files | Nicolas Lœuillet | 2016-09-30 | 9 | -483/+1 |
|/ | |||||
* | Merge pull request #2301 from wallabag/fix-rss-feeds | Jeremy Benoist | 2016-09-22 | 1 | -9/+1 |
|\ | | | | | fix feeds not syncing on android app | ||||
| * | fix feeds not syncing on android app | Thomas Citharel | 2016-09-21 | 1 | -9/+1 |
| | | |||||
* | | Merge pull request #1941 from wallabag/v2-asynchronous-jobs | Jeremy Benoist | 2016-09-19 | 1 | -0/+12 |
|\ \ | | | | | | | Use asynchronous jobs for imports | ||||
| * | | Moved Pocket token to user config | Jeremy Benoist | 2016-09-16 | 1 | -0/+12 |
| | | |