aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fix travis foldadev2017-11-211-1/+1
|
* Remove data sql filesadev2017-11-213-120/+0
|
* Implements down migrationadev2017-11-211-1/+12
|
* Fix installation commandadev2017-11-214-31/+43
|
* Fold travis make prepareadev2017-11-211-0/+2
|
* Add an initial migrationadev2017-11-213-16/+182
|
* Merge pull request #3398 from wallabag/issue-1735Nicolas Lœuillet2017-11-213-146/+28
|\ | | | | Replace ant with Makefile
| * Replace ant with MakefileKevin Decherf2017-11-193-146/+28
| | | | | | | | | | | | Fixes #1735 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3425 from wallabag/add-setting-for-headersNicolas Lœuillet2017-11-2119-3/+105
|\ \ | | | | | | Added internal setting to enable/disable headers storage
| * | Define storeArticleHeaders false by defaultJeremy Benoist2017-11-214-17/+18
| | | | | | | | | | | | | | | Fix tests which must use `$storeArticleHeaders`. Fix CS
| * | 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
|\ \ \ | | | | | | | | Fix MySQL issue on mig from #3373
| * | | CSJeremy Benoist2017-11-213-3/+3
| | | |
| * | | Fix MySQL issue on mig from #3373Kevin Decherf2017-11-201-0/+1
|/ / / | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3346 from Kdecherf/origin-propertyNicolas Lœuillet2017-11-2025-4/+356
|\ \ \ | | | | | | | | Add originUrl property to Entry
| * | | Fix phpcsKevin Decherf2017-11-195-22/+22
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Improve EntryRestControllerTest for origin_urlKevin Decherf2017-11-191-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_urlKevin Decherf2017-11-191-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 stringKevin Decherf2017-11-1915-2/+15
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Improve origin_url field description and translationsKevin Decherf2017-11-1914-14/+15
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | 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
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Handle original_url querystring in Shaarli sharing linkKevin Decherf2017-11-191-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 viewKevin Decherf2017-11-191-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Twig: add removeSchemeAndWww filterKevin Decherf2017-11-192-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 translationsKevin Decherf2017-11-1914-0/+22
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Add originUrl property to Entry, handle that in EntryRestController, handle ↵Kevin Decherf2017-11-193-0/+99
| |/ / | | | | | | | | | | | | | | | migration Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3423 from wallabag/composerKevin Decherf2017-11-201-28/+28
|\ \ \ | |/ / |/| | composer: update dependency versions to reduce memory footprint
| * | composer: update dependency versions to reduce memory footprintKevin Decherf2017-11-191-28/+28
|/ / | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3422 from wallabag/simpleue-2Nicolas Lœuillet2017-11-192-1/+18
|\ \ | | | | | | Jump to Simpleue 2.0
| * | Jump to Simpleue 2.0Jeremy Benoist2017-11-182-1/+18
| | | | | | | | | | | | The 1.3.0 tag is introducing BC so we jump to the 2.0
* | | Merge pull request #3421 from comradekingu/patch-2Kevin Decherf2017-11-191-10/+10
|\ \ \ | | | | | | | | Spelling: diaspora, e-mail, moved ?, URL, sharing
| * | | "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 connection
| * | 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 the tests
| * | 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 preview
| * | material: replace card activator with article link on card previewKevin Decherf2017-11-065-4/+15
|/ / | | | | | | | | | | Fixes #2424 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3397 from wallabag/issue-1871Kevin Decherf2017-11-064-2/+12
|\ \ | | | | | | material: disable editing of entry url input when submitting new url
| * | 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
|/ / | | | | | | | | | | Fixes #1871 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3387 from Kdecherf/fix-assets-23Jérémy Benoist2017-11-02116-411/+42
|\ \ | | | | | | Fix assets for 2.3
| * | Updating .gitignoreKevin Decherf2017-10-242-4/+3
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Removing web/bundles/wallabagcore and adding prod assets in web/wallassetsKevin Decherf2017-10-24105-375/+7
| | | | | | | | | | | | | | | | | | | | | baggy.css, baggy.js, material.css, material.js and public.js are seen as new files, something changed in these files. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | webpack & views: replace bundles/wallabagcore with wallassetsKevin Decherf2017-10-249-32/+32
| | | | | | | | | | | | | | | | | | | | | This change will prevent composer from removing wallabagcore assets when installing assets. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3399 from aaa2000/editorconfig-makefileJérémy Benoist2017-11-021-0/+3
|\ \ \ | |_|/ |/| | Update .editorconfig for makefile
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 05:19:48 +0000