Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #3298 from nclsHart/fix-namespace-phpdoc | Jérémy Benoist | 2017-07-30 | 9 | -8/+17 | |
|\ \ \ | | | | | | | | | Fix some namespaces and phpdoc | |||||
| * | | | Fix some namespaces and phpdoc | Nicolas Hart | 2017-07-29 | 9 | -8/+17 | |
| | | | | ||||||
* | | | | Merge pull request #3299 from nclsHart/missing-method-prepare-entry | Jérémy Benoist | 2017-07-30 | 1 | -0/+2 | |
|\ \ \ \ | |/ / / |/| | | | Add missing abstract method prepareEntry in BrowserImport | |||||
| * | | | Add missing abstract method prepareEntry in BrowserImport | Nicolas Hart | 2017-07-29 | 1 | -0/+2 | |
|/ / / | ||||||
* | | | Merge pull request #3290 from nclsHart/fix-3019 | Jérémy Benoist | 2017-07-29 | 14 | -1/+14 | |
|\ \ \ | |/ / |/| | | Add a dedicated title for all entries page | |||||
| * | | add a dedicated title for all entries page | Nicolas Hart | 2017-07-27 | 14 | -1/+14 | |
| | | | ||||||
* | | | Merge pull request #3291 from nclsHart/show-user-io | Jérémy Benoist | 2017-07-28 | 1 | -10/+13 | |
|\ \ \ | | | | | | | | | Better rendering for show user command using symfony style | |||||
| * | | | Better rendering for show user command using symfony style | Nicolas Hart | 2017-07-27 | 1 | -10/+13 | |
| |/ / | ||||||
* | | | Merge pull request #3292 from nclsHart/remove-getdoctrine | Jérémy Benoist | 2017-07-28 | 3 | -15/+0 | |
|\ \ \ | | | | | | | | | Remove unused method getDoctrine in several commands | |||||
| * | | | Remove unused method getDoctrine in several commands | Nicolas Hart | 2017-07-27 | 3 | -15/+0 | |
| |/ / | ||||||
* | | | Merge pull request #3293 from nclsHart/remove-unused-use | Jérémy Benoist | 2017-07-28 | 1 | -1/+0 | |
|\ \ \ | | | | | | | | | Remove unused use statement in install command | |||||
| * | | | Remove unused use statement in install command | Nicolas Hart | 2017-07-27 | 1 | -1/+0 | |
| |/ / | ||||||
* | | | Merge pull request #3280 from Simounet/fix/2.3-date | Jérémy Benoist | 2017-07-25 | 2 | -2/+42 | |
|\ \ \ | | | | | | | | | Fix updatePublishedAt on already parsed article's date | |||||
| * | | | Add a test for updatePublishedAt | Jeremy Benoist | 2017-07-24 | 2 | -3/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid error when a content is re-submitted and it previously add a published date. Also, fix the `testPostSameEntry` | |||||
| * | | | Fix updatePublishedAt on already parsed article's date | Simounet | 2017-07-24 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #3284 from wallabag/travis-7.2 | Jérémy Benoist | 2017-07-24 | 1 | -0/+2 | |
|\ \ \ \ | |/ / / |/| | | | Testing on PHP 7.2 | |||||
| * | | | Testing on PHP 7.2 | Jérémy Benoist | 2017-07-24 | 1 | -0/+2 | |
|/ / / | ||||||
* | | | Merge pull request #3283 from wallabag/fix-language-validation | Jérémy Benoist | 2017-07-24 | 2 | -7/+7 | |
|\ \ \ | |/ / |/| | | Put the final URL in data test | |||||
| * | | CS | Jeremy Benoist | 2017-07-24 | 1 | -6/+6 | |
| | | | ||||||
| * | | Put the final URL in data test | Jeremy Benoist | 2017-07-24 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #3266 from egilli/export-domain-as-author | Jérémy Benoist | 2017-07-11 | 4 | -6/+35 | |
|\ \ | | | | | | | Use the article publisher as author for exported files | |||||
| * | | Make updateAuthor code simpler to read | Étienne Gilli | 2017-07-10 | 1 | -8/+10 | |
| | | | ||||||
| * | | Use the article publisher as author for export | Étienne Gilli | 2017-07-09 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | When exporting an entry, use the publishedBy field as author name for epub, mobi and pdf formats. Fallback to domain name if empty. | |||||
| * | | Use the article domain as author for export files | Étienne Gilli | 2017-07-08 | 4 | -6/+26 | |
| | | | | | | | | | | | | | | | | | | | | | When exporting an entry, use the domain name as author name for epub, mobi and pdf formats, instead of 'wallabag'. Change the author from array to string, because for now, there is always only one author. | |||||
* | | | Merge pull request #3270 from wallabag/do-not-allow-html-api | Jérémy Benoist | 2017-07-11 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Disallow html for API templating formats | |||||
| * | | | Disallow html for templating formats | Jeremy Benoist | 2017-07-09 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | Using html template format will then put the html format in the allowed list for the api doc which we don’t want since the api doesn’t response for html format. | |||||
* | | | Merge pull request #3264 from wallabag/trait-timestamps | Jérémy Benoist | 2017-07-11 | 5 | -48/+36 | |
|\ \ \ | | | | | | | | | Add EntityTimestampsTrait to handle dates | |||||
| * | | | Add EntityTimestampsTrait to handle dates | Jeremy Benoist | 2017-07-06 | 5 | -48/+36 | |
| |/ / | | | | | | | | | | Refactorize timestamps() method to avoid re-writing it on each entity | |||||
* | | | Merge pull request #3267 from wallabag/revert-client-credentials | Jérémy Benoist | 2017-07-09 | 2 | -22/+2 | |
|\ \ \ | |/ / |/| | | Revert client_credentials grant types | |||||
| * | | Revert client_credentials grant types | Jeremy Benoist | 2017-07-08 | 2 | -22/+2 | |
|/ / | ||||||
* | | Merge pull request #3256 from wallabag/fix-patch | Jérémy Benoist | 2017-07-05 | 5 | -167/+347 | |
|\ \ | | | | | | | Fix PATCH method | |||||
| * | | CS | Jeremy Benoist | 2017-07-03 | 4 | -96/+95 | |
| | | | ||||||
| * | | Fix validateAndSetPreviewPicture | Jeremy Benoist | 2017-07-03 | 2 | -4/+36 | |
| | | | | | | | | | | | | Which wasn't covered by a test! | |||||
| * | | Fix PATCH method | Jeremy Benoist | 2017-07-03 | 5 | -121/+270 | |
| | | | | | | | | | | | | | | | The PATCH method for the entry should only update what user sent to us and not the whole entry as it was before. Also, sending tags when patching an entry will now remove all current tags & assocatied new ones. | |||||
* | | | Merge pull request #3257 from wallabag/fix-mapping-entities | Jérémy Benoist | 2017-07-03 | 2 | -1/+8 | |
|\ \ \ | |/ / |/| | | Fixed mapping entities | |||||
| * | | CS | Jeremy Benoist | 2017-07-03 | 2 | -2/+2 | |
| | | | ||||||
| * | | Fixed mapping entities | Jeremy Benoist | 2017-07-03 | 1 | -0/+7 | |
|/ / | | | | | | | | | | | There were this error in the console: > The association Wallabag\CoreBundle\Entity\SiteCredential#user refers to the inverse side field Wallabag\UserBundle\Entity\User#site_credentials which does not exist. | |||||
* | | Merge pull request #3258 from wallabag/cs-fixer | Jérémy Benoist | 2017-07-03 | 171 | -2330/+2352 | |
|\ \ | | | | | | | Add a real configuration for CS-Fixer | |||||
| * | | Fix tests | Jeremy Benoist | 2017-07-03 | 9 | -39/+34 | |
| | | | ||||||
| * | | Add a real configuration for CS-Fixer | Jeremy Benoist | 2017-07-01 | 170 | -2312/+2339 | |
|/ / | ||||||
* | | Merge pull request #3245 from wallabag/fix-bc | Jérémy Benoist | 2017-06-29 | 2 | -8/+69 | |
|\ \ | | | | | | | Avoid BC on exists endpoint | |||||
| * | | CS | Jérémy Benoist | 2017-06-28 | 1 | -2/+2 | |
| | | | ||||||
| * | | Return null instead of false | Jeremy Benoist | 2017-06-28 | 2 | -6/+30 | |
| | | | ||||||
| * | | Avoid BC on exists endpoint | Jeremy Benoist | 2017-06-23 | 2 | -6/+43 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-06-26 | 1 | -142/+142 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | Merge pull request #3237 from matteocoder/master | Jérémy Benoist | 2017-06-26 | 1 | -156/+160 | |
| |\ | | | | | | | Revised messages.it.yml file | |||||
| | * | Fixed broken lines and added new lines | matteocoder | 2017-06-24 | 1 | -5/+7 | |
| | | | | | | | | | In addition to fixing broken lines, I've also added a couple of lines from recent PRs. | |||||
| | * | Merge pull request #1 from matteocoder/matteocoder-messages.it | matteocoder | 2017-06-17 | 1 | -154/+156 | |
| |/| | | | | | | | revised messages.it | |||||
| | * | revised messages.it | matteocoder | 2017-06-17 | 1 | -154/+156 | |
| |/ | ||||||
* | | Merge pull request #3204 from wallabag/better-export-page | Jérémy Benoist | 2017-06-22 | 20 | -80/+479 | |
|\ \ | | | | | | | Better public sharing page |