Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Added relation between API Client and User | Nicolas Lœuillet | 2016-10-24 | 3 | -3/+48 | |
| | | | | | | | | | | | | | | | | Fix #2062 | |||||
* | | | | Update messages.pl.yml | Mateusz Rumiński | 2016-10-24 | 1 | -10/+10 | |
| | | | | | | | | | | | | translate reset section to polish | |||||
* | | | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-24 | 25 | -84/+146 | |
|\| | | | ||||||
| * | | | Merge pull request #2481 from wallabag/some-fixes | Nicolas Lœuillet | 2016-10-21 | 17 | -7/+56 | |
| |\ \ \ | | | | | | | | | | | Some fixes | |||||
| | * | | | Update Twitter cards description | Jeremy Benoist | 2016-10-21 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Update translation for piwik_host | Jeremy Benoist | 2016-10-21 | 2 | -2/+2 | |
| | | | | | ||||||
| | * | | | Fix missing translations | Jeremy Benoist | 2016-10-21 | 11 | -0/+33 | |
| | | | | | ||||||
| | * | | | Requeue depending on producer | Jeremy Benoist | 2016-10-20 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | Browser import can requeue message from `parseEntry` but we should take care of the way import are handled (depending on the producer) | |||||
| | * | | | Avoid RabbitMQ consumer to loop | Jeremy Benoist | 2016-10-20 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | When the `parseEntry` returns null it means the entry already exists in the database. Sending `false` as return, will requeue the message which will then loop forever. | |||||
| | * | | | Translate date | Jeremy Benoist | 2016-10-20 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | I use a kind of hacky way to convert the user locale (defined with 2 letters, like `fr`) into a local with 5 letters (like `fr_FR`). I guess it should work on most of the case.. | |||||
| | * | | | Fix french translation | Jeremy Benoist | 2016-10-20 | 1 | -1/+1 | |
| | | |/ | | |/| | ||||||
| * / | | If reload content failed, don’t update it | Jeremy Benoist | 2016-10-20 | 4 | -1/+13 | |
| |/ / | | | | | | | | | | In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content. | |||||
| * | | Merge pull request #2455 from wallabag/fix-material-config-tabs | Jeremy Benoist | 2016-10-16 | 2 | -10/+10 | |
| |\ \ | | | | | | | | | Fix tabs on material | |||||
| | * | | Fix tabs on material | Thomas Citharel | 2016-10-15 | 2 | -10/+10 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
| * | | | Merge pull request #2454 from wallabag/fix-baggy-small-width | Jeremy Benoist | 2016-10-16 | 1 | -14/+14 | |
| |\ \ \ | | | | | | | | | | | Fix baggy display on small screens | |||||
| | * | | | Fix baggy on small screens | Thomas Citharel | 2016-10-15 | 1 | -14/+14 | |
| | |/ / | ||||||
| * | | | Merge pull request #2459 from wallabag/improve-german-translation | Thomas Citharel | 2016-10-16 | 2 | -49/+49 | |
| |\ \ \ | | | | | | | | | | | German: improve existing and add missing translation | |||||
| | * | | | German: improve existing and add missing translation | Sven Fischer | 2016-10-16 | 2 | -49/+49 | |
| | |/ / | ||||||
| * / / | add link to German documentation in about page | Sven Fischer | 2016-10-16 | 1 | -0/+1 | |
| |/ / | ||||||
| * | | Improved side menu, reduced the font size on small screens, fixed a form to ↵ | Alexandr Danilov | 2016-10-15 | 1 | -3/+3 | |
| | | | | | | | | | | | | add links on small screens | |||||
* | | | Merge pull request #2401 from wallabag/reset-account | Jeremy Benoist | 2016-10-24 | 24 | -41/+392 | |
|\ \ \ | | | | | | | | | Reset account | |||||
| * | | | Fix migrations | Jeremy Benoist | 2016-10-23 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Lowercase wallabag | Jeremy Benoist | 2016-10-22 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | Add verification check for MySQL version | Jeremy Benoist | 2016-10-22 | 1 | -1/+17 | |
| | | | | | | | | | | | | | | | | Must now be >= 5.5.4 | |||||
| * | | | Use statements & update translation | Jeremy Benoist | 2016-10-22 | 5 | -33/+26 | |
| | | | | ||||||
| * | | | 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 | 2 | -12/+1 | |
| | | | | ||||||
| * | | | 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 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | 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 | 16 | -22/+207 | |
| | | | | | | | | | | | | | | | | | | | | | | | | - annotations - tags - entries | |||||
* | | | | Add test on /api/annotations | Jeremy Benoist | 2016-10-22 | 2 | -18/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | ||||||
* | | | | fix cs and phpdoc | Thomas Citharel | 2016-10-22 | 2 | -19/+7 | |
| | | | | ||||||
* | | | | 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 | |
|/ / / | ||||||
* | | | CS | Jeremy Benoist | 2016-10-15 | 1 | -1/+0 | |
| | | | ||||||
* | | | ApiDoc & Route annotation were conflicted | Jeremy Benoist | 2016-10-15 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 … | |||||
* | | | 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 | 2 | -6/+31 | |
|\ \ \ | | | | | | | | | API: ability to export entry in all available format (epub, pdf, etc...) | |||||
| * | | | Add entry export in API | Jeremy Benoist | 2016-10-08 | 2 | -16/+32 | |
| | | | | | | | | | | | | | | | | | | | | 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 | 31 | -48/+170 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Fixed Twitter Cards by adding a description tag | Nicolas Lœuillet | 2016-10-10 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Added support of Twitter Cards for public articles | Nicolas Lœuillet | 2016-10-10 | 1 | -3/+7 | |
| | | | |