Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | allow to send confirmation emails when creating a new user | Thomas Citharel | 2015-01-24 | 2 | -5/+24 |
| | |||||
* | Merge branch 'dev' of github.com:wallabag/wallabag into dev | Thomas Citharel | 2015-01-24 | 0 | -0/+0 |
|\ | |||||
| * | Merge pull request #1019 from wallabag/revert-1018-fix-share-email-body-dev | Nicolas Lœuillet | 2015-01-22 | 2 | -4/+4 |
| |\ | | | | | | | Revert "URL encode 'via @wallabagapp' email body" | ||||
| | * | Revert "URL encode 'via @wallabagapp' email body" | Nicolas Lœuillet | 2015-01-22 | 2 | -4/+4 |
| |/ | |||||
| * | Merge pull request #1018 from shtrom/fix-share-email-body-dev | Thomas Citharel | 2015-01-22 | 2 | -4/+4 |
| |\ | | | | | | | URL encode 'via @wallabagapp' email body | ||||
| | * | URL encode 'via @wallabagapp' email body | Olivier Mehani | 2015-01-22 | 2 | -4/+4 |
| |/ | | | | | | | Signed-off-by: Olivier Mehani <olivier.mehani@nicta.com.au> | ||||
* / | correct a bug when email was not sended when creating a new user | Thomas Citharel | 2015-01-24 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1013 from wallabag/importtags | Thomas Citharel | 2015-01-20 | 1 | -1/+13 |
|\ | | | | | Importtags | ||||
| * | from spaces to commas | Thomas Citharel | 2015-01-20 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'kaffeeringe-patch-1' into dev | Thomas Citharel | 2015-01-19 | 1 | -1/+13 |
|/| | |||||
| * | Add Tags on Import | kaffeeringe | 2015-01-18 | 1 | -1/+13 |
| | | | | | | | | | | I fixed it! And it works for me. But: I am not too good with programming. So better check the code ;-) | ||||
| * | remove autoload section in composer.json | Nicolas Lœuillet | 2015-01-16 | 1 | -5/+0 |
| | | |||||
| * | Merge pull request #1004 from wallabag/packagist | Nicolas Lœuillet | 2015-01-16 | 1 | -0/+28 |
| |\ | | | | | | | Fixed #993: add wallabag to packagist | ||||
| | * | Fixed #993: add wallabag to packagist | Nicolas Lœuillet | 2015-01-16 | 1 | -0/+28 |
| |/ | |||||
* | | (kind of) fix for #1011 and little corrections for PDF export | Thomas Citharel | 2015-01-19 | 2 | -10/+38 |
| | | |||||
* | | remove autoload section in composer.json | Nicolas Lœuillet | 2015-01-16 | 1 | -5/+0 |
| | | |||||
* | | packagist | Nicolas Lœuillet | 2015-01-16 | 1 | -0/+28 |
| | | |||||
* | | Merge pull request #690 from doc75/log_auth_error | Nicolas Lœuillet | 2015-01-16 | 1 | -0/+2 |
|\ \ | | | | | | | Add message in web server log in case of authentication failure | ||||
| * | | add message in web server log in case of authentication failure to enable ↵ | Guillaume Virlet | 2015-01-05 | 1 | -0/+2 |
| | | | | | | | | | | | | the usage of fail2ban on failed login attempts | ||||
* | | | Merge pull request #1003 from vpmalley/dev | Nicolas Lœuillet | 2015-01-16 | 2 | -5/+12 |
|\ \ \ | | | | | | | | | [RSS] introducing query param 'limit' for max items in RSS feed | ||||
| * | | | [RSS] introducing query param 'limit' to restrict the number of items to ↵ | Vincent Malley | 2015-01-16 | 2 | -5/+12 |
|/ / / | | | | | | | | | | display in RSS feeds. | ||||
* | | | Merge pull request #999 from moparisthebest/additions_dev | Thomas Citharel | 2015-01-13 | 3 | -14/+55 |
|\ \ \ | |/ / |/| | | Miscellaneous additions | ||||
| * | | Add ability to mark all articles from a tag as read | moparisthebest | 2015-01-12 | 3 | -3/+20 |
| | | | |||||
| * | | Add ability to delete all articles matching a search | moparisthebest | 2015-01-12 | 3 | -11/+28 |
| | | | |||||
| * | | Add ability to tag an article on creation | moparisthebest | 2015-01-12 | 1 | -0/+7 |
|/ / | |||||
* | | fixes #963 and use our own readability.php file for mobiClass | Thomas Citharel | 2015-01-03 | 5 | -1183/+7 |
| | | |||||
* | | updated french mo file (see #986) | Thomas Citharel | 2015-01-03 | 1 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into dev | Thomas Citharel | 2015-01-03 | 3 | -3/+7 |
|\| | | | | | | | To get the errors | ||||
| * | Merge pull request #986 from goofy-bz/patch-2 | Nicolas Lœuillet | 2015-01-02 | 1 | -1/+1 |
| |\ | | | | | | | Update fr_FR.utf8.po | ||||
| | * | Update fr_FR.utf8.po | goofy-bz | 2015-01-02 | 1 | -1/+1 |
| |/ | | | | | formulation (trivial) | ||||
| * | Merge pull request #974 from jbfavre/fix_ftrss_call_can_break_import | Thomas Citharel | 2014-12-26 | 1 | -1/+4 |
| |\ | | | | | | | Make call to FTRSS silent to avoid warnings which can break import | ||||
| | * | Make call to FTRSS silent to avoid warnings which can break import | Jean Baptiste Favre | 2014-12-21 | 1 | -1/+4 |
| |/ | |||||
| * | Merge pull request #933 from wallabag/dev1.8.1old1.8.1bis1.8.1b | Nicolas Lœuillet | 2014-11-16 | 1 | -2/+2 |
| |\ | | | | | | | 1.8.1b | ||||
| * \ | Merge pull request #932 from wallabag/dev1.8.1 | Nicolas Lœuillet | 2014-11-15 | 103 | -501/+2186 |
| |\ \ | | | | | | | | | 1.8.1 | ||||
| * \ \ | Merge branch 'dev'1.8.0 | Nicolas Lœuillet | 2014-10-10 | 1012 | -7222/+10188 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into dev | Nicolas Lœuillet | 2014-10-10 | 1 | -1/+2 |
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: index.php | ||||
| * | | | | Merge branch 'fix/securityMaster'1.7.2 | Nicolas Lœuillet | 2014-07-24 | 1 | -42/+42 |
| |\ \ \ \ | |||||
| | * | | | | 1.7.2 | Nicolas Lœuillet | 2014-07-24 | 1 | -34/+34 |
| | | | | | | |||||
| | * | | | | security fix | Maryana Rozhankivska | 2014-07-24 | 1 | -41/+41 |
| |/ / / / | |||||
| * | | | | Merge pull request #761 from wallabag/dev1.7.1 | Nicolas Lœuillet | 2014-07-15 | 17 | -166/+191 |
| |\ \ \ \ | | | | | | | | | | | | | 1.7.1 | ||||
| * \ \ \ \ | Merge pull request #712 from wallabag/dev1.7.0 | Nicolas Lœuillet | 2014-05-29 | 69 | -4591/+12244 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | 1.7, call me "Premium version" | ||||
| * | | | | | | Added PHPePub | tcitworld | 2014-05-16 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #634 from wallabag/dev1.6.1b | Nicolas Lœuillet | 2014-04-11 | 16 | -749/+814 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | 1.6.1 | ||||
| * \ \ \ \ \ \ | Merge pull request #595 from wallabag/dev1.6.11.6.0 | Nicolas Lœuillet | 2014-04-03 | 100 | -2255/+9895 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | wallabag 1.6.0 | ||||
* | \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Thomas Citharel | 2014-12-26 | 1 | -4/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge pull request #975 from wallabag/fixflattrcalls | Nicolas Lœuillet | 2014-12-23 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | don't call flattr if flattr is disabled | ||||
| | * | | | | | | | | | don't call flattr if flattr is disabled | Thomas Citharel | 2014-12-22 | 1 | -4/+7 |
| |/ / / / / / / / / | |||||
* / / / / / / / / / | deleted (again) courgette | Thomas Citharel | 2014-12-26 | 1 | -127/+0 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #971 from wallabag/fix-jquery-installation | Thomas Citharel | 2014-12-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix jquery installation | ||||
| * | | | | | | | | | remove idea files | Nicolas Loeuillet | 2014-12-18 | 1 | -5/+0 |
| | | | | | | | | | |