aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2418 from wallabag/add-twitter-cardsNicolas Lœuillet2016-10-101-3/+7
|\ | | | | Added support of Twitter Cards for public articles
| * Added support of Twitter Cards for public articlesNicolas Lœuillet2016-10-101-3/+7
|/
* Merge pull request #2417 from wallabag/version-devNicolas Lœuillet2016-10-101-1/+1
|\ | | | | Define a dev version for the master
| * Define a dev version for the masterJeremy Benoist2016-10-101-1/+1
|/ | | This is to be sure that user testing wallabag from the master will have the version defined as dev.
* 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
| |/
* | Merge pull request #2413 from wallabag/sub-command-verboseJeremy Benoist2016-10-101-7/+10
|\ \ | | | | | | When a sub command fail, display error message
| * | 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.
* | Merge pull request #2410 from wallabag/tag-optimNicolas Lœuillet2016-10-0915-47/+104
|\ \ | |/ |/| Optimize tag list display
| * CSJeremy Benoist2016-10-091-1/+2
| |
| * Optimize the way tag list is renderedJeremy Benoist2016-10-0913-45/+92
| | | | | | | | | | | | 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.
* | Merge pull request #2405 from szafranek/cleanup-fix-invalid-htmlNicolas Lœuillet2016-10-093-3/+3
|\ \ | |/ |/| Fix few invalid HTML tags
| * Fix few invalid HTML tagsKrzysztof Szafranek2016-10-093-3/+3
|/
* Merge pull request #2402 from wallabag/remove-1x-changelogJeremy Benoist2016-10-081-1086/+767
|\ | | | | Removed 1.x stuff in CHANGELOG
| * Removed 1.x stuff in CHANGELOGNicolas Lœuillet2016-10-081-1086/+767
|/
* Merge pull request #2351 from wallabag/fix-api-client-deletionNicolas Lœuillet2016-10-085-4/+45
|\ | | | | Changed relation between API client and refresh token
| * Ensure access_token are removedJeremy Benoist2016-10-085-4/+40
| | | | | | | | | | | | | | | | 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-082-1/+37
|\ \ | | | | | | Ability to check multiple urls in API
| * | Ability to check multiple urls in APIJeremy Benoist2016-10-072-1/+37
| | |
* | | Merge pull request #2397 from wallabag/api-orphan-tagsNicolas Lœuillet2016-10-086-27/+78
|\ \ \ | | | | | | | | Ensure orphan tag are remove in API
| * | | Ensure orphan tag are remove in APIJeremy Benoist2016-10-076-27/+78
| | | | | | | | | | | | | | | | | | | | | | | | 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 #2399 from wallabag/use-locale-for-configJeremy Benoist2016-10-081-1/+1
|\ \ \ \ | | | | | | | | | | Use default locale for user config
| * | | | Use default locale for user configJeremy Benoist2016-10-081-1/+1
| |/ / / | | | | | | | | | | | | When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead
* | | | Merge pull request #2400 from wallabag/doc-env-prodJeremy Benoist2016-10-089-51/+51
|\ \ \ \ | |/ / / |/| | | Set env to prod in documentation
| * | | Set env to prod in documentationJeremy Benoist2016-10-089-51/+51
|/ / /
* | | 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
* | | Merge pull request #2395 from wallabag/socket-connectionNicolas Lœuillet2016-10-073-1/+6
|\ \ \ | |/ / |/| | Add ability to use socket
| * | Add ability to use socketJeremy Benoist2016-10-073-1/+6
|/ / | | | | | | For Redis & MySQL
* | Merge pull request #2386 from wallabag/update-changelogNicolas Lœuillet2016-10-072-240/+2438
|\ \ | | | | | | Changed Changelog by using github-changelog-generator from @skywinder
| * | Update release processNicolas Lœuillet2016-10-071-0/+1
| | |
| * | Changed Changelog by using github-changelog-generator from @skywinderNicolas Lœuillet2016-10-071-240/+2437
| | |
* | | Merge pull request #2389 from wallabag/add-info-publich-articlesNicolas Lœuillet2016-10-072-0/+3
|\ \ \ | | | | | | | | Added default picture if preview picture is null
| * | | Added default picture if preview picture is nullNicolas Lœuillet2016-10-072-0/+3
| | | |
* | | | Merge pull request #2388 from wallabag/fix-2factor-user-adminNicolas Lœuillet2016-10-072-2/+2
|\ \ \ \ | | | | | | | | | | Fixed two-factor checkbox display in user admin panel
| * | | | Fixed two-factor checkbox display in user admin panelNicolas Lœuillet2016-10-072-2/+2
| | | | | | | | | | | | | | | | | | | | Fix #2380
* | | | | Merge pull request #2385 from wallabag/add-doc-about-siteconfigJeremy Benoist2016-10-072-6/+30
|\ \ \ \ \ | |/ / / / |/| | | | Added documentation about siteconfig fix
| * | | | Fixed reviewNicolas Lœuillet2016-10-071-2/+2
| | | | |
| * | | | Added link to fivefilters websiteNicolas Lœuillet2016-10-072-5/+5
| | | | |
| * | | | Fixed reviewNicolas Lœuillet2016-10-072-3/+3
| | | | |
| * | | | Added documentation about siteconfig fixNicolas Lœuillet2016-10-072-6/+30
| | |/ / | |/| | | | | | | | | | Found in #2358, thank you @j0k3r
* | | | Merge pull request #2383 from wallabag/add-info-publich-articlesNicolas Lœuillet2016-10-0713-3/+35
|\ \ \ \ | |/ / / |/| / / | |/ / Added OpenGraph support for public articles
| * | Added test for OpenGraphNicolas Lœuillet2016-10-071-1/+4
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 09:01:19 +0000