Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ApiDoc & Route annotation were conflicted | Jeremy Benoist | 2016-10-15 | 4 | -9/+29 |
* | Merge pull request #2438 from wallabag/mruminski-patch-1 | Jeremy Benoist | 2016-10-12 | 1 | -4/+4 |
|\ | |||||
| * | Update messages.pl.yml | Mateusz Rumiński | 2016-10-12 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #2372 from pmartin/api-get-entry-as-epub | Jeremy Benoist | 2016-10-12 | 4 | -54/+89 |
|\ | |||||
| * | Add entry export in API | Jeremy Benoist | 2016-10-08 | 4 | -64/+90 |
| * | API: getEntry can return EPUB | Pascal MARTIN | 2016-10-08 | 1 | -1/+8 |
| * | Routing: epub format is allowed for API | Pascal MARTIN | 2016-10-08 | 1 | -0/+2 |
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-11 | 74 | -1325/+1401 |
|\ \ | |||||
| * \ | Merge pull request #2429 from wallabag/lock-fos-user | Nicolas Lœuillet | 2016-10-11 | 2 | -5/+3 |
| |\ \ | |||||
| | * | | Lock deps for FOSUser | Jeremy Benoist | 2016-10-11 | 2 | -5/+3 |
| |/ / | |||||
| * | | Merge pull request #2422 from wallabag/typo-doc | Nicolas Lœuillet | 2016-10-11 | 3 | -3/+6 |
| |\ \ | |||||
| | * | | Fixed display for note in installation page | Nicolas Lœuillet | 2016-10-10 | 3 | -3/+6 |
| * | | | Merge pull request #2426 from wallabag/fix-doc | Nicolas Lœuillet | 2016-10-11 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Fix links on english documentation homepage | Nicolas Lœuillet | 2016-10-11 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge pull request #2420 from wallabag/redis-tests | Nicolas Lœuillet | 2016-10-10 | 2 | -0/+2 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Avoid error when Redis isn't here in tests | Jeremy Benoist | 2016-10-10 | 2 | -0/+2 |
| * | | | Merge pull request #2403 from wallabag/cleanup-install-process-in-doc | Jeremy Benoist | 2016-10-10 | 24 | -125/+325 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Added steps about Redis/RabbitMQ activation | Nicolas Lœuillet | 2016-10-10 | 6 | -0/+24 |
| | * | | Fixed links on import page | Nicolas Lœuillet | 2016-10-10 | 2 | -4/+4 |
| | * | | Use table for parameters.yml | Jeremy Benoist | 2016-10-10 | 1 | -46/+48 |
| | * | | Added page about parameters.yml | Nicolas Lœuillet | 2016-10-10 | 4 | -5/+53 |
| | * | | Add -dev version | Jeremy Benoist | 2016-10-10 | 1 | -0/+1 |
| | * | | Typos in upgrade doc | Nicolas Lœuillet | 2016-10-10 | 1 | -3/+29 |
| | * | | Update upgrade documentation | Nicolas Lœuillet | 2016-10-10 | 2 | -21/+11 |
| | * | | Update documentation | Nicolas Lœuillet | 2016-10-10 | 9 | -28/+30 |
| | * | | Added documentation about testsuite | Nicolas Lœuillet | 2016-10-10 | 8 | -5/+46 |
| | * | | Update RELEASE_PROCESS.md | Jeremy Benoist | 2016-10-10 | 1 | -13/+13 |
| | * | | Update README.md | Jeremy Benoist | 2016-10-10 | 1 | -4/+4 |
| | * | | Changed the default command when we launch make | Nicolas Lœuillet | 2016-10-09 | 1 | -0/+2 |
| | * | | Created scripts folder to store update/install/release process | Nicolas Lœuillet | 2016-10-09 | 4 | -26/+39 |
| | * | | Update Makefile | Nicolas Lœuillet | 2016-10-09 | 1 | -23/+14 |
| | * | | Update Makefile | Nicolas Lœuillet | 2016-10-09 | 1 | -11/+34 |
| | * | | First draft for Makefile | Nicolas Lœuillet | 2016-10-09 | 2 | -6/+47 |
| | * | | update German installation.rst | Strubbl | 2016-10-08 | 1 | -2/+2 |
| | * | | update German installation.rst | Strubbl | 2016-10-08 | 1 | -4/+3 |
| | * | | Chmoded install.sh | Nicolas Lœuillet | 2016-10-08 | 1 | -0/+0 |
| | * | | Cleaned up documentation for installation process | Nicolas Lœuillet | 2016-10-08 | 7 | -80/+77 |
| * | | | Merge pull request #2419 from wallabag/fix-twitter-cards | Nicolas Lœuillet | 2016-10-10 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | Fixed Twitter Cards by adding a description tag | Nicolas Lœuillet | 2016-10-10 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge pull request #2418 from wallabag/add-twitter-cards | Nicolas Lœuillet | 2016-10-10 | 1 | -3/+7 |
| |\ \ \ | |||||
| | * | | | Added support of Twitter Cards for public articles | Nicolas Lœuillet | 2016-10-10 | 1 | -3/+7 |
| |/ / / | |||||
| * | | | Merge pull request #2417 from wallabag/version-dev | Nicolas Lœuillet | 2016-10-10 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Define a dev version for the master | Jeremy Benoist | 2016-10-10 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #2411 from wallabag/fix-entities | Nicolas Lœuillet | 2016-10-10 | 2 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Fix entities definition | Jeremy Benoist | 2016-10-09 | 2 | -2/+2 |
| * | | | | Merge pull request #2414 from szafranek/bugfix-bookmarklet | Jeremy Benoist | 2016-10-10 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Remove automatic closing of the window from bookmarklet | Krzysztof Szafranek | 2016-10-09 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #2413 from wallabag/sub-command-verbose | Jeremy Benoist | 2016-10-10 | 1 | -7/+10 |
| |\ \ \ \ | |||||
| | * | | | | When a sub command fail, display error message | Jeremy Benoist | 2016-10-09 | 1 | -7/+10 |
| |/ / / / | |||||
| * | | | | Merge pull request #2410 from wallabag/tag-optim | Nicolas Lœuillet | 2016-10-09 | 15 | -47/+104 |
| |\ \ \ \ | | |/ / / | |/| | | |