aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | Implemented additional check for using the 'X-Forwarded-Port' header.André König2014-09-111-0/+4
|/ / / / /
* | | | | Merge pull request #819 from wallabag/fixSQLiteDownloadDBtcitworld2014-09-104-20/+0
|\ \ \ \ \ | | | | | | | | | | | | Fix downloading SQLite database from all users
| * | | | | remove old functionThomas Citharel2014-08-281-17/+0
| | | | | |
| * | | | | Fix downloading SQLite database from all usersThomas Citharel2014-08-264-14/+11
| | | | | |
* | | | | | Merge pull request #816 from zinnober/devNicolas Lœuillet2014-09-032-26/+136
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Complete rework of faz.net-template
| * | | | | Complete rework of faz.net-template adding multipage support and major ↵zinnober2014-08-232-26/+136
|/ / / / / | | | | | | | | | | | | | | | article cleanup
* | | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2014-08-213-6/+5
|\ \ \ \ \
| * \ \ \ \ Merge pull request #814 from wallabag/fix-issue813tcitworld2014-08-213-6/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | vendor dir is not accessible before install, sqlite db dir write check moved into db class
| | * | | | | vendor dir is not accessible before install, sqlite db dir write check moved ↵Maryana Rozhankivska2014-08-213-6/+5
| | | |_|/ / | | |/| | | | | | | | | | | | | | | into db class
* | | | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2014-08-214-3/+11
|\| | | | |
| * | | | | Merge pull request #783 from wallabag/message-after-loginNicolas Lœuillet2014-08-181-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | #763 fix to display the login successful message with the translation
| | * | | | | fix to display the login successful message with the translationNicolas Lœuillet2014-07-221-0/+8
| | | | | | |
| * | | | | | Merge pull request #784 from wallabag/fix-successful-add-messageNicolas Lœuillet2014-08-182-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | fix display of 'Done' message when we add a link from 'save a link' item
| | * | | | | | fix display of 'Done' message when we add a link from 'save a link' itemNicolas Lœuillet2014-07-222-2/+2
| | |/ / / / /
| * | | | | | Merge pull request #785 from wallabag/change-default-paginationNicolas Lœuillet2014-08-181-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | change default pagination, set it to 12, to have a nice baggy display