aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Added relation between API Client and UserNicolas Lœuillet2016-10-243-3/+48
| | | | | | | | | | | | | | | | Fix #2062
* | | | Update messages.pl.ymlMateusz Rumiński2016-10-241-10/+10
| | | | | | | | | | | | translate reset section to polish
* | | | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-10-2425-84/+146
|\| | |
| * | | Merge pull request #2481 from wallabag/some-fixesNicolas Lœuillet2016-10-2117-7/+56
| |\ \ \ | | | | | | | | | | Some fixes
| | * | | Update Twitter cards descriptionJeremy Benoist2016-10-211-1/+1
| | | | |
| | * | | Update translation for piwik_hostJeremy Benoist2016-10-212-2/+2
| | | | |
| | * | | Fix missing translationsJeremy Benoist2016-10-2111-0/+33
| | | | |
| | * | | Requeue depending on producerJeremy Benoist2016-10-201-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 loopJeremy Benoist2016-10-201-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 dateJeremy Benoist2016-10-201-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 translationJeremy Benoist2016-10-201-1/+1
| | | |/ | | |/|
| * / | If reload content failed, don’t update itJeremy Benoist2016-10-204-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-tabsJeremy Benoist2016-10-162-10/+10
| |\ \ | | | | | | | | Fix tabs on material
| | * | Fix tabs on materialThomas Citharel2016-10-152-10/+10
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | Merge pull request #2454 from wallabag/fix-baggy-small-widthJeremy Benoist2016-10-161-14/+14
| |\ \ \ | | | | | | | | | | Fix baggy display on small screens
| | * | | Fix baggy on small screensThomas Citharel2016-10-151-14/+14
| | |/ /
| * | | Merge pull request #2459 from wallabag/improve-german-translationThomas Citharel2016-10-162-49/+49
| |\ \ \ | | | | | | | | | | German: improve existing and add missing translation
| | * | | German: improve existing and add missing translationSven Fischer2016-10-162-49/+49
| | |/ /
| * / / add link to German documentation in about pageSven Fischer2016-10-161-0/+1
| |/ /
| * | Improved side menu, reduced the font size on small screens, fixed a form to ↵Alexandr Danilov2016-10-151-3/+3
| | | | | | | | | | | | add links on small screens
* | | Merge pull request #2401 from wallabag/reset-accountJeremy Benoist2016-10-2424-41/+392
|\ \ \ | | | | | | | | Reset account
| * | | Fix migrationsJeremy Benoist2016-10-231-1/+1
| | | |
| * | | Lowercase wallabagJeremy Benoist2016-10-221-4/+4
| | | |
| * | | Add verification check for MySQL versionJeremy Benoist2016-10-221-1/+17
| | | | | | | | | | | | | | | | Must now be >= 5.5.4
| * | | Use statements & update translationJeremy Benoist2016-10-225-33/+26
| | | |
| * | | CSJeremy Benoist2016-10-224-9/+10
| | | |
| * | | Add baggy reset partJeremy Benoist2016-10-221-0/+22
| | | |
| * | | Avoid orphan tagsJeremy Benoist2016-10-221-2/+14
| | | |
| * | | Cleanup subscriber / listener definitionJeremy Benoist2016-10-222-12/+1
| | | |
| * | | Add custom doctrine subscriber for SQLiteJeremy Benoist2016-10-225-11/+144
| | | | | | | | | | | | | | | | | | | | | | | | Since SQLite doesn’t handle cascade remove by default, we need to handle it manually. Also some refacto
| * | | Fix emoji insertion in MySQLJeremy Benoist2016-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | Switch to utf8mb4 instead of utf8 because f*** MySQL See https://github.com/doctrine/dbal/pull/851
| * | | Add ability to reset some datasJeremy Benoist2016-10-2216-22/+207
| | | | | | | | | | | | | | | | | | | | | | | | - annotations - tags - entries
* | | | Add test on /api/annotationsJeremy Benoist2016-10-222-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
* | | | CSJeremy Benoist2016-10-221-1/+0
| | | |
* | | | Added a missing namespaceNicolas Lœuillet2016-10-221-0/+1
| | | |
* | | | fix cs and phpdocThomas Citharel2016-10-222-19/+7
| | | |
* | | | 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
|/ / /
* | | CSJeremy Benoist2016-10-151-1/+0
| | |
* | | ApiDoc & Route annotation were conflictedJeremy Benoist2016-10-151-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.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-122-6/+31
|\ \ \ | | | | | | | | API: ability to export entry in all available format (epub, pdf, etc...)
| * | | Add entry export in APIJeremy Benoist2016-10-082-16/+32
| | | | | | | | | | | | | | | | | | | | 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-1131-48/+170
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed Twitter Cards by adding a description tagNicolas Lœuillet2016-10-101-0/+1
| | | |
| * | | Added support of Twitter Cards for public articlesNicolas Lœuillet2016-10-101-3/+7
| | | |