aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | | change default pagination, set it to 12, to have a nice baggy displayNicolas Lœuillet2014-07-221-1/+1
| | |/ / /
* | | | | merge fix 776Thomas Citharel2014-08-163-39/+38
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | minimum of control on server side addedMaryana Rozhankivska2014-08-151-1/+4
| | | | |
| * | | | Fix #776Nicolas Lœuillet2014-07-222-2/+2
| |/ / /
* | | | link to guidelines in contributing fileNicolas Lœuillet2014-07-251-0/+2
| | | |
* | | | thank you @mariroz & @tcitworld :)Nicolas Lœuillet2014-07-251-0/+2
| | | |
* | | | guidelines for wallabagNicolas Lœuillet2014-07-251-0/+53
| | | |
* | | | Merge branch 'fix/securityAllowedActions' into devNicolas Lœuillet2014-07-25981-6818/+9000
|\ \ \ \
| * | | | typoNicolas Lœuillet2014-07-251-4/+4
| | | | |
| * | | | security issueMaryana Rozhankivska2014-07-242-42/+45
| | | | |
| * | | | Merge branch 'dev' of github.com:wallabag/wallabag into devNicolas Lœuillet2014-07-231-0/+21
| |\ \ \ \
| | * | | | Merge pull request #789 from wallabag/feature/someMoreSitesConfigNicolas Lœuillet2014-07-231-0/+21
| |/| | | | |/| | | | | | | | | | | config for habrahabr.ru to grab articles with comments
| | * | | | config for habrahabr.ru to grep articles with commentsMaryana Rozhankivska2014-07-231-0/+21
| | | | | |
| * | | | | Merge branch 'refactor' into devNicolas Lœuillet2014-07-23980-6816/+8974
|/| | | | |
| * | | | | Merge branch 'dev' into refactorNicolas Lœuillet2014-07-2317-320/+819
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: check_setup.php index.php
* | | | | | Merge branch 'anno1337-dev' into devNicolas Lœuillet2014-07-223-15/+17
|\ \ \ \ \ \
| * | | | | | Merge branch 'dev' of github.com:anno1337/wallabag into anno1337-devNicolas Lœuillet2014-07-223-15/+17
|/| | | | | |
| * | | | | | Split up check_setup.php into two files. The new file check_essentials.php ↵Marc Wilhelm2014-07-223-15/+17
| | |_|/ / / | |/| | | | | | | | | | | | | | | | takes care of stuff like the PHP version and is executed before the config files are included which are needed by check_setup. This patch addresses issue #773
* | | | | | Merge branch 'feature/programmingCodeSyntaxHighlighting' into devNicolas Lœuillet2014-07-229-0/+448
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:03:51 +0000