aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* 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
| | |
| * | Add ability to delete all articles matching a searchmoparisthebest2015-01-123-11/+28
| | |
| * | Add ability to tag an article on creationmoparisthebest2015-01-121-0/+7
|/ /
* | fixes #963 and use our own readability.php file for mobiClassThomas Citharel2015-01-035-1183/+7
| |
* | updated french mo file (see #986)Thomas Citharel2015-01-031-0/+0
| |
* | Merge branch 'master' into devThomas Citharel2015-01-033-3/+7
|\| | | | | | | To get the errors
| * Merge pull request #986 from goofy-bz/patch-2Nicolas Lœuillet2015-01-021-1/+1
| |\ | | | | | | Update fr_FR.utf8.po
| | * Update fr_FR.utf8.pogoofy-bz2015-01-021-1/+1
| |/ | | | | formulation (trivial)
| * Merge pull request #974 from jbfavre/fix_ftrss_call_can_break_importThomas Citharel2014-12-261-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 importJean Baptiste Favre2014-12-211-1/+4
| |/
| * Merge pull request #933 from wallabag/dev1.8.1old1.8.1bis1.8.1bNicolas Lœuillet2014-11-161-2/+2
| |\ | | | | | | 1.8.1b
| * \ Merge pull request #932 from wallabag/dev1.8.1Nicolas Lœuillet2014-11-15103-501/+2186
| |\ \ | | | | | | | | 1.8.1
| * \ \ Merge branch 'dev'1.8.0Nicolas Lœuillet2014-10-101012-7222/+10188
| |\ \ \
| | * \ \ Merge branch 'master' into devNicolas Lœuillet2014-10-101-1/+2
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: index.php
| * | | | Merge branch 'fix/securityMaster'1.7.2Nicolas Lœuillet2014-07-241-42/+42
| |\ \ \ \
| | * | | | 1.7.2Nicolas Lœuillet2014-07-241-34/+34
| | | | | |
| | * | | | security fixMaryana Rozhankivska2014-07-241-41/+41
| |/ / / /
| * | | | Merge pull request #761 from wallabag/dev1.7.1Nicolas Lœuillet2014-07-1517-166/+191
| |\ \ \ \ | | | | | | | | | | | | 1.7.1
| * \ \ \ \ Merge pull request #712 from wallabag/dev1.7.0Nicolas Lœuillet2014-05-2969-4591/+12244
| |\ \ \ \ \ | | | | | | | | | | | | | | 1.7, call me "Premium version"
| * | | | | | Added PHPePubtcitworld2014-05-161-1/+2
| | | | | | |
| * | | | | | Merge pull request #634 from wallabag/dev1.6.1bNicolas Lœuillet2014-04-1116-749/+814
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | 1.6.1
| * \ \ \ \ \ \ Merge pull request #595 from wallabag/dev1.6.11.6.0Nicolas Lœuillet2014-04-03100-2255/+9895
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | wallabag 1.6.0
* | \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2014-12-261-4/+7
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #975 from wallabag/fixflattrcallsNicolas Lœuillet2014-12-231-4/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | don't call flattr if flattr is disabled
| | * | | | | | | | | don't call flattr if flattr is disabledThomas Citharel2014-12-221-4/+7
| |/ / / / / / / / /
* / / / / / / / / / deleted (again) courgetteThomas Citharel2014-12-261-127/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #971 from wallabag/fix-jquery-installationThomas Citharel2014-12-191-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix jquery installation
| * | | | | | | | | remove idea filesNicolas Loeuillet2014-12-181-5/+0
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 17:03:55 +0000