Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2455 from wallabag/fix-material-config-tabs | Jeremy Benoist | 2016-10-16 | 2 | -10/+10 |
|\ | | | | | Fix tabs on material | ||||
| * | Fix tabs on material | Thomas Citharel | 2016-10-15 | 2 | -10/+10 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Merge pull request #2454 from wallabag/fix-baggy-small-width | Jeremy Benoist | 2016-10-16 | 1 | -14/+14 |
|\ \ | | | | | | | Fix baggy display on small screens | ||||
| * | | Fix baggy on small screens | Thomas Citharel | 2016-10-15 | 1 | -14/+14 |
| |/ | |||||
* / | add link to German documentation in about page | Sven Fischer | 2016-10-16 | 1 | -0/+1 |
|/ | |||||
* | Fixed Twitter Cards by adding a description tag | Nicolas Lœuillet | 2016-10-10 | 1 | -0/+1 |
| | |||||
* | Added support of Twitter Cards for public articles | Nicolas Lœuillet | 2016-10-10 | 1 | -3/+7 |
| | |||||
* | Merge pull request #2414 from szafranek/bugfix-bookmarklet | Jeremy Benoist | 2016-10-10 | 1 | -1/+1 |
|\ | | | | | Remove automatic closing of the window from bookmarklet | ||||
| * | Remove automatic closing of the window from bookmarklet | Krzysztof Szafranek | 2016-10-09 | 1 | -1/+1 |
| | | |||||
* | | Optimize the way tag list is rendered | Jeremy Benoist | 2016-10-09 | 2 | -6/+13 |
|/ | | | | | | 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 | ||||
* | Merge pull request #2406 from szafranek/bugfix-number-of-annotations | Jeremy Benoist | 2016-10-09 | 1 | -1/+0 |
|\ | | | | | Show number of annotations instead of nbAnnotations placeholder | ||||
| * | 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. | ||||
* | | Fix few invalid HTML tags | Krzysztof Szafranek | 2016-10-09 | 3 | -3/+3 |
|/ | |||||
* | Added default picture if preview picture is null | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+2 |
| | |||||
* | Fixed review | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+1 |
| | |||||
* | Added OpenGraph support for public articles | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+8 |
| | | | | Fix #2289 | ||||
* | better tags on material | Thomas Citharel | 2016-10-05 | 2 | -5/+6 |
| | |||||
* | better tags on baggy | Thomas Citharel | 2016-10-04 | 2 | -4/+6 |
| | |||||
* | Fix icon position | Thomas Citharel | 2016-10-04 | 1 | -3/+6 |
| | |||||
* | Fixed calendar icon position with baggy theme | Nicolas Lœuillet | 2016-10-04 | 1 | -1/+2 |
| | |||||
* | Fixed icon position in share menu | Nicolas Lœuillet | 2016-10-04 | 1 | -7/+6 |
| | |||||
* | fix icons | Thomas Citharel | 2016-10-04 | 1 | -8/+6 |
| | |||||
* | Basically, fix everything | Thomas Citharel | 2016-10-03 | 2 | -21/+25 |
| | | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed | ||||
* | Fixed CSS for quickstart links | Nicolas Lœuillet | 2016-10-03 | 1 | -1/+1 |
| | |||||
* | Merge pull request #2314 from wallabag/assets | Nicolas Lœuillet | 2016-10-03 | 3 | -21/+3 |
|\ | | | | | Assets work | ||||
| * | Assets work | Thomas Citharel | 2016-09-28 | 3 | -21/+3 |
| | | | | | | | | | | | | | | | | | | | | * 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 | 3 | -93/+7 |
| | | | | | | | | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) | ||||
* | | Merge pull request #2326 from wallabag/update-quickstart | Jeremy Benoist | 2016-10-02 | 1 | -50/+92 |
|\ \ | | | | | | | Changed quickstart layout | ||||
| * | | Changed quickstart layout | Nicolas Lœuillet | 2016-10-01 | 1 | -50/+92 |
| | | | |||||
* | | | Merge pull request #2324 from wallabag/edit-tagging-rule | Jeremy Benoist | 2016-10-02 | 2 | -0/+4 |
|\ \ \ | | | | | | | | | Add ability to edit a tagging rule | ||||
| * | | | Add ability to edit a tagging rule | Jeremy Benoist | 2016-10-01 | 2 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #2323 from wallabag/footer-stats | Jeremy Benoist | 2016-10-02 | 1 | -2/+13 |
|\ \ \ \ | |/ / / |/| | | | Add simple stats in footer | ||||
| * | | | Add simple stats in footer | Jeremy Benoist | 2016-10-01 | 1 | -2/+13 |
| |/ / | |||||
* / / | Customize errors templates | Jeremy Benoist | 2016-10-01 | 2 | -0/+54 |
|/ / | | | | | | | 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 | 22 | -485/+10 |
|/ | |||||
* | Merge pull request #2301 from wallabag/fix-rss-feeds | Jeremy Benoist | 2016-09-22 | 2 | -18/+2 |
|\ | | | | | fix feeds not syncing on android app | ||||
| * | fix feeds not syncing on android app | Thomas Citharel | 2016-09-21 | 2 | -18/+2 |
| | | |||||
* | | Merge pull request #1941 from wallabag/v2-asynchronous-jobs | Jeremy Benoist | 2016-09-19 | 3 | -0/+26 |
|\ \ | | | | | | | Use asynchronous jobs for imports | ||||
| * | | Moved Pocket token to user config | Jeremy Benoist | 2016-09-16 | 2 | -0/+24 |
| | | | |||||
| * | | Display how many messages are queue | Jeremy Benoist | 2016-09-13 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | - update the docker-composer to add Redis - add migrations | ||||
* | | | Fixed label for mark as read link in entry view | Nicolas Lœuillet | 2016-09-15 | 2 | -3/+14 |
| | | | | | | | | | | | | Fix #2286 | ||||
* | | | Remove FooterController | Nicolas Lœuillet | 2016-09-15 | 2 | -9/+8 |
| | | | |||||
* | | | Remove footer part | Nicolas Lœuillet | 2016-09-13 | 1 | -33/+0 |
|/ / | |||||
* | | Added tags counter in sidebar (material theme) | Nicolas Lœuillet | 2016-09-04 | 1 | -1/+1 |
| | | |||||
* | | Remove Twig globals | Jeremy Benoist | 2016-09-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | Twig Global function are called globally. This means even on a query to the api. Using a function we can decide when we want to call it. Also, remove previous `COUNT(e.id)` since it doesn't work on PostgreSQL ... | ||||
* | | Merge pull request #2002 from wallabag/feature-display-itemsNumber | Jeremy Benoist | 2016-09-03 | 1 | -4/+4 |
|\ \ | | | | | | | Feature display items number | ||||
| * | | Display entries number for each category | Nicolas Lœuillet | 2016-08-23 | 1 | -4/+4 |
| | | | |||||
* | | | Fixed different font-size for labels in config screen | Nicolas Lœuillet | 2016-09-02 | 1 | -0/+2 |
| | | | | | | | | | | | | Fix #1788 | ||||
* | | | Merge pull request #2252 from wallabag/fix-last-merge | Nicolas Lœuillet | 2016-09-02 | 1 | -3/+1 |
|\ \ \ | | | | | | | | | Fixed last merge who caused CSS/JS bugs |