aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* TagController: support merging labels when renaming one with label of anotherKevin Decherf2020-04-182-11/+143
* TagController: prevent tag deletion when renaming a tag with the same labelKevin Decherf2020-04-182-6/+67
* TagController: fix duplicated tags when renaming themKevin Decherf2020-04-182-8/+37
* Merge pull request #4336 from wallabag/dependabot/composer/friendsofsymfony/j...Jérémy Benoist2020-04-161-5/+5
|\
| * Bump friendsofsymfony/jsrouting-bundle from 2.5.3 to 2.5.4dependabot-preview[bot]2020-04-161-5/+5
* | Merge pull request #4335 from wallabag/dependabot/composer/friendsofphp/php-c...Jérémy Benoist2020-04-161-5/+5
|\ \ | |/ |/|
| * Bump friendsofphp/php-cs-fixer from 2.16.2 to 2.16.3dependabot-preview[bot]2020-04-161-5/+5
|/
* Merge pull request #4329 from wallabag/add-2fa-disableNicolas Lœuillet2020-04-1420-4/+122
|\
| * Changed color for disable buttonNicolas Lœuillet2020-04-141-2/+2
| * Added a button to disable 2FA when enabledNicolas Lœuillet2020-04-1320-4/+122
* | Merge pull request #4325 from wallabag/fix-paywall-import-cronKevin Decherf2020-04-131-3/+14
|\ \
| * | Added authentication during import command for paywalled websitesNicolas Lœuillet2020-04-121-3/+14
| |/
* | Merge pull request #4328 from wallabag/dependabot/composer/doctrine/doctrine-...Jérémy Benoist2020-04-131-5/+6
|\ \
| * | Bump doctrine/doctrine-fixtures-bundle from 3.3.0 to 3.3.1dependabot-preview[bot]2020-04-131-11/+13
| |/
* | Merge pull request #4327 from wallabag/dependabot/composer/friendsofphp/php-c...Jérémy Benoist2020-04-131-29/+31
|\ \ | |/ |/|
| * Bump friendsofphp/php-cs-fixer from 2.16.1 to 2.16.2dependabot-preview[bot]2020-04-131-29/+31
|/
* Merge pull request #4319 from wallabag/feature/token-lifetime-parametersJérémy Benoist2020-04-082-1/+7
|\
| * Add ability to define lifetime token for the APIJeremy Benoist2020-04-082-1/+7
|/
* Merge pull request #4318 from wallabag/change-auth-grabyNicolas Lœuillet2020-04-071-9/+16
|\
| * Changed authentication order in GrabySiteConfigBuilderNicolas Lœuillet2020-04-071-9/+16
|/
* Merge pull request #4315 from wallabag/add-published-date-epubNicolas Lœuillet2020-04-0617-0/+23
|\
| * Added publication date on epub exportNicolas Lœuillet2020-04-0617-0/+23
* | Merge pull request #4317 from wallabag/enhance-article-displayNicolas Lœuillet2020-04-064-4/+6
|\ \
| * | Enhanced article displayNicolas Lœuillet2020-04-064-4/+6
| |/
* | Merge pull request #4316 from wallabag/fix-remove-pictures-apiKevin Decherf2020-04-061-6/+6
|\ \ | |/ |/|
| * Fixed bug when we delete entry via APINicolas Lœuillet2020-04-061-6/+6
|/
* Merge pull request #4308 from AKKED/patch-6Jérémy Benoist2020-04-031-4/+4
|\
| * update Japanese translationAKKED2020-04-041-4/+4
|/
* Merge pull request #4305 from wallabag/dependabot/composer/symfony/symfony-3....Jérémy Benoist2020-03-312-65/+65
|\
| * Fix testsJeremy Benoist2020-03-311-1/+1
| * Bump symfony/symfony from 3.4.38 to 3.4.39dependabot-preview[bot]2020-03-311-64/+64
|/
* Merge pull request #4302 from wallabag/9f88d2f8Jérémy Benoist2020-03-302-79/+74
|\
| * composer: replace grandt/phpepub with wallabag versionKevin Decherf2020-03-292-79/+74
* | Merge pull request #4304 from wallabag/dependabot/composer/friendsofsymfony/r...Jérémy Benoist2020-03-301-10/+11
|\ \ | |/ |/|
| * Bump friendsofsymfony/rest-bundle from 2.7.2 to 2.7.3dependabot-preview[bot]2020-03-301-10/+11
|/
* Merge pull request #4303 from wallabag/fix/cleanup-cookieKevin Decherf2020-03-291-24/+0
|\
| * Cleanup cookie jarJeremy Benoist2020-03-291-24/+0
|/
* Merge pull request #4274 from AKKED/add_jaJérémy Benoist2020-03-285-0/+716
|\
| * Add Japanese translationAKKED2020-03-285-0/+716
* | Merge pull request #4272 from Simounet/feat/load-custom-css-only-if-existsJérémy Benoist2020-03-285-10/+18
|\ \ | |/ |/|
| * Load custom.css only if existsSimounet2020-02-075-10/+18
* | Merge pull request #4281 from lizyn/zh_translationJérémy Benoist2020-03-285-0/+716
|\ \
| * | Added Simplified Chinese as a language optionlizyn2020-02-251-0/+1
| * | Added translation in Simplified Chinese（简体中文）lizyn2020-02-254-0/+715
| * | Merge pull request #1 from wallabag/masterlizyn2020-02-24345-3355/+20131
| |\ \
* | \ \ Merge pull request #4299 from wallabag/fix/4133Jérémy Benoist2020-03-287-73/+71
|\ \ \ \
| * | | | Fix createdAt date range filterKevin Decherf2020-03-226-16/+28
| * | | | tests: replace baggy theme used in EntryController testsKevin Decherf2020-03-222-46/+33
| * | | | misc: reindent EntryFilterTypeKevin Decherf2020-03-211-15/+14
* | | | | Merge pull request #4285 from wallabag/dependabot/composer/symfony/symfony-3....Jérémy Benoist2020-03-271-52/+52
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:48:10 +0000