aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1890 from wallabag/v2-api-annotation-switchedNicolas Lœuillet2016-10-245-88/+248
|\ | | | | bring annotations to API
| * Add test on /api/annotationsJeremy Benoist2016-10-223-55/+120
| | | | | | | | | | | | | | Fix controller forward in WallabagRestController. Update PHPDoc so it is sorted the same way as others one Duplicate all annotations test to use both api & normal way Also, make annotation tests independent to each other
| * CSJeremy Benoist2016-10-221-1/+0
| |
| * Added a missing namespaceNicolas Lœuillet2016-10-221-0/+1
| |
| * PHP CSNicolas Lœuillet2016-10-221-4/+4
| |
| * fix cs and phpdocThomas Citharel2016-10-224-26/+34
| |
| * csThomas Citharel2016-10-222-10/+19
| |
| * move codeThomas Citharel2016-10-222-82/+48
| |
| * csThomas Citharel2016-10-222-4/+0
| |
| * bring annotations to APIThomas Citharel2016-10-222-22/+138
| |
* | Merge pull request #2456 from wallabag/use-new-pdfJeremy Benoist2016-10-221-1/+1
|\ \ | |/ |/| use new tcpdf library version
| * 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
|\ | | | | Fix API export
| * CSJeremy Benoist2016-10-151-1/+0
| |
| * ApiDoc & Route annotation were conflictedJeremy Benoist2016-10-154-9/+29
|/ | | | | | | | | | | | The generated error was “Unable to guess how to get a Doctrine instance from the request information.”. I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter). Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place). I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get a 406 error from FosRest. Should be ok now …
* Merge pull request #2438 from wallabag/mruminski-patch-1Jeremy Benoist2016-10-121-4/+4
|\ | | | | Update messages.pl.yml
| * Update messages.pl.ymlMateusz Rumiński2016-10-121-4/+4
|/ | | translate delete section to polish
* Merge pull request #2372 from pmartin/api-get-entry-as-epubJeremy Benoist2016-10-124-54/+89
|\ | | | | API: ability to export entry in all available format (epub, pdf, etc...)
| * Add entry export in APIJeremy Benoist2016-10-084-64/+90
| | | | | | | | | | Export isn't available for json & xml because user can use the default entry endpoint instead.
| * 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 FOSUser
| | * | Lock deps for FOSUserJeremy Benoist2016-10-112-5/+3
| |/ / | | | | | | | | | | | | We’ll wait until the final release will be out and other related project will be update to support it. Meanwhile we can safely lock to a previous version.
| * | Merge pull request #2422 from wallabag/typo-docNicolas Lœuillet2016-10-113-3/+6
| |\ \ | | | | | | | | Fixed display for note in installation page
| | * | 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 homepage
| | * | | 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 tests
| | * | 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
| |\ \ \ | | |/ / | |/| | Cleaned up documentation for installation process
| | * | 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
| | | | | | | | | | | | Following https://github.com/wallabag/wallabag/pull/2417
| | * | 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
| | | | | | | | | | | | | | | | Fix #2415
| | * | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 12:51:46 +0000