aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2420 from wallabag/redis-testsNicolas Lœuillet2016-10-102-0/+2
|\ | | | | Avoid error when Redis isn't here in tests
| * Avoid error when Redis isn't here in testsJeremy Benoist2016-10-102-0/+2
| |
* | Merge pull request #2403 from wallabag/cleanup-install-process-in-docJeremy Benoist2016-10-1024-125/+325
|\ \ | |/ |/| Cleaned up documentation for installation process
| * Added steps about Redis/RabbitMQ activationNicolas Lœuillet2016-10-106-0/+24
| |
| * Fixed links on import pageNicolas Lœuillet2016-10-102-4/+4
| |
| * Use table for parameters.ymlJeremy Benoist2016-10-101-46/+48
| |
| * Added page about parameters.ymlNicolas Lœuillet2016-10-104-5/+53
| |
| * Add -dev versionJeremy Benoist2016-10-101-0/+1
| | | | | | Following https://github.com/wallabag/wallabag/pull/2417
| * Typos in upgrade docNicolas Lœuillet2016-10-101-3/+29
| |
| * Update upgrade documentationNicolas Lœuillet2016-10-102-21/+11
| |
| * Update documentationNicolas Lœuillet2016-10-109-28/+30
| |
| * Added documentation about testsuiteNicolas Lœuillet2016-10-108-5/+46
| | | | | | | | Fix #2415
| * Update RELEASE_PROCESS.mdJeremy Benoist2016-10-101-13/+13
| |
| * Update README.mdJeremy Benoist2016-10-101-4/+4
| |
| * Changed the default command when we launch makeNicolas Lœuillet2016-10-091-0/+2
| |
| * Created scripts folder to store update/install/release processNicolas Lœuillet2016-10-094-26/+39
| |
| * Update MakefileNicolas Lœuillet2016-10-091-23/+14
| |
| * Update MakefileNicolas Lœuillet2016-10-091-11/+34
| |
| * First draft for MakefileNicolas Lœuillet2016-10-092-6/+47
| |
| * update German installation.rstStrubbl2016-10-081-2/+2
| |
| * update German installation.rstStrubbl2016-10-081-4/+3
| |
| * Chmoded install.shNicolas Lœuillet2016-10-081-0/+0
| |
| * Cleaned up documentation for installation processNicolas Lœuillet2016-10-087-80/+77
| |
* | Merge pull request #2419 from wallabag/fix-twitter-cardsNicolas Lœuillet2016-10-101-0/+1
|\ \ | | | | | | Fixed Twitter Cards by adding a description tag
| * | Fixed Twitter Cards by adding a description tagNicolas Lœuillet2016-10-101-0/+1
|/ /
* | 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