aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into savewithtagsThomas Citharel2015-02-0121-946/+985
|\
| * Merge pull request #968 from wallabag/reloadarticleThomas Citharel2015-02-017-3/+25
| |\ | | | | | | added reload function
| | * added reload icon and fixed a bug where random could redirect to deleted ↵Thomas Citharel2015-02-012-3/+9
| | | | | | | | | | | | articles
| | * mergeThomas Citharel2015-02-0110-40/+57
| | |\ | | |/ | |/|
| * | Merge pull request #964 from wallabag/randomarticleThomas Citharel2015-02-0110-38/+57
| |\ \ | | | | | | | | implemented random button
| | * | added some icomoon fonts (lots \!) and integrated random button for nowThomas Citharel2015-02-016-38/+35
| | | |
| | * | Merge branch 'dev' into randomarticleThomas Citharel2015-02-0121-2254/+1069
| | |\ \ | | |/ / | |/| |
| | * | implemented ?random urlThomas Citharel2014-12-222-2/+9
| | | |
| | * | Merge branch 'dev' into randomarticleThomas Citharel2014-12-22173-215/+74351
| | |\ \
| | * | | implemented random buttonThomas Citharel2014-12-076-3/+18
| | | | |
| | | | * Merge branch 'dev' into reloadarticleThomas Citharel2015-02-0121-2255/+1070
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #1026 from wallabag/checkpdoThomas Citharel2015-02-012-525/+543
| |\ \ \ \ | | | | | | | | | | | | New installation process
| | * | | | final adjustmentsThomas Citharel2015-02-011-9/+48
| | | | | |
| | * | | | mergeThomas Citharel2015-01-312-18/+46
| | |\ \ \ \
| | | * | | | view improvements & check if at least one pdo driver is availableThomas Citharel2015-01-312-17/+46
| | | | | | |
| | * | | | | add informations on databases systemsThomas Citharel2015-01-311-2/+41
| | |/ / / /
| | * | | | changes for 1026 for PDO exceptionsThomas Citharel2015-01-272-139/+129
| | | | | |
| | * | | | add a information message to fill all the fieldsThomas Citharel2015-01-251-0/+15
| | | | | |
| | * | | | some improvementsThomas Citharel2015-01-251-10/+8
| | | | | |
| | * | | | wow. Many changes to installation script. Much easier.Thomas Citharel2015-01-252-388/+297
| | | | | |
| * | | | | Merge pull request #1031 from jlnostr/devThomas Citharel2015-01-272-382/+359
| |\ \ \ \ \ | | | | | | | | | | | | | | Update german localisation.
| | * | | | | Update german localisation.Julian Oster2015-01-272-382/+359
| |/ / / / /
| * | | | | fix for special caracters in .mobi filenamesThomas Citharel2015-01-261-2/+2
| | | | | |
| * | | | | fix for spaces in .mobi filenamesThomas Citharel2015-01-261-0/+3
| |/ / / /
| * | | | Merge branch 'dev' of github.com:wallabag/wallabag into devThomas Citharel2015-01-240-0/+0
| |\ \ \ \
| | * \ \ \ Merge pull request #1019 from wallabag/revert-1018-fix-share-email-body-devNicolas Lœuillet2015-01-222-4/+4
| | |\ \ \ \ | | | | | | | | | | | | | | Revert "URL encode 'via @wallabagapp' email body"
| | | * | | | Revert "URL encode 'via @wallabagapp' email body"Nicolas Lœuillet2015-01-222-4/+4
| | |/ / / /
| | * | | | Merge pull request #1018 from shtrom/fix-share-email-body-devThomas Citharel2015-01-222-4/+4
| | |\ \ \ \ | | | | | | | | | | | | | | URL encode 'via @wallabagapp' email body
| | | * | | | URL encode 'via @wallabagapp' email bodyOlivier Mehani2015-01-222-4/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Mehani <olivier.mehani@nicta.com.au>
| * / / / / correct a bug when email was not sended when creating a new userThomas Citharel2015-01-241-1/+1
| |/ / / /
| | | | * mergeThomas Citharel2014-12-19173-214/+74350
| | | | |\
| | | | * | added reload functionThomas Citharel2014-12-137-1/+19
| | | |/ / | | |/| |
* | | | | forgotted default themeThomas Citharel2015-01-211-0/+2
| | | | |
* | | | | can add tags from the saving link popupThomas Citharel2015-01-212-0/+9
|/ / / /
* | | | Merge pull request #1013 from wallabag/importtagsThomas Citharel2015-01-201-1/+13
|\ \ \ \ | | | | | | | | | | Importtags
| * | | | from spaces to commasThomas Citharel2015-01-201-1/+1
| | | | |
| * | | | Merge branch 'kaffeeringe-patch-1' into devThomas Citharel2015-01-191-1/+13
|/| | | |
| * | | | Add Tags on Importkaffeeringe2015-01-181-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.jsonNicolas Lœuillet2015-01-161-5/+0
| | | | |
| * | | | Merge pull request #1004 from wallabag/packagistNicolas Lœuillet2015-01-161-0/+28
| |\ \ \ \ | | | | | | | | | | | | Fixed #993: add wallabag to packagist
| | * | | | Fixed #993: add wallabag to packagistNicolas Lœuillet2015-01-161-0/+28
| |/ / / /
* | | | | (kind of) fix for #1011 and little corrections for PDF exportThomas Citharel2015-01-192-10/+38
| | | | |
* | | | | remove autoload section in composer.jsonNicolas Lœuillet2015-01-161-5/+0
| | | | |
* | | | | packagistNicolas Lœuillet2015-01-161-0/+28
| | | | |
* | | | | Merge pull request #690 from doc75/log_auth_errorNicolas Lœuillet2015-01-161-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 Virlet2015-01-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | the usage of fail2ban on failed login attempts
* | | | | | Merge pull request #1003 from vpmalley/devNicolas Lœuillet2015-01-162-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 Malley2015-01-162-5/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | display in RSS feeds.
* | | | | | Merge pull request #999 from moparisthebest/additions_devThomas Citharel2015-01-133-14/+55
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Miscellaneous additions
| * | | | | Add ability to mark all articles from a tag as readmoparisthebest2015-01-123-3/+20
| | | | | |