Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix pagination on list mode | Simounet | 2017-12-04 | 5 | -21/+26 |
| | |||||
* | Merge pull request #3449 from Simounet/feature/share-page | Jérémy Benoist | 2017-12-04 | 3 | -18/+37 |
|\ | | | | | Share page improved (mobile + header's padding) | ||||
| * | Figure image and figcaption centered on share page | Simounet | 2017-12-03 | 2 | -1/+9 |
| | | |||||
| * | Share page improved (mobile + header's padding) | Simounet | 2017-12-03 | 3 | -18/+29 |
|/ | |||||
* | Merge pull request #3436 from wallabag/origin-shaarli | Nicolas Lœuillet | 2017-11-26 | 18 | -2/+72 |
|\ | | | | | Add craue setting to enable sharing of origin url to Shaarli | ||||
| * | Add craue setting to enable sharing of origin url to Shaarli | Kevin Decherf | 2017-11-25 | 18 | -2/+72 |
|/ | | | | | | | Also fix the field name used in the query string and add it to baggy theme Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3419 from NatJNP/patch1 | Jérémy Benoist | 2017-11-25 | 5 | -0/+662 |
|\ | | | | | Add Thai language | ||||
| * | Add all file thai Language for translate | NatPi | 2017-11-24 | 4 | -0/+626 |
| | | |||||
| * | Add CraueConfigBundle.th.yml | NatPi | 2017-11-18 | 1 | -0/+36 |
| | | |||||
* | | Merge pull request #3401 from aaa2000/migration-initial | Jérémy Benoist | 2017-11-25 | 10 | -167/+237 |
|\ \ | | | | | | | Add an initial doctrine migration | ||||
| * | | 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 | ||||
| * | | Disable controller access if feature disabled | Jeremy Benoist | 2017-11-22 | 2 | -0/+32 |
| | | | | | | | | | | | | If `restricted_access` is disabled, accessing `/site-credentials/` must be disabled. | ||||
* | | | Merge pull request #3398 from wallabag/issue-1735 | Nicolas Lœuillet | 2017-11-21 | 3 | -146/+28 |
|\ \ \ | | | | | | | | | Replace ant with Makefile | ||||
| * | | | Replace ant with Makefile | Kevin Decherf | 2017-11-19 | 3 | -146/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1735 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | | | Merge pull request #3425 from wallabag/add-setting-for-headers | Nicolas Lœuillet | 2017-11-21 | 19 | -3/+105 |
|\ \ \ \ | | |/ / | |/| | | Added internal setting to enable/disable headers storage | ||||
| * | | | Define storeArticleHeaders false by default | Jeremy Benoist | 2017-11-21 | 4 | -17/+18 |
| | | | | | | | | | | | | | | | | | | | | Fix tests which must use `$storeArticleHeaders`. Fix CS | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | Fix MySQL issue on mig from #3373 | ||||
| * | | | | CS | Jeremy Benoist | 2017-11-21 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | Fix MySQL issue on mig from #3373 | Kevin Decherf | 2017-11-20 | 1 | -0/+1 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | | | Merge pull request #3346 from Kdecherf/origin-property | Nicolas Lœuillet | 2017-11-20 | 25 | -4/+356 |
|\ \ \ \ | | | | | | | | | | | Add originUrl property to Entry | ||||
| * | | | | Fix phpcs | Kevin Decherf | 2017-11-19 | 5 | -22/+22 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | | Improve EntryRestControllerTest for origin_url | Kevin Decherf | 2017-11-19 | 1 | -0/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that origin_url is initially null Ensure patching entry with origin_url='' Ensure patching entry with origin_url=null Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | | Update EntryControllerTest to handle origin_url | Kevin Decherf | 2017-11-19 | 1 | -2/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set an origin_url in testEditUpdate Test origin_url deletion in testEditRemoveOriginUrl Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | | Replace hardcoded 'Provided by' string with i18n string | Kevin Decherf | 2017-11-19 | 15 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | | Improve origin_url field description and translations | Kevin Decherf | 2017-11-19 | 14 | -14/+15 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | | Handle original_url querystring in Shaarli sharing link | Kevin Decherf | 2017-11-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature needs at least shaarli-plugin-via 0.2 from https://github.com/Kdecherf/shaarli-plugin-via to work. Shaarli will silently ignore this parameter if this plugin is missing. Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | | Add support of originUrl field in material entry view | Kevin Decherf | 2017-11-19 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | | Twig: add removeSchemeAndWww filter | Kevin Decherf | 2017-11-19 | 2 | -0/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This twig filter removes scheme (only http and https are supported) and pass the result to removeWww filter to also remove 'www.' at the beginning of an url. Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | | Entry: handle originUrl in edit form, update translations | Kevin Decherf | 2017-11-19 | 14 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | | Add originUrl property to Entry, handle that in EntryRestController, handle ↵ | Kevin Decherf | 2017-11-19 | 3 | -0/+99 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | migration Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | | | Merge pull request #3423 from wallabag/composer | Kevin Decherf | 2017-11-20 | 1 | -28/+28 |
|\ \ \ \ | |/ / / |/| | | | composer: update dependency versions to reduce memory footprint | ||||
| * | | | composer: update dependency versions to reduce memory footprint | Kevin Decherf | 2017-11-19 | 1 | -28/+28 |
|/ / / | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | | Merge pull request #3422 from wallabag/simpleue-2 | Nicolas Lœuillet | 2017-11-19 | 2 | -1/+18 |
|\ \ \ | | | | | | | | | Jump to Simpleue 2.0 | ||||
| * | | | Jump to Simpleue 2.0 | Jeremy Benoist | 2017-11-18 | 2 | -1/+18 |
| | |/ | |/| | | | | | | | The 1.3.0 tag is introducing BC so we jump to the 2.0 | ||||
* | | | Merge pull request #3421 from comradekingu/patch-2 | Kevin Decherf | 2017-11-19 | 1 | -10/+10 |
|\ \ \ | | | | | | | | | Spelling: diaspora, e-mail, moved ?, URL, sharing | ||||
| * | | | "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 | ||||
| * | | Spelling: Two-factor for wallabag connection | Allan Nordhøy | 2017-11-18 | 1 | -1/+1 |
|/ / |