aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * 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
| | * Avoid RabbitMQ consumer to loopJeremy Benoist2016-10-201-2/+3
| | * Translate dateJeremy Benoist2016-10-201-1/+4
| | * Fix french translationJeremy Benoist2016-10-201-1/+1
| * | If reload content failed, don’t update itJeremy Benoist2016-10-204-1/+13
| |/
| * Merge pull request #2455 from wallabag/fix-material-config-tabsJeremy Benoist2016-10-162-10/+10
| |\
| | * Fix tabs on materialThomas Citharel2016-10-152-10/+10
| * | Merge pull request #2454 from wallabag/fix-baggy-small-widthJeremy Benoist2016-10-161-14/+14
| |\ \
| | * | 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 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 a...Alexandr Danilov2016-10-151-3/+3
* | Merge pull request #2401 from wallabag/reset-accountJeremy Benoist2016-10-2424-41/+392
|\ \
| * | 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
| * | 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
| * | Fix emoji insertion in MySQLJeremy Benoist2016-10-221-1/+1
| * | Add ability to reset some datasJeremy Benoist2016-10-2216-22/+207
* | | Add test on /api/annotationsJeremy Benoist2016-10-222-18/+21
* | | 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
* | Update messages.pl.ymlMateusz Rumiński2016-10-121-4/+4
* | Merge pull request #2372 from pmartin/api-get-entry-as-epubJeremy Benoist2016-10-122-6/+31
|\ \
| * | Add entry export in APIJeremy Benoist2016-10-082-16/+32
| * | 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
| * | Merge pull request #2411 from wallabag/fix-entitiesNicolas Lœuillet2016-10-102-2/+2
| |\ \
| | * | Fix entities definitionJeremy Benoist2016-10-092-2/+2