Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | change jquery path into installation script | Nicolas Loeuillet | 2014-12-18 | 2 | -1/+6 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #923 from wallabag/add-html-doc | Thomas Citharel | 2014-12-17 | 87 | -5/+6443 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | add HTML documentation | |||||
| * | | | | | | | | | link to doc inside wallabag:about | Thomas Citharel | 2014-12-17 | 2 | -6/+16 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'add-html-doc' of https://github.com/wallabag/wallabag into ↵ | Thomas Citharel | 2014-12-17 | 86 | -0/+6428 | |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation-integration | |||||
| * | | | | | | | | | upgrade documentation | Nicolas Lœuillet | 2014-11-24 | 48 | -219/+2677 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add link to documentation into installation | Nicolas Lœuillet | 2014-11-24 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add HTML documentation | Nicolas Lœuillet | 2014-11-04 | 65 | -0/+3969 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | enable showing or not for epub/mobi/pdf export buttons | Thomas Citharel | 2014-12-14 | 5 | -22/+30 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'tcitworld-ebook' into dev | Thomas Citharel | 2014-12-14 | 84 | -208/+67898 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | merge epub with all the dev evolutions | Thomas Citharel | 2014-12-14 | 84 | -208/+67898 | |
|/| | | | | | | | | | | ||||||
| * | | | | | | | | | | deleting send to kindle function | tcit | 2014-09-28 | 2 | -69/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | add extension for pdf file | tcit | 2014-09-28 | 1 | -3/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | offering download for pdf file and comment in code | tcit | 2014-09-27 | 1 | -1/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | revert routing bad deleting | tcit | 2014-09-27 | 1 | -2/+15 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | get up to date | tcit | 2014-09-27 | 1 | -52/+40 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | changed mpdf with tcpdf | tcit | 2014-09-27 | 125 | -97980/+61819 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | removed unnecessary fonts | Thomas Citharel | 2014-08-21 | 51 | -699/+0 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | removing examples for mpdf | tcitworld | 2014-08-04 | 119 | -21370/+0 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | little fix in locale files | tcit | 2014-08-03 | 2 | -3/+2 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | more translations | tcit | 2014-07-26 | 5 | -6/+121 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | translation stuff (en & fr done) | tcit | 2014-07-26 | 8 | -33/+183 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | little better | tcit | 2014-07-26 | 1 | -23/+53 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | bug with extension in the filename | tcit | 2014-07-25 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | send2kindle | tcit | 2014-07-25 | 2 | -4/+59 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | mobi (not tested on actual device) and pdf working | tcit | 2014-07-25 | 1 | -7/+19 | |
| | | | | | | | | | | |