aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3991 from wallabag/fix/secretJérémy Benoist2019-06-051-1/+1
|\
| * Try to force people to update the secretJérémy Benoist2019-06-051-1/+1
|/
* Merge pull request #3271 from wallabag/store-resolved-urlJérémy Benoist2019-06-055-11/+164
|\
| * TyposJeremy Benoist2019-06-051-2/+2
| * Use two indexes instead of one for hashed urlsJeremy Benoist2019-06-054-25/+20
| * Use hash given url to avoid duplicateJeremy Benoist2019-05-296-131/+133
| * Added given_url in entry tableNicolas Lœuillet2019-05-296-2/+158
* | Merge pull request #3987 from wallabag/fix/drop-simplepieJérémy Benoist2019-05-293-18/+16
|\ \
| * | Drop SimplePieJeremy Benoist2019-05-293-18/+16
|/ /
* | Merge pull request #3986 from wallabag/fix/scrutinizer-issuesJérémy Benoist2019-05-295-7/+7
|\ \ | |/ |/|
| * Fix some Scrutinizer issuesJeremy Benoist2019-05-295-7/+7
|/
* Merge pull request #3985 from wallabag/update-composerJérémy Benoist2019-05-295-31/+10446
|\
| * TyposJeremy Benoist2019-05-291-2/+17
| * Keep composer.lockJeremy Benoist2019-05-295-43/+10443
|/
* Merge pull request #3984 from wallabag/2.4Jérémy Benoist2019-05-29206-1871/+4701
|\
| * Merge pull request #3944 from shtrom/always-hash-exists-urlJérémy Benoist2019-05-285-47/+80
| |\
| | * Remove useless methodsJeremy Benoist2019-05-242-28/+2
| | * Change the way to define algorithm for hashing urlJeremy Benoist2019-05-243-11/+11
| | * Add Wallabag\CoreBundle\Helper\UrlHasherOlivier Mehani2019-05-245-21/+79
| | * Delegate findByUrlAndUserId to findByHashedUrlAndUserIdOlivier Mehani2019-05-241-11/+3
| | * EntryRestController::getEntriesExistsAction: always find by hashed urlOlivier Mehani2019-05-241-31/+40
| * | Merge pull request #3390 from aaa2000/httplugJérémy Benoist2019-05-2814-479/+447
| |\ \
| | * | Fix tests after rebaseJeremy Benoist2019-05-282-14/+12
| | * | CS & fix testsJeremy Benoist2019-05-281-15/+36
| | * | Fix some testsJeremy Benoist2019-05-282-39/+24
| | * | CSJeremy Benoist2019-05-281-1/+1
| | * | CSJeremy Benoist2019-05-285-8/+7
| | * | Configure timeoutadev2019-05-282-3/+10
| | * | Fix because of some breaking changes of Graby 2.0adev2019-05-284-48/+50
| | * | Use httplugadev2019-05-2810-368/+324
| |/ /
| * | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-05-271-1/+1
| |\ \ | |/ / |/| |
* | | Merge pull request #3982 from wallabag/fix/https-test2.3.xJérémy Benoist2019-05-271-1/+1
|\ \ \
| * | | Fix testJeremy Benoist2019-05-271-1/+1
|/ / /
| * | Merge pull request #3965 from nicofrand/previewPicKevin Decherf2019-05-264-14/+123
| |\ \
| | * | [tests] Fix pre-existing tests (preview now imported + records added)nicofrand2019-05-212-2/+2
| | * | [tests] Set first picture as preview picturenicofrand2019-05-211-0/+84
| | * | Set first picture as preview picturenicofrand2019-05-212-12/+37
| * | | Merge pull request #3980 from wallabag/fix/instapaper-date-importJérémy Benoist2019-05-241-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Fix Instapaper import dateJeremy Benoist2019-05-241-0/+4
| |/ /
| * | Merge pull request #3977 from wallabag/fix/7.2-dockerfileJérémy Benoist2019-05-231-1/+1
| |\ \ | | |/ | |/|
| | * Force PHP version in DockerfileJérémy Benoist2019-05-231-1/+1
| |/
| * Merge pull request #3960 from wallabag/api-entries-2817Jérémy Benoist2019-05-213-2/+42
| |\
| | * api/entries: add parameter detail to exclude or include content in responseKevin Decherf2019-05-183-2/+42
| * | CSJeremy Benoist2019-05-151-2/+4
| * | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-05-1526-64/+253
| |\ \ | |/ / |/| |
* | | Merge pull request #3966 from wallabag/prepare-2.3.8Jérémy Benoist2019-05-142-1/+17
|\ \ \
| * | | Prepare 2.3.8 releaseJeremy Benoist2019-05-142-1/+17
|/ / /
* | | Merge pull request #3964 from wallabag/fix/intlKevin Decherf2019-05-141-2/+7
|\ \ \
| * | | Fix Intl Locale issueJeremy Benoist2019-05-131-2/+7
|/ / /
* | | Merge pull request #3922 from burkemw3/patch-5Jérémy Benoist2019-05-131-3/+0
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 04:16:00 +0000