aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'tcitworld-ebook' into devThomas Citharel2014-12-1484-208/+67898
|\
| * merge epub with all the dev evolutionsThomas Citharel2014-12-1484-208/+67898
|/|
| * deleting send to kindle functiontcit2014-09-282-69/+4
| |
| * add extension for pdf filetcit2014-09-281-3/+1
| |
| * offering download for pdf file and comment in codetcit2014-09-271-1/+4
| |
| * revert routing bad deletingtcit2014-09-271-2/+15
| |
| * get up to datetcit2014-09-271-52/+40
| |
| * changed mpdf with tcpdftcit2014-09-27125-97980/+61819
| |
| * removed unnecessary fontsThomas Citharel2014-08-2151-699/+0
| |
| * removing examples for mpdftcitworld2014-08-04119-21370/+0
| |
| * little fix in locale filestcit2014-08-032-3/+2
| |
| * more translationstcit2014-07-265-6/+121
| |
| * translation stuff (en & fr done)tcit2014-07-268-33/+183
| |
| * little bettertcit2014-07-261-23/+53
| |
| * bug with extension in the filenametcit2014-07-251-1/+1
| |
| * send2kindletcit2014-07-252-4/+59
| |
| * mobi (not tested on actual device) and pdf workingtcit2014-07-251-7/+19
| |
| * updated mpdf to 5.7.2tcit2014-07-246-245/+462
| |
| * use directly MOBIClasstcit2014-07-2447-1547/+305
| |
| * add mobi and pdf to routingtcit2014-07-241-1/+7
| |
| * from epub to all kind of ebookstcit2014-07-242-1/+1
| |
| * add pdf and mobi librariestcit2014-07-24297-7/+126557
| |
* | diaspora on all themesThomas Citharel2014-12-074-2/+13
| |
* | added diaspora sharingThomas Citharel2014-12-064-0/+3
| |
* | Merge pull request #958 from etiess/patch-2Thomas Citharel2014-11-261-2/+2
|\ \ | | | | | | Update wallabag_compatibility_test.php
| * | Update wallabag_compatibility_test.phpetiess2014-11-261-2/+2
|/ / | | | | Explain how to install Tidy
* | Merge branch 'remove-courgette' into devThomas Citharel2014-11-2452-1348/+1
|\ \ | | | | | | | | | | | | Conflicts: themes/courgette/_view.twig
| * | failover if theme folder doesn't existNicolas Lœuillet2014-11-2452-1348/+1
| | |
* | | Merge pull request #939 from jsit/globaljsNicolas Lœuillet2014-11-2417-18/+18
|\ \ \ | |/ / |/| | _global-izing some more js & css
| * | Updating Baggy theme's head.twig to locate _global js/cssJay Sitter2014-11-181-4/+4
| | |
| * | _global-izing some more js & cssJay Sitter2014-11-1816-14/+14
| | |
* | | Merge pull request #942 from wallabag/carrotThomas Citharel2014-11-2111-33/+63
|\ \ \ | | | | | | | | implementing carrot into wallabag
| * \ \ Merge pull request #945 from jsit/carrotThomas Citharel2014-11-211-2/+2
| |\ \ \ | | | | | | | | | | Fixing icon text on unread page
| | * | | Fixing icon text on unread pageJay Sitter2014-11-211-2/+2
| | | | |
| * | | | Merge pull request #944 from jsit/carrotThomas Citharel2014-11-216-33/+52
| |\| | | | | | | | | | | | | Globalizing and creating two variants of Carrot.org icon
| | * | | Globalizing and creating two variants of Carrot.org icon; tidying up some CSSJay Sitter2014-11-216-33/+52
| |/ / /
| * | | fix merge confictThomas Citharel2014-11-194-5/+5
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #943 from wallabag/fixFlattrsThomas Citharel2014-11-194-6/+4
|\ \ \ \ | | | | | | | | | | fix Flattrs
| * | | | fix FlattrsThomas Citharel2014-11-194-6/+4
|/ / / /
| * | | default deactivatedThomas Citharel2014-11-191-2/+2
| | | |
| * | | implementing carrot into wallabagThomas Citharel2014-11-1910-6/+15
|/ / /
* | | Merge pull request #938 from jsit/firefoxiconfixThomas Citharel2014-11-183-6/+6
|\ \ \ | |/ / |/| | Fix for favicons in Firefox
| * | Fix for favicons in Firefox (FF only uses the last declared favicon, not the ↵Jay Sitter2014-11-183-6/+6
|/ / | | | | | | most appropriate: https://bugzilla.mozilla.org/show_bug.cgi?id=751712)
* | Merge pull request #937 from jsit/faviconsThomas Citharel2014-11-1721-15/+83
|\ \ | | | | | | Moving favicons to new _global theme dir and adjusting <link> tags
| * | Adjusting Template class so that _global is ignored as a themeJay Sitter2014-11-171-2/+2
| | |
| * | Modifying Courgette theme to comply with new app icon image locationJay Sitter2014-11-175-4/+27
| | |
| * | Fixing earlier commit wherein I lowercased some JS callsJay Sitter2014-11-171-4/+4
| | |
| * | Removing app icons from previous locationsJay Sitter2014-11-1713-0/+0
| | |
| * | Moving app icon images to /themes/_global/img/appicon/, updating Baggy and ↵Jay Sitter2014-11-1711-25/+47
| | | | | | | | | | | | Default themes to point there
| * | Adding/fixing favicon <link>s in Baggy theme headerJay Sitter2014-11-171-4/+27
|/ /