aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-04-0114-66/+185
|\
| * Merge pull request #3909 from wallabag/fix/html-not-definedJérémy Benoist2019-03-181-7/+6
| |\ | | | | | | Fix PHP warning
| | * Fix PHP warningJeremy Benoist2019-03-181-7/+6
| | | | | | | | | | | | Looks like sometimes (usually from import) the `html` key isn’t available.
| * | Merge pull request #3908 from wallabag/epub-issue-3642Jérémy Benoist2019-03-181-1/+1
| |\ \ | | | | | | | | epub: fix exception when articles have the same title
| | * | epub: fix exception when articles have the same titleKevin Decherf2019-03-171-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes an exception occuring when exporting as epub several articles with the same title. The chapter filename is now derived from title and url. Fixes #3642 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Merge pull request #3860 from baurmatt/fix/posix_compatibilityJérémy Benoist2019-03-183-9/+21
| |\ \ | | |/ | |/| Make dev/install/update script posix compatible
| | * Properly source require.shMatthias Baur2019-03-123-9/+21
| |/ | | | | | | Fixes #3571.
| * Merge pull request #3901 from wallabag/fix-pr-3893Kevin Decherf2019-03-092-2/+2
| |\ | | | | | | material: fix left padding on non-entry pages introduced by #3893
| | * material: fix left padding on non-entry pages introduced by #3893Kevin Decherf2019-03-092-2/+2
| |/ | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Merge pull request #3897 from wallabag/2.3.8-devJérémy Benoist2019-03-041-1/+1
| |\ | | | | | | Jump to 2.3.8-dev
| | * Jump to 2.3.8-devJeremy Benoist2019-03-041-1/+1
| |/
| * Merge pull request #3895 from wallabag/prepare-2.3.7Jérémy Benoist2019-03-042-1/+19
| |\ | | | | | | Prepare 2.3.7 release
| | * Prepare 2.3.7 releaseJeremy Benoist2019-03-042-1/+19
| |/
| * Merge pull request #3894 from wallabag/issue-3851Kevin Decherf2019-03-034-6/+22
| |\ | | | | | | material: hide creation date from card actions on specific sizes
| | * material: update prod assetsKevin Decherf2019-03-031-1/+1
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * material: add media queries to hide creation date from card actionsKevin Decherf2019-03-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Hide the creation date from card actions on specific sizes when there's not enough space for all parts. Fixes #3851 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * material: wrap card actions, remove class hiding of creation dateKevin Decherf2019-03-032-5/+12
| |/ | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Merge pull request #3893 from wallabag/issue-3877Kevin Decherf2019-03-032-6/+10
| |\ | | | | | | material: fix left padding of content on medium screens
| | * material: fix left padding of content on medium screensKevin Decherf2019-03-021-1/+7
| | | | | | | | | | | | | | | | | | Fixes #3877 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * material: move a media query from cards to dedicated scss fileKevin Decherf2019-03-022-6/+4
| |/ | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Merge pull request #3885 from mart-e/script-ignore-rootJérémy Benoist2019-03-012-9/+22
| |\ | | | | | | Allow optional --ignore-root-warning
| | * Allow optional --ignore-root-warningMartin Trigaux2019-02-142-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now both ./install prod --ignore-root-warning ./install --ignore-root-warning prod will work $1 was both used for the environment and the root flag Fixes wallabag/wallabag#3884
| * | Merge pull request #3886 from wallabag/issue-3602Jérémy Benoist2019-02-251-7/+9
| |\ \ | | | | | | | | epub export: fix missing cover image, only for exports of one article
| | * | epub export: fix missing cover image, only for exports of one articleKevin Decherf2019-02-181-7/+9
| | |/ | | | | | | | | | | | | | | | Fixes #3602 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Merge pull request #3887 from wallabag/issue-3711Jérémy Benoist2019-02-252-17/+72
| |\ \ | | |/ | |/| Add support of expect parameter to change return object when deleting entry
| | * tests: fix broken session clients for rest entry deletion testsKevin Decherf2019-02-201-4/+13
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * EntryRestController: add support of expect parameter to delete actionKevin Decherf2019-02-202-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expect parameter enables an application to request the whole entry or only the id when requesting its deletion. `expects` defaults to `entry` to prevent any API breakage. Fixes #3711 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * tests: create entry for testDeleteEntry, fix missing idKevin Decherf2019-02-171-7/+29
| |/ | | | | | | | | | | | | | | | | | | | | When using the entity manager to retrieve an already stored entry, the id disapears from $entry after the first delete call. This leads to testing a nonexistent endpoint (api/entries/.json) during the second delete call. This change now creates an entry specifically for the test. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Merge pull request #3882 from wallabag/fix/corsKevin Decherf2019-02-139-16/+16
| |\ | | | | | | Fix CORS for API
| | * CSJeremy Benoist2019-02-131-1/+1
| | |
| | * CSJeremy Benoist2019-02-119-13/+13
| | |
| | * CORS repare for apiRurik192019-02-111-4/+4
| |/
* | Merge pull request #3868 from Nadrieril/fix-3662Kevin Decherf2019-03-021-0/+147
|\ \ | | | | | | Add missing entries in craue_config_setting.
| * | Disable down for that migrationJeremy Benoist2019-03-011-6/+1
| | |
| * | Test each internal settings before creating themJeremy Benoist2019-03-011-41/+119
| | |
| * | Add missing entries in craue_config_setting.Nadrieril2019-03-011-0/+74
|/ / | | | | | | Should fix https://github.com/wallabag/wallabag/issues/3662
* | Merge pull request #3857 from wallabag/php73Jérémy Benoist2019-02-277-10/+78
|\ \ | | | | | | Replace continue; with break; to avoid PHP 7.3 warnings
| * | Adding more testsJeremy Benoist2019-02-278-9/+77
| | |
| * | CSJeremy Benoist2019-02-276-10/+10
| | |
| * | Replace continue; with break; to avoid PHP 7.3 warningsThomas Citharel2019-02-277-9/+9
|/ / | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #3879 from wallabag/fix/url-default-protocolJérémy Benoist2019-02-083-0/+4
|\ \ | | | | | | Force default_protocol to generate an url input
| * | Force default_protocol to generate an url inputJeremy Benoist2019-02-083-0/+4
|/ /
* | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-02-076-6/+14
|\|
| * Merge pull request #3869 from itsthejb/fix-2factor-email-imageJérémy Benoist2019-02-011-1/+1
| |\ | | | | | | Fix broken 2 factor auth logo image
| | * Fix broken 2 factor auth logo imageJonathan Crooke2019-01-311-1/+1
| |/
| * Merge pull request #3819 from stan3/pocket-importJérémy Benoist2019-01-282-3/+10
| |\ | | | | | | Fix read & starred status in Pocket import
| | * Improve checks & add testsJeremy Benoist2019-01-282-3/+10
| | |
| | * status and favourite are actually strings in the import so use ==Tristan Hill2019-01-271-2/+2
| |/
| * Merge pull request #3861 from wallabag/fix/siteconfig-emailJérémy Benoist2019-01-182-2/+2
| |\ | | | | | | Add dedicated email for site config issue
| | * Add dedicated email for site config issueJeremy Benoist2019-01-182-2/+2
| |/ | | | | | | | | Instead of sending an email to the devs, it now creates an issue on GitHub using a zap from zapier.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 08:05:25 +0000