Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added CSS class on links | Nicolas Lœuillet | 2016-11-16 | 1 | -4/+4 |
| | |||||
* | Added unmark.it sharing | Nicolas Lœuillet | 2016-11-09 | 1 | -0/+8 |
| | | | | Fix #668 | ||||
* | Added new tag form in mobile view for Material theme | Nicolas Lœuillet | 2016-11-08 | 2 | -12/+5 |
| | | | | Fix #2376 | ||||
* | 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 | -5/+5 |
| | | |||||
| * | 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 | -1/+1 |
| | | |||||
* | | Added translations and baggy part | Nicolas Lœuillet | 2016-10-31 | 1 | -2/+2 |
| | | |||||
* | | 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 | 1 | -5/+5 |
|\| | |||||
| * | Fix tabs on material | Thomas Citharel | 2016-10-15 | 1 | -5/+5 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | 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 | 4 | -8/+15 |
|\| | |||||
| * | Optimize the way tag list is rendered | Jeremy Benoist | 2016-10-09 | 1 | -5/+12 |
| | | | | | | | | | | | | 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 | ||||
| * | Fix few invalid HTML tags | Krzysztof Szafranek | 2016-10-09 | 3 | -3/+3 |
| | | |||||
* | | Better display and description | Jeremy Benoist | 2016-10-08 | 1 | -4/+4 |
| | | | | | | | | 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 | 1 | -1/+1 |
| | | |||||
* | | Added check if there is only one user | Nicolas Lœuillet | 2016-10-08 | 1 | -1/+4 |
| | | | | | | | | Added translations and documentation | ||||
* | | work | Thomas Citharel | 2016-10-08 | 1 | -0/+1 |
|/ | |||||
* | better tags on material | Thomas Citharel | 2016-10-05 | 2 | -5/+6 |
| | |||||
* | Fix icon position | Thomas Citharel | 2016-10-04 | 1 | -3/+6 |
| | |||||
* | 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 | 1 | -11/+13 |
| | | | | | | * 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 | 1 | -1/+1 |
|\ | | | | | Assets work | ||||
| * | Assets work | Thomas Citharel | 2016-09-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231 | ||||
* | | Add users management UI | Jeremy Benoist | 2016-10-02 | 2 | -51/+7 |
| | | | | | | | | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) | ||||
* | | Merge pull request #2324 from wallabag/edit-tagging-rule | Jeremy Benoist | 2016-10-02 | 1 | -0/+3 |
|\ \ | | | | | | | Add ability to edit a tagging rule | ||||
| * | | Add ability to edit a tagging rule | Jeremy Benoist | 2016-10-01 | 1 | -0/+3 |
| | | | |||||
* | | | 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 | 1 | -0/+30 |
|/ / | | | | | | | 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 | -528/+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 | 2 | -0/+14 |
|\ \ | | | | | | | Use asynchronous jobs for imports | ||||
| * | | Moved Pocket token to user config | Jeremy Benoist | 2016-09-16 | 1 | -0/+12 |
| | | | |||||
| * | | 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 | 1 | -2/+7 |
| | | | | | | | | | | | | 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 | ||||
| * | | | Fixed last merge who caused CSS/JS bugs | Nicolas Lœuillet | 2016-08-30 | 1 | -3/+1 |
| | | | |