aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
* | | 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
| | |
* | | better tags on baggyThomas Citharel2016-10-042-4/+6
|/ /
* | Merge pull request #2353 from wallabag/assets-fixThomas Citharel2016-10-042-20/+25
|\ \ | | | | | | Basically, fix everything
| * | Fix icon positionThomas Citharel2016-10-041-3/+6
| | |
| * | Fixed calendar icon position with baggy themeNicolas Lœuillet2016-10-041-1/+2
| | |
| * | Fixed icon position in share menuNicolas Lœuillet2016-10-041-7/+6
| | |
| * | fix iconsThomas Citharel2016-10-041-8/+6
| | |
| * | Basically, fix everythingThomas Citharel2016-10-032-21/+25
| |/ | | | | | | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed
* / Create config even if user is disabledJeremy Benoist2016-10-041-4/+0
|/ | | | | When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event. There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived.
* Merge pull request #2341 from mruminski/masterThomas Citharel2016-10-031-31/+31
|\ | | | | Update messages.pl.yml
| * Update messages.pl.ymlMateusz Rumiński2016-10-031-31/+31
| | | | | | add missing and update existing translation
* | improve German translationSven Fischer2016-10-031-1/+1
|/
* Fixed CSS for quickstart linksNicolas Lœuillet2016-10-031-1/+1
|
* Merge pull request #2333 from wallabag/translation-german-for-2.1Jeremy Benoist2016-10-031-51/+51
|\ | | | | for 2.1, translate all strings to German, which haven't been translated yet
| * Update messages.de.ymlJeremy Benoist2016-10-031-1/+1
| |
| * Fixed typosNicolas Lœuillet2016-10-031-2/+1
| |
| * Better translation for the weird sentenceJulian Oster2016-10-021-1/+2
| |
| * Improve the german translation a bitJulian Oster2016-10-021-10/+10
| | | | | | Just some little mistakes, good work so far :)
| * translate all strings to German, which haven't been translated yetSven Fischer2016-10-021-51/+51
| |
* | Merge pull request #2314 from wallabag/assetsNicolas Lœuillet2016-10-033-21/+3
|\ \ | |/ |/| Assets work
| * Assets workThomas Citharel2016-09-283-21/+3
| | | | | | | | | | | | | | | | | | | | * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231
* | Merge pull request #2331 from wallabag/api-linksThomas Citharel2016-10-022-3/+16
|\ \ | | | | | | Fix parameters in API _links
| * | Fix parameters in API _linksJeremy Benoist2016-10-022-3/+16
| | | | | | | | | | | | We forgot to pass them to the factory
* | | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-10-021-1/+1
|\ \ \ | |/ / |/| |
| * | Remove error message when creating ePub versionsPaulino Michelazzo2016-10-021-1/+1
| | | | | | | | | | | | | | | | | | Trying to create a ePub version, the first page shows a message of a “missing >”. This change solve this problem (and, for sure, in any download version that’s use HTML).
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 22:59:05 +0000