aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3299 from nclsHart/missing-method-prepare-entryJérémy Benoist2017-07-301-0/+2
|\ | | | | Add missing abstract method prepareEntry in BrowserImport
| * Add missing abstract method prepareEntry in BrowserImportNicolas Hart2017-07-291-0/+2
|/
* Merge pull request #3290 from nclsHart/fix-3019Jérémy Benoist2017-07-2914-1/+14
|\ | | | | Add a dedicated title for all entries page
| * add a dedicated title for all entries pageNicolas Hart2017-07-2714-1/+14
| |
* | Merge pull request #3291 from nclsHart/show-user-ioJérémy Benoist2017-07-281-10/+13
|\ \ | | | | | | Better rendering for show user command using symfony style
| * | Better rendering for show user command using symfony styleNicolas Hart2017-07-271-10/+13
| |/
* | Merge pull request #3292 from nclsHart/remove-getdoctrineJérémy Benoist2017-07-283-15/+0
|\ \ | | | | | | Remove unused method getDoctrine in several commands
| * | Remove unused method getDoctrine in several commandsNicolas Hart2017-07-273-15/+0
| |/
* | Merge pull request #3293 from nclsHart/remove-unused-useJérémy Benoist2017-07-281-1/+0
|\ \ | | | | | | Remove unused use statement in install command
| * | Remove unused use statement in install commandNicolas Hart2017-07-271-1/+0
| |/
* | Merge pull request #3280 from Simounet/fix/2.3-dateJérémy Benoist2017-07-252-2/+42
|\ \ | | | | | | Fix updatePublishedAt on already parsed article's date
| * | Add a test for updatePublishedAtJeremy Benoist2017-07-242-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 dateSimounet2017-07-241-1/+1
| | |
* | | Merge pull request #3284 from wallabag/travis-7.2Jérémy Benoist2017-07-241-0/+2
|\ \ \ | |/ / |/| | Testing on PHP 7.2
| * | Testing on PHP 7.2Jérémy Benoist2017-07-241-0/+2
|/ /
* | Merge pull request #3283 from wallabag/fix-language-validationJérémy Benoist2017-07-242-7/+7
|\ \ | |/ |/| Put the final URL in data test
| * CSJeremy Benoist2017-07-241-6/+6
| |
| * Put the final URL in data testJeremy Benoist2017-07-241-1/+1
|/
* Merge pull request #3266 from egilli/export-domain-as-authorJérémy Benoist2017-07-114-6/+35
|\ | | | | Use the article publisher as author for exported files
| * Make updateAuthor code simpler to readÉtienne Gilli2017-07-101-8/+10
| |
| * Use the article publisher as author for exportÉtienne Gilli2017-07-091-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 Gilli2017-07-084-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-apiJérémy Benoist2017-07-111-1/+1
|\ \ | | | | | | Disallow html for API templating formats
| * | Disallow html for templating formatsJeremy Benoist2017-07-091-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-timestampsJérémy Benoist2017-07-115-48/+36
|\ \ | | | | | | Add EntityTimestampsTrait to handle dates
| * | Add EntityTimestampsTrait to handle datesJeremy Benoist2017-07-065-48/+36
| |/ | | | | | | Refactorize timestamps() method to avoid re-writing it on each entity
* | Merge pull request #3267 from wallabag/revert-client-credentialsJérémy Benoist2017-07-092-22/+2
|\ \ | |/ |/| Revert client_credentials grant types
| * Revert client_credentials grant typesJeremy Benoist2017-07-082-22/+2
|/
* Merge pull request #3256 from wallabag/fix-patchJérémy Benoist2017-07-055-167/+347
|\ | | | | Fix PATCH method
| * CSJeremy Benoist2017-07-034-96/+95
| |
| * Fix validateAndSetPreviewPictureJeremy Benoist2017-07-032-4/+36
| | | | | | | | Which wasn't covered by a test!
| * Fix PATCH methodJeremy Benoist2017-07-035-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-entitiesJérémy Benoist2017-07-032-1/+8
|\ \ | |/ |/| Fixed mapping entities
| * CSJeremy Benoist2017-07-032-2/+2
| |
| * Fixed mapping entitiesJeremy Benoist2017-07-031-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-fixerJérémy Benoist2017-07-03171-2330/+2352
|\ | | | | Add a real configuration for CS-Fixer
| * Fix testsJeremy Benoist2017-07-039-39/+34
| |
| * Add a real configuration for CS-FixerJeremy Benoist2017-07-01170-2312/+2339
|/
* Merge pull request #3245 from wallabag/fix-bcJérémy Benoist2017-06-292-8/+69
|\ | | | | Avoid BC on exists endpoint
| * CSJérémy Benoist2017-06-281-2/+2
| |
| * Return null instead of falseJeremy Benoist2017-06-282-6/+30
| |
| * Avoid BC on exists endpointJeremy Benoist2017-06-232-6/+43
| |
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-06-261-142/+142
|\ \ | |/ |/|
| * Merge pull request #3237 from matteocoder/masterJérémy Benoist2017-06-261-156/+160
| |\ | | | | | | Revised messages.it.yml file
| | * Fixed broken lines and added new linesmatteocoder2017-06-241-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.itmatteocoder2017-06-171-154/+156
| |/| | | | | | | revised messages.it
| | * revised messages.itmatteocoder2017-06-171-154/+156
| |/
* | Merge pull request #3204 from wallabag/better-export-pageJérémy Benoist2017-06-2220-80/+479
|\ \ | | | | | | Better public sharing page
| * | Don't load js for nothing in prodThomas Citharel2017-06-221-2/+3
| | |
| * | Add css on share public pageThomas Citharel2017-06-229-3/+17
| | |