aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* use new tcpdf library versionThomas Citharel2016-10-221-1/+1
* Merge pull request #2453 from wallabag/fix-api-exportNicolas Lœuillet2016-10-214-10/+29
|\
| * CSJeremy Benoist2016-10-151-1/+0
| * ApiDoc & Route annotation were conflictedJeremy Benoist2016-10-154-9/+29
|/
* Merge pull request #2438 from wallabag/mruminski-patch-1Jeremy Benoist2016-10-121-4/+4
|\
| * Update messages.pl.ymlMateusz Rumiński2016-10-121-4/+4
|/
* Merge pull request #2372 from pmartin/api-get-entry-as-epubJeremy Benoist2016-10-124-54/+89
|\
| * Add entry export in APIJeremy Benoist2016-10-084-64/+90
| * API: getEntry can return EPUBPascal MARTIN2016-10-081-1/+8
| * Routing: epub format is allowed for APIPascal MARTIN2016-10-081-0/+2
* | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-10-1174-1325/+1401
|\ \
| * \ Merge pull request #2429 from wallabag/lock-fos-userNicolas Lœuillet2016-10-112-5/+3
| |\ \
| | * | Lock deps for FOSUserJeremy Benoist2016-10-112-5/+3
| |/ /
| * | Merge pull request #2422 from wallabag/typo-docNicolas Lœuillet2016-10-113-3/+6
| |\ \
| | * | Fixed display for note in installation pageNicolas Lœuillet2016-10-103-3/+6
| * | | Merge pull request #2426 from wallabag/fix-docNicolas Lœuillet2016-10-111-2/+2
| |\ \ \
| | * | | Fix links on english documentation homepageNicolas Lœuillet2016-10-111-2/+2
| |/ / /
| * | | Merge pull request #2420 from wallabag/redis-testsNicolas Lœuillet2016-10-102-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | Avoid error when Redis isn't here in testsJeremy Benoist2016-10-102-0/+2
| * | | Merge pull request #2403 from wallabag/cleanup-install-process-in-docJeremy Benoist2016-10-1024-125/+325
| |\ \ \ | | |/ / | |/| |
| | * | Added steps about Redis/RabbitMQ activationNicolas Lœuillet2016-10-106-0/+24
| | * | Fixed links on import pageNicolas Lœuillet2016-10-102-4/+4
| | * | Use table for parameters.ymlJeremy Benoist2016-10-101-46/+48
| | * | Added page about parameters.ymlNicolas Lœuillet2016-10-104-5/+53
| | * | Add -dev versionJeremy Benoist2016-10-101-0/+1
| | * | Typos in upgrade docNicolas Lœuillet2016-10-101-3/+29
| | * | Update upgrade documentationNicolas Lœuillet2016-10-102-21/+11
| | * | Update documentationNicolas Lœuillet2016-10-109-28/+30
| | * | Added documentation about testsuiteNicolas Lœuillet2016-10-108-5/+46
| | * | Update RELEASE_PROCESS.mdJeremy Benoist2016-10-101-13/+13
| | * | Update README.mdJeremy Benoist2016-10-101-4/+4
| | * | Changed the default command when we launch makeNicolas Lœuillet2016-10-091-0/+2
| | * | Created scripts folder to store update/install/release processNicolas Lœuillet2016-10-094-26/+39
| | * | Update MakefileNicolas Lœuillet2016-10-091-23/+14
| | * | Update MakefileNicolas Lœuillet2016-10-091-11/+34
| | * | First draft for MakefileNicolas Lœuillet2016-10-092-6/+47
| | * | update German installation.rstStrubbl2016-10-081-2/+2
| | * | update German installation.rstStrubbl2016-10-081-4/+3
| | * | Chmoded install.shNicolas Lœuillet2016-10-081-0/+0
| | * | Cleaned up documentation for installation processNicolas Lœuillet2016-10-087-80/+77
| * | | Merge pull request #2419 from wallabag/fix-twitter-cardsNicolas Lœuillet2016-10-101-0/+1
| |\ \ \
| | * | | Fixed Twitter Cards by adding a description tagNicolas Lœuillet2016-10-101-0/+1
| |/ / /
| * | | Merge pull request #2418 from wallabag/add-twitter-cardsNicolas Lœuillet2016-10-101-3/+7
| |\ \ \
| | * | | Added support of Twitter Cards for public articlesNicolas Lœuillet2016-10-101-3/+7
| |/ / /
| * | | Merge pull request #2417 from wallabag/version-devNicolas Lœuillet2016-10-101-1/+1
| |\ \ \
| | * | | Define a dev version for the masterJeremy Benoist2016-10-101-1/+1
| |/ / /
| * | | Merge pull request #2411 from wallabag/fix-entitiesNicolas Lœuillet2016-10-102-2/+2
| |\ \ \
| | * | | Fix entities definitionJeremy Benoist2016-10-092-2/+2
| * | | | Merge pull request #2414 from szafranek/bugfix-bookmarkletJeremy Benoist2016-10-101-1/+1
| |\ \ \ \
| | * | | | Remove automatic closing of the window from bookmarkletKrzysztof Szafranek2016-10-091-1/+1
| | |/ / /