aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3431 from wallabag/disable-site-credentialsJérémy Benoist2017-11-222-0/+32
|\
| * Disable controller access if feature disabledJeremy Benoist2017-11-222-0/+32
* | Merge pull request #3398 from wallabag/issue-1735Nicolas Lœuillet2017-11-213-146/+28
|\ \
| * | Replace ant with MakefileKevin Decherf2017-11-193-146/+28
* | | Merge pull request #3425 from wallabag/add-setting-for-headersNicolas Lœuillet2017-11-2119-3/+105
|\ \ \ | | |/ | |/|
| * | Define storeArticleHeaders false by defaultJeremy Benoist2017-11-214-17/+18
| * | Added internal setting to enable/disable headers storageNicolas Lœuillet2017-11-2019-15/+116
* | | Merge pull request #3426 from wallabag/fix-migration-3373Nicolas Lœuillet2017-11-214-3/+4
|\ \ \
| * | | CSJeremy Benoist2017-11-213-3/+3
| * | | Fix MySQL issue on mig from #3373Kevin Decherf2017-11-201-0/+1
|/ / /
* | | Merge pull request #3346 from Kdecherf/origin-propertyNicolas Lœuillet2017-11-2025-4/+356
|\ \ \
| * | | Fix phpcsKevin Decherf2017-11-195-22/+22
| * | | Improve EntryRestControllerTest for origin_urlKevin Decherf2017-11-191-0/+55
| * | | Update EntryControllerTest to handle origin_urlKevin Decherf2017-11-191-2/+38
| * | | Replace hardcoded 'Provided by' string with i18n stringKevin Decherf2017-11-1915-2/+15
| * | | Improve origin_url field description and translationsKevin Decherf2017-11-1914-14/+15
| * | | Form: move url and origin_url to UrlTypeKevin Decherf2017-11-191-2/+3
| * | | Add support of originUrl field in baggy entry viewKevin Decherf2017-11-191-0/+8
| * | | Add some tests for OriginUrl in EntryRestControllerKevin Decherf2017-11-192-0/+74
| * | | Handle original_url querystring in Shaarli sharing linkKevin Decherf2017-11-191-1/+1
| * | | Add support of originUrl field in material entry viewKevin Decherf2017-11-191-0/+8
| * | | Twig: add removeSchemeAndWww filterKevin Decherf2017-11-192-0/+35
| * | | Entry: handle originUrl in edit form, update translationsKevin Decherf2017-11-1914-0/+22
| * | | Add originUrl property to Entry, handle that in EntryRestController, handle m...Kevin Decherf2017-11-193-0/+99
| |/ /
* | | Merge pull request #3423 from wallabag/composerKevin Decherf2017-11-201-28/+28
|\ \ \ | |/ / |/| |
| * | composer: update dependency versions to reduce memory footprintKevin Decherf2017-11-191-28/+28
|/ /
* | Merge pull request #3422 from wallabag/simpleue-2Nicolas Lœuillet2017-11-192-1/+18
|\ \
| * | Jump to Simpleue 2.0Jeremy Benoist2017-11-182-1/+18
* | | Merge pull request #3421 from comradekingu/patch-2Kevin Decherf2017-11-191-10/+10
|\ \ \
| * | | "for the public wallabag demo", paywalled websites, diaspora*Allan Nordhøy2017-11-181-3/+3
| * | | Spelling: diaspora, e-mail, moved ?, URL, sharingAllan Nordhøy2017-11-181-8/+8
| |/ /
* | | Merge pull request #3420 from comradekingu/patch-1Kevin Decherf2017-11-191-1/+1
|\ \ \ | |/ / |/| |
| * | Spelling: Two-factor for wallabag connectionAllan Nordhøy2017-11-181-1/+1
|/ /
* | Merge pull request #3412 from aaa2000/fix-testsJérémy Benoist2017-11-122-6/+7
|\ \
| * | Fix phpcsadev2017-11-111-1/+1
| * | Fix testsadev2017-11-112-6/+7
|/ /
* | Merge pull request #3404 from wallabag/issue-2424Kevin Decherf2017-11-075-4/+15
|\ \
| * | material: replace card activator with article link on card previewKevin Decherf2017-11-065-4/+15
|/ /
* | Merge pull request #3397 from wallabag/issue-1871Kevin Decherf2017-11-064-2/+12
|\ \
| * | Update assets for #3397Kevin Decherf2017-11-052-2/+2
| * | material: disable editing of entry url input when submitting new urlKevin Decherf2017-11-052-0/+10
|/ /
* | Merge pull request #3387 from Kdecherf/fix-assets-23Jérémy Benoist2017-11-02116-411/+42
|\ \
| * | Updating .gitignoreKevin Decherf2017-10-242-4/+3
| * | Removing web/bundles/wallabagcore and adding prod assets in web/wallassetsKevin Decherf2017-10-24105-375/+7
| * | webpack & views: replace bundles/wallabagcore with wallassetsKevin Decherf2017-10-249-32/+32
* | | Merge pull request #3399 from aaa2000/editorconfig-makefileJérémy Benoist2017-11-021-0/+3
|\ \ \ | |_|/ |/| |
| * | Update .editorconfig for makefileadev2017-11-011-0/+3
|/ /
* | Merge pull request #3395 from wallabag/issue-3393Kevin Decherf2017-11-011-1/+1
|\ \
| * | views/config: fix overlaying drop down menuKevin Decherf2017-10-311-1/+1
|/ /
* | Merge pull request #3392 from mart-e/add-title-page-epubJérémy Benoist2017-10-311-3/+3
|\ \ | |/ |/|