Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update after previous merge | Jeremy Benoist | 2016-01-02 | 1 | -30/+0 |
| | | | | PR #1443 was merged into this branch to handle all import type in the same place. | ||||
* | add docs for Import feature | Nicolas Lœuillet | 2016-01-02 | 1 | -13/+20 |
| | |||||
* | form to upload file | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+23 |
| | |||||
* | create controller to launch import command | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+1 |
| | |||||
* | Backport all icomoon from v1 | Jeremy Benoist | 2015-12-30 | 6 | -37/+42 |
| | | | | And add a reload icon | ||||
* | Ability to reload an entry | Jeremy Benoist | 2015-12-30 | 2 | -0/+9 |
| | | | | | | Could be useful when we want to update the content or when the content failed to be fetched. Fix #1503 | ||||
* | Add custom email for 2FA | Jeremy Benoist | 2015-12-29 | 2 | -0/+14 |
| | | | | Related #1490 | ||||
* | Merge pull request #1478 from K-Phoen/rule-based-tags | Jeremy Benoist | 2015-12-06 | 2 | -2/+183 |
|\ | | | | | Rule based tags | ||||
| * | Clean the tagging rule creation form | Kévin Gomez | 2015-11-16 | 1 | -2/+2 |
| | | |||||
| * | Document the matches operator in the FAQ | Kévin Gomez | 2015-11-13 | 1 | -2/+7 |
| | | |||||
| * | Improve the tagging rules documentation | Kévin Gomez | 2015-11-11 | 1 | -3/+47 |
| | | |||||
| * | Update baggy theme | Kévin Gomez | 2015-11-11 | 2 | -2/+35 |
| | | |||||
| * | Provide a way to delete tagging rules | Kévin Gomez | 2015-11-11 | 1 | -0/+3 |
| | | |||||
| * | Rename the « Tags » tab to « Tagging rules » | Kévin Gomez | 2015-11-11 | 1 | -1/+1 |
| | | |||||
| * | Add a table explaining the available variables | Kévin Gomez | 2015-11-11 | 1 | -1/+56 |
| | | |||||
| * | Display the tagging rules in the config | Kévin Gomez | 2015-11-11 | 1 | -0/+12 |
| | | |||||
| * | Add a form to create tagging rules | Kévin Gomez | 2015-11-11 | 1 | -1/+30 |
| | | |||||
* | | Typo | Thomas Citharel | 2015-12-04 | 1 | -1/+1 |
|/ | |||||
* | add json & xml | Thomas Citharel | 2015-11-09 | 2 | -11/+13 |
| | |||||
* | Start work on export | Thomas Citharel | 2015-11-09 | 4 | -4/+33 |
| | | | | | | | | For now: - ebook - mobi - pdf - csv | ||||
* | Fix form_enctype deprecation | Jeremy Benoist | 2015-11-07 | 2 | -14/+10 |
| | | | | Use form_start instead | ||||
* | Merge pull request #1484 from wallabag/v2-2factor-auth | Jeremy Benoist | 2015-10-15 | 2 | -0/+20 |
|\ | | | | | 2factor authentication via email | ||||
| * | move 2factor activation in parameters | Nicolas Lœuillet | 2015-10-15 | 2 | -0/+4 |
| | | |||||
| * | 2factor authentication via email | Nicolas Lœuillet | 2015-10-13 | 2 | -0/+16 |
| | | |||||
* | | Other improvements | Alexandr Danilov | 2015-10-09 | 2 | -1/+9 |
| | | |||||
* | | Icons in footer | Alexandr Danilov | 2015-10-09 | 6 | -17/+109 |
|/ | |||||
* | Merge pull request #1472 from wallabag/v2-clean-views | Jeremy Benoist | 2015-10-08 | 4 | -211/+0 |
|\ | | | | | fix #1470: clean material theme | ||||
| * | fix #1470: clean material theme | Nicolas Lœuillet | 2015-10-08 | 4 | -211/+0 |
| | | |||||
* | | implement bookmarklet | Nicolas Lœuillet | 2015-10-08 | 3 | -3/+5 |
|/ | |||||
* | Merge pull request #1436 from wallabag/v2-register | Jeremy Benoist | 2015-10-06 | 11 | -133/+41 |
|\ | | | | | Public registration & oAuth2 \o/ | ||||
| * | move css | Nicolas Lœuillet | 2015-10-05 | 1 | -0/+4 |
| | | |||||
| * | material design for register/login/recover pages | Nicolas Lœuillet | 2015-10-05 | 6 | -123/+5 |
| | | |||||
| * | remove old implementation for login/register/recover | Nicolas Lœuillet | 2015-10-03 | 3 | -4/+3 |
| | | |||||
| * | * rename AuthenticationListener | Nicolas Lœuillet | 2015-10-03 | 1 | -0/+1 |
| | | | | | | | | * add tests | ||||
| * | * public registration | Nicolas Lœuillet | 2015-10-03 | 3 | -7/+29 |
| | | | | | | | | | | * remove WSSE implementation * add oAuth2 implementation | ||||
* | | Merge pull request #1461 from wallabag/v2-test-for-www | Jeremy Benoist | 2015-10-06 | 2 | -4/+4 |
|\ \ | | | | | | | fix #1433: add test for removeWww Twig Extension | ||||
| * | | add test for removeWww Twig Extension | Nicolas Lœuillet | 2015-10-06 | 2 | -4/+4 |
| |/ | |||||
* | | restore blue color | Nicolas Lœuillet | 2015-10-06 | 2 | -10/+3 |
| | | |||||
* | | fix #1457 | Thomas Citharel | 2015-10-05 | 5 | -8330/+8453 |
|/ | |||||
* | typo | Thomas Citharel | 2015-10-01 | 1 | -1/+1 |
| | |||||
* | restore footer | Nicolas Lœuillet | 2015-10-01 | 1 | -0/+37 |
| | |||||
* | french translation | Nicolas Lœuillet | 2015-10-01 | 2 | -40/+4 |
| | |||||
* | flash messages translation | Nicolas Lœuillet | 2015-09-30 | 1 | -1/+1 |
| | |||||
* | french translation | Nicolas Lœuillet | 2015-09-30 | 6 | -16/+15 |
| | |||||
* | add french translation | Nicolas Lœuillet | 2015-09-30 | 1 | -15/+18 |
| | |||||
* | Merge pull request #1437 from wallabag/v2-clean-material | Jeremy Benoist | 2015-09-30 | 15 | -51/+2 |
|\ | | | | | some cleanup on material theme | ||||
| * | some cleanup on material theme | Nicolas Lœuillet | 2015-09-29 | 15 | -51/+2 |
| | | |||||
* | | remove www. on entries view | Nicolas Lœuillet | 2015-09-29 | 2 | -2/+2 |
|/ | |||||
* | Entries filter on language | Jeremy Benoist | 2015-09-23 | 2 | -6/+12 |
| | | | | + updated deps | ||||
* | Remove tab from baggy css | Jeremy Benoist | 2015-09-23 | 1 | -51/+51 |
| | | | | And add a border left on the filter slider |