Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into savewithtags | Thomas Citharel | 2015-02-01 | 21 | -946/+985 |
|\ | |||||
| * | Merge pull request #968 from wallabag/reloadarticle | Thomas Citharel | 2015-02-01 | 7 | -3/+25 |
| |\ | | | | | | | added reload function | ||||
| | * | added reload icon and fixed a bug where random could redirect to deleted ↵ | Thomas Citharel | 2015-02-01 | 2 | -3/+9 |
| | | | | | | | | | | | | articles | ||||
| | * | merge | Thomas Citharel | 2015-02-01 | 10 | -40/+57 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #964 from wallabag/randomarticle | Thomas Citharel | 2015-02-01 | 10 | -38/+57 |
| |\ \ | | | | | | | | | implemented random button | ||||
| | * | | added some icomoon fonts (lots \!) and integrated random button for now | Thomas Citharel | 2015-02-01 | 6 | -38/+35 |
| | | | | |||||
| | * | | Merge branch 'dev' into randomarticle | Thomas Citharel | 2015-02-01 | 21 | -2254/+1069 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | implemented ?random url | Thomas Citharel | 2014-12-22 | 2 | -2/+9 |
| | | | | |||||
| | * | | Merge branch 'dev' into randomarticle | Thomas Citharel | 2014-12-22 | 173 | -215/+74351 |
| | |\ \ | |||||
| | * | | | implemented random button | Thomas Citharel | 2014-12-07 | 6 | -3/+18 |
| | | | | | |||||
| | | | * | Merge branch 'dev' into reloadarticle | Thomas Citharel | 2015-02-01 | 21 | -2255/+1070 |
| | | | |\ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #1026 from wallabag/checkpdo | Thomas Citharel | 2015-02-01 | 2 | -525/+543 |
| |\ \ \ \ | | | | | | | | | | | | | New installation process | ||||
| | * | | | | final adjustments | Thomas Citharel | 2015-02-01 | 1 | -9/+48 |
| | | | | | | |||||
| | * | | | | merge | Thomas Citharel | 2015-01-31 | 2 | -18/+46 |
| | |\ \ \ \ | |||||
| | | * | | | | view improvements & check if at least one pdo driver is available | Thomas Citharel | 2015-01-31 | 2 | -17/+46 |
| | | | | | | | |||||
| | * | | | | | add informations on databases systems | Thomas Citharel | 2015-01-31 | 1 | -2/+41 |
| | |/ / / / | |||||
| | * | | | | changes for 1026 for PDO exceptions | Thomas Citharel | 2015-01-27 | 2 | -139/+129 |
| | | | | | | |||||
| | * | | | | add a information message to fill all the fields | Thomas Citharel | 2015-01-25 | 1 | -0/+15 |
| | | | | | | |||||
| | * | | | | some improvements | Thomas Citharel | 2015-01-25 | 1 | -10/+8 |
| | | | | | | |||||
| | * | | | | wow. Many changes to installation script. Much easier. | Thomas Citharel | 2015-01-25 | 2 | -388/+297 |
| | | | | | | |||||
| * | | | | | Merge pull request #1031 from jlnostr/dev | Thomas Citharel | 2015-01-27 | 2 | -382/+359 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Update german localisation. | ||||
| | * | | | | | Update german localisation. | Julian Oster | 2015-01-27 | 2 | -382/+359 |
| |/ / / / / | |||||
| * | | | | | fix for special caracters in .mobi filenames | Thomas Citharel | 2015-01-26 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | fix for spaces in .mobi filenames | Thomas Citharel | 2015-01-26 | 1 | -0/+3 |
| |/ / / / | |||||
| * | | | | 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 | Thomas Citharel | 2014-12-19 | 173 | -214/+74350 |
| | | | |\ | |||||
| | | | * | | added reload function | Thomas Citharel | 2014-12-13 | 7 | -1/+19 |
| | | |/ / | | |/| | | |||||
* | | | | | forgotted default theme | Thomas Citharel | 2015-01-21 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | can add tags from the saving link popup | Thomas Citharel | 2015-01-21 | 2 | -0/+9 |
|/ / / / | |||||
* | | | | 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 |
| | | | | | |