aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2473 from pmichelazzo/masterJeremy Benoist2016-10-252-0/+498
|\ | | | | Portuguese (Brazilian) translation
| * Translated missed line 147Paulino Michelazzo2016-10-251-1/+1
| |
| * Fix Portuguese translationJeremy Benoist2016-10-211-2/+2
| |
| * Update translationPaulino Michelazzo2016-10-211-60/+60
| |
| * Update Portuguese translationsJeremy Benoist2016-10-201-9/+78
| |
| * Update validators.pt.yml filePaulino Michelazzo2016-10-201-5/+5
| | | | | | Some missed strings translated.
| * Merge remote-tracking branch 'wallabag/master'Paulino Michelazzo2016-10-18235-20760/+5158
| |\
| * | Portuguese (Brazilian) translationPaulino Michelazzo2016-10-182-0/+429
| | | | | | | | | | | | This the Portuguese (Brazilian) for the Wallaby v2.
* | | 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
* | 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
* | | Merge pull request #2393 from wallabag/api-urls-existNicolas Lœuillet2016-10-081-1/+21
|\ \ \ | | | | | | | | Ability to check multiple urls in API
| * | | Ability to check multiple urls in APIJeremy Benoist2016-10-071-1/+21
| | | |
* | | | Ensure orphan tag are remove in APIJeremy Benoist2016-10-073-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | When the association between a tag and an entry is removed, if the tag doesn’t have other entries, we can remove it. Also add more tests for that part and ensure TagControllerTest is isolated from the rest of the test suite (finally!)
* | | | Merge pull request #2396 from wallabag/mruminski-patch-1Nicolas Lœuillet2016-10-071-1/+1
|\ \ \ \ | | | | | | | | | | Update messages.pl.yml
| * | | | Update messages.pl.ymlMateusz Rumiński2016-10-071-1/+1
| |/ / / | | | | | | | | translated shared_by_wallabag to polish
* / / / Add ability to use socketJeremy Benoist2016-10-071-1/+2
|/ / / | | | | | | | | | For Redis & MySQL
* | | Merge pull request #2389 from wallabag/add-info-publich-articlesNicolas Lœuillet2016-10-071-0/+2
|\ \ \ | | | | | | | | Added default picture if preview picture is null
| * | | Added default picture if preview picture is nullNicolas Lœuillet2016-10-071-0/+2
| | | |
* | | | Fixed two-factor checkbox display in user admin panelNicolas Lœuillet2016-10-071-1/+1
| | | | | | | | | | | | | | | | Fix #2380