aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | 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 #2409 from wallabag/Quent-in-patch-1Jeremy Benoist2016-10-111-39/+39
|\ \ \ \ | | | | | | | | | | Occitan version update
| * | | | Update messages.oc.ymlQuent-in2016-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | I thought I had translated the Docker installation line, apparently not! Thanks Nicolas for the other changes!
| * | | | Fixed reviewNicolas Lœuillet2016-10-101-1/+2
| | | | |
| * | | | Occitan version updateQuent-in2016-10-091-39/+38
| |/ / / | | | | | | | | | | | | | | | | If you need to write dates in full letter you might be interessed in https://github.com/fightbulc/moment.php It comes with lots of languages ;) Q: where are the "previous" and "next" bouton text? Can't find them to translate them.
* | | | Remove unnecessary user serializationJeremy Benoist2016-10-081-11/+1
| | | |
* | | | CSJeremy Benoist2016-10-081-11/+11
| | | |
* | | | Bonus: display driver in install commandJeremy Benoist2016-10-081-2/+2
| | | |
* | | | Fix PostgreSQL queryJeremy Benoist2016-10-081-1/+1
| | | | | | | | | | | | | | | | PostgreSQL doesn’t like when we compare interger and boolean :)
* | | | Better display and descriptionJeremy Benoist2016-10-0813-51/+68
| | | | | | | | | | | | | | | | Confirmation message isn’t required since it is written in the delete description
* | | | Logout user before deleting itJeremy Benoist2016-10-082-21/+32
| | | | | | | | | | | | | | | | And add a smal description
* | | | Changed testsNicolas Lœuillet2016-10-082-2/+2
| | | |
* | | | Added check if there is only one userNicolas Lœuillet2016-10-0815-1/+46
| | | | | | | | | | | | | | | | Added translations and documentation
* | | | CSThomas Citharel2016-10-082-13/+13
| | | |
* | | | workThomas Citharel2016-10-0814-1/+65
|/ / /
* | | 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
* | | Merge pull request #2383 from wallabag/add-info-publich-articlesNicolas Lœuillet2016-10-0712-2/+31
|\| | | | | | | | Added OpenGraph support for public articles
| * | Fixed reviewNicolas Lœuillet2016-10-0712-21/+21
| | |
| * | Added OpenGraph support for public articlesNicolas Lœuillet2016-10-0712-2/+31
| | | | | | | | | | | | Fix #2289
* | | Fix tag testJeremy Benoist2016-10-071-1/+0
| | |
* | | Fix bad translation keyJeremy Benoist2016-10-0711-11/+11
| | | | | | | | | | | | `entry_reload_failed` instead of `entry_reloaded_failed`
* | | Fix relations export for EntryJeremy Benoist2016-10-074-10/+30
|/ / | | | | | | | | Tags & Annotations weren’t really well exported. This is now fixed (+ tests)
* | Merge pull request #2377 from wallabag/fix-exists-apiThomas Citharel2016-10-051-1/+1
|\ \ | | | | | | Fix exists API call
| * | Fix typo & add testJeremy Benoist2016-10-051-1/+1
| | |
| * | Fix exists API callThomas Citharel2016-10-051-1/+1
| | | | | | | | | Boo
* | | better tags on materialThomas Citharel2016-10-052-5/+6
| | |