aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| | | |
| * | | Merge pull request #2411 from wallabag/fix-entitiesNicolas Lœuillet2016-10-102-2/+2
| |\ \ \ | | | | | | | | | | Fix entities definition
| | * | | Fix entities definitionJeremy Benoist2016-10-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per Doctrine said in the debug tool bar: - The field Wallabag\ApiBundle\Entity\Client#refreshTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\RefreshToken#client does not contain the required 'inversedBy="refreshTokens"' attribute. - The field Wallabag\ApiBundle\Entity\Client#accessTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\AccessToken#client does not contain the required 'inversedBy="accessTokens"' attribute.
| * | | | Merge pull request #2414 from szafranek/bugfix-bookmarkletJeremy Benoist2016-10-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | Remove automatic closing of the window from bookmarklet
| | * | | | Remove automatic closing of the window from bookmarkletKrzysztof Szafranek2016-10-091-1/+1
| | |/ / /
| * | | | When a sub command fail, display error messageJeremy Benoist2016-10-091-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We often got issue with message “The command "doctrine:database:create" terminated with an error code: 1.”. Using the `BufferedOutput` we can store the output and only display it if an error occurs.
| * | | | Optimize the way tag list is renderedJeremy Benoist2016-10-096-12/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query. Also change the layout of the tag list in material design
| * | | | Avoid tag duplication when tagging all articlesJeremy Benoist2016-10-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Mostly when the tag doesn’t yet exist. It was created each time it matche the rule… glups.
| * | | | Add more log to tag:allJeremy Benoist2016-10-091-1/+4
| |/ / /
| * | | Merge pull request #2406 from szafranek/bugfix-number-of-annotationsJeremy Benoist2016-10-0911-11/+10
| |\ \ \ | | | | | | | | | | Show number of annotations instead of nbAnnotations placeholder
| | * | | Show number of annotations instead of nbAnnotations placeholderKrzysztof Szafranek2016-10-0911-11/+10
| | | | | | | | | | | | | | | | | | | | When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number.
| * | | | Fix few invalid HTML tagsKrzysztof Szafranek2016-10-093-3/+3
| |/ / /
| * | | Merge pull request #2351 from wallabag/fix-api-client-deletionNicolas Lœuillet2016-10-083-3/+13
| |\ \ \ | | | | | | | | | | Changed relation between API client and refresh token
| | * | | Ensure access_token are removedJeremy Benoist2016-10-083-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we remove the client, we should ensure that access_token are also removed. To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error. Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)
| | * | | Changed relation between API client and refresh tokenNicolas Lœuillet2016-10-031-0/+5
| | | | | | | | | | | | | | | | | | | | Fix #2350