Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge pull request #2434 from wallabag/parameters-doc | Nicolas Lœuillet | 2016-10-13 | 6 | -3/+106 | |
| |\ \ \ \ | | | | | | | | | | | | | Added french documentation for parameters.yml | |||||
| | * | | | | translate to German: user/parameters | Sven Fischer | 2016-10-12 | 2 | -0/+51 | |
| | | | | | | ||||||
| | * | | | | Added french documentation for parameters.yml | Nicolas Lœuillet | 2016-10-12 | 4 | -3/+55 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #2439 from zertrin/minor-fix-docs-1 | Nicolas Lœuillet | 2016-10-13 | 3 | -7/+8 | |
| |\ \ \ \ | | |/ / / | |/| | | | Minor fixes in the english documentation | |||||
| | * | | | Minor fixes in the english documentation | zertrin | 2016-10-13 | 3 | -7/+8 | |
| |/ / / | ||||||
| * | | | Merge pull request #2432 from wallabag/issue-site-config | Nicolas Lœuillet | 2016-10-12 | 1 | -0/+2 | |
| |\ \ \ | | | | | | | | | | | Update ISSUE_TEMPLATE.md | |||||
| | * | | | Update ISSUE_TEMPLATE.md | Jeremy Benoist | 2016-10-12 | 1 | -0/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #2401 from wallabag/reset-account | Jeremy Benoist | 2016-10-24 | 39 | -63/+717 | |
|\ \ \ \ | | | | | | | | | | | Reset account | |||||
| * | | | | SQLite should use utf8, not utf8mb4 | Jeremy Benoist | 2016-10-24 | 2 | -3/+3 | |
| | | | | | ||||||
| * | | | | Fix migrations | Jeremy Benoist | 2016-10-23 | 6 | -28/+48 | |
| | | | | | ||||||
| * | | | | Lowercase wallabag | Jeremy Benoist | 2016-10-22 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | Add migration for MySQL utf8mb4 | Jeremy Benoist | 2016-10-22 | 1 | -0/+77 | |
| | | | | | ||||||
| * | | | | Add verification check for MySQL version | Jeremy Benoist | 2016-10-22 | 3 | -4/+20 | |
| | | | | | | | | | | | | | | | | | | | | Must now be >= 5.5.4 | |||||
| * | | | | Use statements & update translation | Jeremy Benoist | 2016-10-22 | 7 | -34/+28 | |
| | | | | | ||||||
| * | | | | CS | Jeremy Benoist | 2016-10-22 | 4 | -9/+10 | |
| | | | | | ||||||
| * | | | | Add baggy reset part | Jeremy Benoist | 2016-10-22 | 1 | -0/+22 | |
| | | | | | ||||||
| * | | | | Avoid orphan tags | Jeremy Benoist | 2016-10-22 | 1 | -2/+14 | |
| | | | | | ||||||
| * | | | | Cleanup subscriber / listener definition | Jeremy Benoist | 2016-10-22 | 3 | -13/+2 | |
| | | | | | ||||||
| * | | | | Add custom doctrine subscriber for SQLite | Jeremy Benoist | 2016-10-22 | 5 | -11/+144 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since SQLite doesn’t handle cascade remove by default, we need to handle it manually. Also some refacto | |||||
| * | | | | Fix emoji insertion in MySQL | Jeremy Benoist | 2016-10-22 | 8 | -9/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Switch to utf8mb4 instead of utf8 because f*** MySQL See https://github.com/doctrine/dbal/pull/851 | |||||
| * | | | | Add ability to reset some datas | Jeremy Benoist | 2016-10-22 | 18 | -22/+406 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - annotations - tags - entries | |||||
* | | | | | Merge pull request #1890 from wallabag/v2-api-annotation-switched | Nicolas Lœuillet | 2016-10-24 | 5 | -88/+248 | |
|\ \ \ \ \ | | | | | | | | | | | | | bring annotations to API | |||||
| * | | | | | Add test on /api/annotations | Jeremy Benoist | 2016-10-22 | 3 | -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 | |||||
| * | | | | | CS | Jeremy Benoist | 2016-10-22 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | Added a missing namespace | Nicolas Lœuillet | 2016-10-22 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | PHP CS | Nicolas Lœuillet | 2016-10-22 | 1 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | fix cs and phpdoc | Thomas Citharel | 2016-10-22 | 4 | -26/+34 | |
| | | | | | | ||||||
| * | | | | | cs | Thomas Citharel | 2016-10-22 | 2 | -10/+19 | |
| | | | | | | ||||||
| * | | | | | move code | Thomas Citharel | 2016-10-22 | 2 | -82/+48 | |
| | | | | | | ||||||
| * | | | | | cs | Thomas Citharel | 2016-10-22 | 2 | -4/+0 | |
| | | | | | | ||||||
| * | | | | | bring annotations to API | Thomas Citharel | 2016-10-22 | 2 | -22/+138 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2456 from wallabag/use-new-pdf | Jeremy Benoist | 2016-10-22 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | use new tcpdf library version | |||||
| * | | | | use new tcpdf library version | Thomas Citharel | 2016-10-22 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #2453 from wallabag/fix-api-export | Nicolas Lœuillet | 2016-10-21 | 4 | -10/+29 | |
|\ \ \ \ | | | | | | | | | | | Fix API export | |||||
| * | | | | CS | Jeremy Benoist | 2016-10-15 | 1 | -1/+0 | |
| | | | | | ||||||
| * | | | | ApiDoc & Route annotation were conflicted | Jeremy Benoist | 2016-10-15 | 4 | -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-1 | Jeremy Benoist | 2016-10-12 | 1 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | Update messages.pl.yml | |||||
| * | | | | Update messages.pl.yml | Mateusz Rumiński | 2016-10-12 | 1 | -4/+4 | |
|/ / / / | | | | | | | | | translate delete section to polish | |||||
* | | | | Merge pull request #2372 from pmartin/api-get-entry-as-epub | Jeremy Benoist | 2016-10-12 | 4 | -54/+89 | |
|\ \ \ \ | | | | | | | | | | | API: ability to export entry in all available format (epub, pdf, etc...) | |||||
| * | | | | Add entry export in API | Jeremy Benoist | 2016-10-08 | 4 | -64/+90 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Export isn't available for json & xml because user can use the default entry endpoint instead. | |||||
| * | | | | 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 | |||||
| | * | | | | Lock deps for FOSUser | Jeremy Benoist | 2016-10-11 | 2 | -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-doc | Nicolas Lœuillet | 2016-10-11 | 3 | -3/+6 | |
| |\ \ \ \ | | | | | | | | | | | | | Fixed display for note in installation page | |||||
| | * | | | | 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 | |||||
| | * | | | | | 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 |