Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into randomarticle | Thomas Citharel | 2014-12-22 | 173 | -215/+74351 |
|\ | |||||
| * | 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 |
| | | | | |||||
| | * | | updated mpdf to 5.7.2 | tcit | 2014-07-24 | 6 | -245/+462 |
| | | | | |||||
| | * | | use directly MOBIClass | tcit | 2014-07-24 | 47 | -1547/+305 |
| | | | | |||||
| | * | | add mobi and pdf to routing | tcit | 2014-07-24 | 1 | -1/+7 |
| | | | | |||||
| | * | | from epub to all kind of ebooks | tcit | 2014-07-24 | 2 | -1/+1 |
| | | | | |||||
| | * | | add pdf and mobi libraries | tcit | 2014-07-24 | 297 | -7/+126557 |
| | | | | |||||
* | | | | implemented random button | Thomas Citharel | 2014-12-07 | 6 | -3/+18 |
|/ / / | |||||
* | | | diaspora on all themes | Thomas Citharel | 2014-12-07 | 4 | -2/+13 |
| | | | |||||
* | | | added diaspora sharing | Thomas Citharel | 2014-12-06 | 4 | -0/+3 |
| | | | |||||
* | | | Merge pull request #958 from etiess/patch-2 | Thomas Citharel | 2014-11-26 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Update wallabag_compatibility_test.php | ||||
| * | | | Update wallabag_compatibility_test.php | etiess | 2014-11-26 | 1 | -2/+2 |
|/ / / | | | | | | | Explain how to install Tidy | ||||
* | | | Merge branch 'remove-courgette' into dev | Thomas Citharel | 2014-11-24 | 52 | -1348/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: themes/courgette/_view.twig | ||||
| * | | | failover if theme folder doesn't exist | Nicolas Lœuillet | 2014-11-24 | 52 | -1348/+1 |
| | | | | |||||
* | | | | Merge pull request #939 from jsit/globaljs | Nicolas Lœuillet | 2014-11-24 | 17 | -18/+18 |
|\ \ \ \ | |/ / / |/| | | | _global-izing some more js & css | ||||
| * | | | Updating Baggy theme's head.twig to locate _global js/css | Jay Sitter | 2014-11-18 | 1 | -4/+4 |
| | | | | |||||
| * | | | _global-izing some more js & css | Jay Sitter | 2014-11-18 | 16 | -14/+14 |
| | | | | |||||
* | | | | Merge pull request #942 from wallabag/carrot | Thomas Citharel | 2014-11-21 | 11 | -33/+63 |
|\ \ \ \ | | | | | | | | | | | implementing carrot into wallabag | ||||
| * \ \ \ | Merge pull request #945 from jsit/carrot | Thomas Citharel | 2014-11-21 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Fixing icon text on unread page | ||||
| | * | | | | Fixing icon text on unread page | Jay Sitter | 2014-11-21 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #944 from jsit/carrot | Thomas Citharel | 2014-11-21 | 6 | -33/+52 |
| |\| | | | | | | | | | | | | | | | | Globalizing and creating two variants of Carrot.org icon | ||||
| | * | | | | Globalizing and creating two variants of Carrot.org icon; tidying up some CSS | Jay Sitter | 2014-11-21 | 6 | -33/+52 |
| |/ / / / | |||||
| * | | | | fix merge confict | Thomas Citharel | 2014-11-19 | 4 | -5/+5 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #943 from wallabag/fixFlattrs | Thomas Citharel | 2014-11-19 | 4 | -6/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | fix Flattrs |