Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #3401 from aaa2000/migration-initial | Jérémy Benoist | 2017-11-25 | 10 | -167/+237 | |
|\ \ | ||||||
| * | | Fix phpcs | adev | 2017-11-21 | 1 | -5/+4 | |
| * | | Fix travis fold | adev | 2017-11-21 | 1 | -1/+1 | |
| * | | Remove data sql files | adev | 2017-11-21 | 3 | -120/+0 | |
| * | | Implements down migration | adev | 2017-11-21 | 1 | -1/+12 | |
| * | | Fix installation command | adev | 2017-11-21 | 4 | -31/+43 | |
| * | | Fold travis make prepare | adev | 2017-11-21 | 1 | -0/+2 | |
| * | | Add an initial migration | adev | 2017-11-21 | 3 | -16/+182 | |
* | | | Merge pull request #3431 from wallabag/disable-site-credentials | Jérémy Benoist | 2017-11-22 | 2 | -0/+32 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Disable controller access if feature disabled | Jeremy Benoist | 2017-11-22 | 2 | -0/+32 | |
* | | | Merge pull request #3398 from wallabag/issue-1735 | Nicolas Lœuillet | 2017-11-21 | 3 | -146/+28 | |
|\ \ \ | ||||||
| * | | | Replace ant with Makefile | Kevin Decherf | 2017-11-19 | 3 | -146/+28 | |
* | | | | Merge pull request #3425 from wallabag/add-setting-for-headers | Nicolas Lœuillet | 2017-11-21 | 19 | -3/+105 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Define storeArticleHeaders false by default | Jeremy Benoist | 2017-11-21 | 4 | -17/+18 | |
| * | | | Added internal setting to enable/disable headers storage | Nicolas Lœuillet | 2017-11-20 | 19 | -15/+116 | |
* | | | | Merge pull request #3426 from wallabag/fix-migration-3373 | Nicolas Lœuillet | 2017-11-21 | 4 | -3/+4 | |
|\ \ \ \ | ||||||
| * | | | | CS | Jeremy Benoist | 2017-11-21 | 3 | -3/+3 | |
| * | | | | Fix MySQL issue on mig from #3373 | Kevin Decherf | 2017-11-20 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #3346 from Kdecherf/origin-property | Nicolas Lœuillet | 2017-11-20 | 25 | -4/+356 | |
|\ \ \ \ | ||||||
| * | | | | Fix phpcs | Kevin Decherf | 2017-11-19 | 5 | -22/+22 | |
| * | | | | Improve EntryRestControllerTest for origin_url | Kevin Decherf | 2017-11-19 | 1 | -0/+55 | |
| * | | | | Update EntryControllerTest to handle origin_url | Kevin Decherf | 2017-11-19 | 1 | -2/+38 | |
| * | | | | Replace hardcoded 'Provided by' string with i18n string | Kevin Decherf | 2017-11-19 | 15 | -2/+15 | |
| * | | | | Improve origin_url field description and translations | Kevin Decherf | 2017-11-19 | 14 | -14/+15 | |
| * | | | | Form: move url and origin_url to UrlType | Kevin Decherf | 2017-11-19 | 1 | -2/+3 | |
| * | | | | Add support of originUrl field in baggy entry view | Kevin Decherf | 2017-11-19 | 1 | -0/+8 | |
| * | | | | Add some tests for OriginUrl in EntryRestController | Kevin Decherf | 2017-11-19 | 2 | -0/+74 | |
| * | | | | Handle original_url querystring in Shaarli sharing link | Kevin Decherf | 2017-11-19 | 1 | -1/+1 | |
| * | | | | Add support of originUrl field in material entry view | Kevin Decherf | 2017-11-19 | 1 | -0/+8 | |
| * | | | | Twig: add removeSchemeAndWww filter | Kevin Decherf | 2017-11-19 | 2 | -0/+35 | |
| * | | | | Entry: handle originUrl in edit form, update translations | Kevin Decherf | 2017-11-19 | 14 | -0/+22 | |
| * | | | | Add originUrl property to Entry, handle that in EntryRestController, handle m... | Kevin Decherf | 2017-11-19 | 3 | -0/+99 | |
| |/ / / | ||||||
* | | | | Merge pull request #3423 from wallabag/composer | Kevin Decherf | 2017-11-20 | 1 | -28/+28 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | composer: update dependency versions to reduce memory footprint | Kevin Decherf | 2017-11-19 | 1 | -28/+28 | |
|/ / / | ||||||
* | | | Merge pull request #3422 from wallabag/simpleue-2 | Nicolas Lœuillet | 2017-11-19 | 2 | -1/+18 | |
|\ \ \ | ||||||
| * | | | Jump to Simpleue 2.0 | Jeremy Benoist | 2017-11-18 | 2 | -1/+18 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #3421 from comradekingu/patch-2 | Kevin Decherf | 2017-11-19 | 1 | -10/+10 | |
|\ \ \ | ||||||
| * | | | "for the public wallabag demo", paywalled websites, diaspora* | Allan Nordhøy | 2017-11-18 | 1 | -3/+3 | |
| * | | | Spelling: diaspora, e-mail, moved ?, URL, sharing | Allan Nordhøy | 2017-11-18 | 1 | -8/+8 | |
| |/ / | ||||||
* | | | Merge pull request #3420 from comradekingu/patch-1 | Kevin Decherf | 2017-11-19 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Spelling: Two-factor for wallabag connection | Allan Nordhøy | 2017-11-18 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #3412 from aaa2000/fix-tests | Jérémy Benoist | 2017-11-12 | 2 | -6/+7 | |
|\ \ | ||||||
| * | | Fix phpcs | adev | 2017-11-11 | 1 | -1/+1 | |
| * | | Fix tests | adev | 2017-11-11 | 2 | -6/+7 | |
|/ / | ||||||
* | | Merge pull request #3404 from wallabag/issue-2424 | Kevin Decherf | 2017-11-07 | 5 | -4/+15 | |
|\ \ | ||||||
| * | | material: replace card activator with article link on card preview | Kevin Decherf | 2017-11-06 | 5 | -4/+15 | |
|/ / | ||||||
* | | Merge pull request #3397 from wallabag/issue-1871 | Kevin Decherf | 2017-11-06 | 4 | -2/+12 | |
|\ \ | ||||||
| * | | Update assets for #3397 | Kevin Decherf | 2017-11-05 | 2 | -2/+2 | |
| * | | material: disable editing of entry url input when submitting new url | Kevin Decherf | 2017-11-05 | 2 | -0/+10 | |
|/ / | ||||||
* | | Merge pull request #3387 from Kdecherf/fix-assets-23 | Jérémy Benoist | 2017-11-02 | 116 | -411/+42 | |
|\ \ |