Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-03 | 3 | -17/+33 |
|\ | |||||
| * | Fixed entries export filtered with a tag | Nicolas Lœuillet | 2016-10-29 | 2 | -14/+22 |
| | | | | | | | | Fix #2505 | ||||
| * | Renamed variable for page title | Nicolas Lœuillet | 2016-10-26 | 3 | -9/+9 |
| | | |||||
| * | Added tag label in the page title | Nicolas Lœuillet | 2016-10-26 | 3 | -3/+11 |
| | | | | | | | | Fix #2472 | ||||
* | | Fixed review | Nicolas Lœuillet | 2016-10-31 | 2 | -8/+8 |
| | | |||||
* | | Added translations and baggy part | Nicolas Lœuillet | 2016-10-31 | 2 | -2/+12 |
| | | |||||
* | | Added QRCode and link to configure android application | Nicolas Lœuillet | 2016-10-31 | 1 | -0/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-24 | 4 | -25/+26 |
|\| | |||||
| * | Update Twitter cards description | Jeremy Benoist | 2016-10-21 | 1 | -1/+1 |
| | | |||||
| * | 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 |
| |/ | |||||
* | | Add baggy reset part | Jeremy Benoist | 2016-10-22 | 1 | -0/+22 |
| | | |||||
* | | Add ability to reset some datas | Jeremy Benoist | 2016-10-22 | 1 | -0/+16 |
| | | | | | | | | | | | | - annotations - tags - entries | ||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-11 | 8 | -14/+25 |
|\| | |||||
| * | 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 |
| |/ | |||||
* | | Better display and description | Jeremy Benoist | 2016-10-08 | 2 | -7/+13 |
| | | | | | | | | Confirmation message isn’t required since it is written in the delete description | ||||
* | | Logout user before deleting it | Jeremy Benoist | 2016-10-08 | 1 | -1/+9 |
| | | | | | | | | And add a smal description | ||||
* | | Changed tests | Nicolas Lœuillet | 2016-10-08 | 2 | -2/+2 |
| | | |||||
* | | Added check if there is only one user | Nicolas Lœuillet | 2016-10-08 | 2 | -1/+7 |
| | | | | | | | | Added translations and documentation | ||||
* | | work | Thomas Citharel | 2016-10-08 | 1 | -0/+1 |
|/ | |||||
* | 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 |