aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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 pull request #860 from wallabag/compatibility_fileThomas Citharel2014-10-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move compatibility file (fixes #858)
| * | | | | | Right redirect from the new pathtcit2014-10-081-2/+2
| | | | | | |
| * | | | | | change href in install/index.phpNicolas Lœuillet2014-10-081-1/+1
| | | | | | |
| * | | | | | Fixes #858: move compatibility file into install folderNicolas Lœuillet2014-10-081-0/+0
| | | | | | |
* | | | | | | Merge pull request #861 from wallabag/fix-query-sqlite-installThomas Citharel2014-10-081-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | query for populate mysql/postgres was called when we choosed sqlite
| * | | | | | query for populate mysql/postgres was called when we choosed sqliteNicolas Lœuillet2014-10-081-3/+5
|/ / / / / /
* | | | | | Merge pull request #787 from wallabag/data-for-mysqlThomas Citharel2014-10-081-0/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add data for mysql installation, see #624
| * | | | | | Fix bug for #787tcit2014-10-081-4/+4
| | | | | | |
| * | | | | | Merge branch 'dev' into data-for-mysqltcit2014-10-081002-6904/+9381
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #855 from wallabag/fix-828Nicolas Lœuillet2014-10-041-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix #828
| * | | | | | | get full contenttcit2014-10-041-0/+7
| | | | | | | |
* | | | | | | | Merge pull request #856 from wallabag/fix-826Nicolas Lœuillet2014-10-041-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix #826
| * | | | | | | | get contenttcit2014-10-041-0/+8
| |/ / / / / / /
* | | | | | | | Merge pull request #854 from wallabag/saveclick2searchNicolas Lœuillet2014-10-048-5/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Saveclick2search (fix for #831)
| * | | | | | | small fix for better width for search translations full displaytcit2014-10-041-0/+5
| | | | | | | |
| * | | | | | | translate search messagestcit2014-10-044-3/+6
| | | | | | | |
| * | | | | | | autofocus on all themestcit2014-10-042-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'dev' into saveclick2searchtcit2014-10-041-1/+0
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | fixed bug in config screen for default themetcit2014-10-041-1/+0
| | | | | | | |
| * | | | | | | search field selectedtcit2014-10-042-1/+2
|/ / / / / / /
* | | | | | | Merge pull request #853 from wallabag/fix-for-#797Thomas Citharel2014-10-041-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix for #797
| * | | | | | | Fix for #797tcitworld2014-08-051-0/+7
| | | | | | | |
* | | | | | | | fix for #758tcit2014-09-281-48/+63
| | | | | | | |
* | | | | | | | Merge branch 'issue-844' of https://github.com/rros/wallabag into devtcit2014-09-281-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the PostgreSQL install errorsRobert Ros2014-09-211-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devtcit2014-09-281-15/+15
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #802 from tcitworld/traductionfixThomas Citharel2014-09-281-15/+15
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Traductionfix
| | * | | | | | | | | Improved instructionstcit2014-08-031-15/+15
| | | | | | | | | | |
* | | | | | | | | | | get up to date for mergetcit2014-09-2811-33/+116
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | little fixtcit2014-07-292-1/+0
| | | | | | | | | | |
| * | | | | | | | | | changes in all themestcit2014-07-262-0/+8
| | | | | | | | | | |
| * | | | | | | | | | Translationstcit2014-07-267-26/+95
| | | | | | | | | | |
| * | | | | | | | | | precisiontcit2014-07-251-1/+1
| | | | | | | | | | |
| * | | | | | | | | | added email fieldtcit2014-07-256-9/+16
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #841 from wallabag/fixGDdetectiontcitworld2014-09-271-1/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix #766 - GD detection
| * | | | | | | | | | Fix #766 - GD detectionThomas Citharel2014-09-171-1/+13
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'refactor' into devtcit2014-09-271-5/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | merge refactor and devtcit2014-09-2732-449/+1129
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #839 from wallabag/fixlocalpicturesNicolas Lœuillet2014-09-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fix pictures display when DOWNLOAD_PICTURES is enabled
| * | | | | | | | | | fix pictures display when DOWNLOAD_PICTURES is enabledThomas Citharel2014-09-161-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #836 from akoenig/x-forwarded-portNicolas Lœuillet2014-09-161-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Implemented additional check for using the 'X-Forwarded-Port' header.