aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2642 from wallabag/fix-logout-shortcutNicolas Lœuillet2016-11-234-4/+4
|\ | | | | Fixed logout shortcut
| * Fixed logout shortcutNicolas Lœuillet2016-11-234-4/+4
|/
* Merge pull request #2620 from wallabag/fix-password-layoutJeremy Benoist2016-11-2317-28/+72
|\ | | | | Fix password layout
| * Remove empty lineJeremy Benoist2016-11-231-1/+0
| |
| * Add migration for new FOSUser versionJeremy Benoist2016-11-221-0/+57
| |
| * Fix MonologBundle deprecationJeremy Benoist2016-11-221-1/+1
| | | | | | | | The Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\DebugHandlerPass class is deprecated since version 2.12 and will be removed in 3.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.
| * Re-use FOSUser master branchJeremy Benoist2016-11-224-8/+9
| |
| * Fix TravisJeremy Benoist2016-11-221-1/+1
| |
| * Use the correct templateJeremy Benoist2016-11-221-1/+1
| | | | | | | | | | | | When resetting the password, the overriden template we used wasn’t well spelled. And since we are using a locked version of FOSUser (on a custom commit), the translation of `resetting.check_email` is wrong in any language but english.
| * These files aren’t used anymoreJeremy Benoist2016-11-2210-17/+4
| | | | | | | | Translation were moved to the global one
* | Merge pull request #2640 from wallabag/fix-openoriginalNicolas Lœuillet2016-11-237-62/+70
|\ \ | |/ |/| Fixed entry shortcuts available in list view
| * Fixed entry shortcuts available in list viewNicolas Lœuillet2016-11-227-62/+70
|/
* Merge pull request #2637 from wallabag/mruminski-patch-1Jeremy Benoist2016-11-221-28/+28
|\ | | | | Update messages.pl.yml
| * Update messages.pl.ymlMateusz Rumiński2016-11-221-28/+28
| | | | | | translate shortcuts section to polish
* | Merge pull request #2317 from wallabag/restricted-accessJeremy Benoist2016-11-2228-1/+484
|\ \ | |/ |/| Added authentication for restricted access articles
| * Added documentation and missing translationsNicolas Lœuillet2016-11-2218-1/+183
| |
| * Added internal setting to enable/disable articles with paywallNicolas Lœuillet2016-11-226-2/+67
| |
| * Cleared CookieJar to avoid websites who use cookies for analyticsNicolas Lœuillet2016-11-221-0/+2
| |
| * Added authentication for restricted access articlesBertrand Dunogier2016-11-227-1/+235
| | | | | | | | Fix #438. Thank you so much @bdunogier
* | Merge pull request #2612 from wallabag/add-shortcuts-helpThomas Citharel2016-11-2217-28/+535
|\ \ | |/ |/| Added help about shortcuts
| * Translations for shortcuts helpNicolas Lœuillet2016-11-2212-0/+360
| |
| * Added help about shortcutsNicolas Lœuillet2016-11-225-28/+175
|/
* Merge pull request #2635 from wallabag/304-reloadJeremy Benoist2016-11-222-8/+4
|\ | | | | Return 304 when content isn't reloaded using the API
| * Return 304 when content isn't reloaded using the APIJeremy Benoist2016-11-222-8/+4
|/ | | | | | Previously it was a 400 but this is more related to a real error. Using the API user should only know the content got reloaded or not. If reloaded: 200 otherwise: 304.
* Merge pull request #2613 from wallabag/fix-overlapThomas Citharel2016-11-225-29/+33
|\ | | | | Fix card action overlap
| * Fix card action overlapJeremy Benoist2016-11-205-29/+33
| | | | | | | | On smaller resolution
* | Merge pull request #2614 from wallabag/api-reloadNicolas Lœuillet2016-11-222-0/+85
|\ \ | | | | | | Add ability to reload entry from API
| * | Return an explicit error if reload failJeremy Benoist2016-11-202-7/+8
| | |
| * | Fixing testsJeremy Benoist2016-11-202-4/+3
| | |
| * | Add ability to reload entry from APIJeremy Benoist2016-11-202-0/+85
| | |
* | | Merge pull request #2632 from wallabag/mruminski-patch-1Nicolas Lœuillet2016-11-211-11/+11
|\ \ \ | | | | | | | | Update messages.pl.yml
| * | | Update messages.pl.ymlMateusz Rumiński2016-11-211-11/+11
|/ / / | | | | | | missing polish translation added
* | | Merge pull request #2630 from ThibaudDauce/fix-black-headingsJeremy Benoist2016-11-211-6/+6
|\ \ \ | | | | | | | | Add white-text class to card-title too
| * | | Add white-text class to card-title tooThibaud Dauce2016-11-211-6/+6
| | | |
* | | | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-213-4/+14
|\| | |
| * | | Merge pull request #2624 from Rurik19/masterJeremy Benoist2016-11-211-1/+3
| |\ \ \ | | | | | | | | | | Fix #2056 update config.yml
| | * | | wrong spacesYuriy Evdokimov2016-11-211-2/+2
| | | | |
| | * | | Fix #2056 update config.ymlYuriy Evdokimov2016-11-211-1/+3
| | | | | | | | | | | | | | | Resolves refresh token lifetime issue
| * | | | Merge pull request #2625 from wallabag/prepare-215Nicolas Lœuillet2016-11-212-1/+6
| |\ \ \ \ | | | | | | | | | | | | Prepare wallabag 2.1.5
| | * | | | Prepare wallabag 2.1.5 :rocket:Nicolas Lœuillet2016-11-212-1/+6
| |/ / / /
| * | | | Merge pull request #2623 from wallabag/composer-php-5.5Jeremy Benoist2016-11-211-2/+5
| |\ \ \ \ | | |/ / / | |/| | | Force composer to run as PHP 5.5.9
| | * | | Lock down PHPUnit for PHP 5.5Jeremy Benoist2016-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Since Composer defined lowest version is now PHP 5.5.9. PHPUnit 5.0 require PHP 5.6.
| | * | | Force composer to run as PHP 5.5.9Jeremy Benoist2016-11-201-1/+4
| |/ / /
* | | | Merge pull request #2621 from wallabag/redis-passwordJeremy Benoist2016-11-205-0/+8
|\ \ \ \ | |_|/ / |/| | | Add ability to use Redis with password
| * | | Add german translationJulian Oster2016-11-201-1/+1
| | | |
| * | | Add ability to use Redis with passwordJeremy Benoist2016-11-205-0/+8
|/ / /
* | | Merge pull request #2609 from wallabag/rss-pagingJeremy Benoist2016-11-2018-13/+112
|\ \ \ | |_|/ |/| | RSS paging
| * | Add documentation about RSS pagingJeremy Benoist2016-11-203-0/+9
| | |
| * | Fix testsJeremy Benoist2016-11-201-9/+5
| | |
| * | Add RSS paginationJeremy Benoist2016-11-203-12/+91
| | | | | | | | | | | | Following https://tools.ietf.org/html/rfc5005#page-4
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 07:36:21 +0000