aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | |
| * | | | | | | | | change jquery path into installation scriptNicolas Loeuillet2014-12-182-1/+6
|/ / / / / / / / /
* | | | | | | | | Merge pull request #923 from wallabag/add-html-docThomas Citharel2014-12-1787-5/+6443
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add HTML documentation
| * | | | | | | | | link to doc inside wallabag:aboutThomas Citharel2014-12-172-6/+16
| | | | | | | | | |
| * | | | | | | | | Merge branch 'add-html-doc' of https://github.com/wallabag/wallabag into ↵Thomas Citharel2014-12-1786-0/+6428
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation-integration
| * | | | | | | | | upgrade documentationNicolas Lœuillet2014-11-2448-219/+2677
| | | | | | | | | |
| * | | | | | | | | add link to documentation into installationNicolas Lœuillet2014-11-241-0/+1
| | | | | | | | | |
| * | | | | | | | | add HTML documentationNicolas Lœuillet2014-11-0465-0/+3969
| | | | | | | | | |
* | | | | | | | | | enable showing or not for epub/mobi/pdf export buttonsThomas Citharel2014-12-145-22/+30
| | | | | | | | | |
* | | | | | | | | | 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
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 04:17:11 +0000