aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Material: update style of pre in articleKevin Decherf2016-11-251-0/+14
* Material: update style of ul in articleKevin Decherf2016-11-251-0/+9
* Material: update style of article linksKevin Decherf2016-11-251-0/+9
* Material: increase max width of article on large screensKevin Decherf2016-11-251-1/+1
* Material: prevent bold in title, update title font sizeKevin Decherf2016-11-251-0/+33
* Material: change color of background, article content and titlesKevin Decherf2016-11-251-1/+14
* Merge pull request #2642 from wallabag/fix-logout-shortcutNicolas Lœuillet2016-11-234-4/+4
|\
| * Fixed logout shortcutNicolas Lœuillet2016-11-234-4/+4
|/
* Merge pull request #2620 from wallabag/fix-password-layoutJeremy Benoist2016-11-2317-28/+72
|\
| * 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
| * 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
| * These files aren’t used anymoreJeremy Benoist2016-11-2210-17/+4
* | Merge pull request #2640 from wallabag/fix-openoriginalNicolas Lœuillet2016-11-237-62/+70
|\ \ | |/ |/|
| * 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.ymlMateusz Rumiński2016-11-221-28/+28
* | Merge pull request #2317 from wallabag/restricted-accessJeremy Benoist2016-11-2228-1/+484
|\ \ | |/ |/|
| * 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
* | Merge pull request #2612 from wallabag/add-shortcuts-helpThomas Citharel2016-11-2217-28/+535
|\ \ | |/ |/|
| * 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 APIJeremy Benoist2016-11-222-8/+4
|/
* Merge pull request #2613 from wallabag/fix-overlapThomas Citharel2016-11-225-29/+33
|\
| * Fix card action overlapJeremy Benoist2016-11-205-29/+33
* | Merge pull request #2614 from wallabag/api-reloadNicolas Lœuillet2016-11-222-0/+85
|\ \
| * | 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.ymlMateusz Rumiński2016-11-211-11/+11
|/ / /
* | | Merge pull request #2630 from ThibaudDauce/fix-black-headingsJeremy Benoist2016-11-211-6/+6
|\ \ \
| * | | 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
| |\ \ \
| | * | | wrong spacesYuriy Evdokimov2016-11-211-2/+2
| | * | | Fix #2056 update config.ymlYuriy Evdokimov2016-11-211-1/+3
| * | | | Merge pull request #2625 from wallabag/prepare-215Nicolas Lœuillet2016-11-212-1/+6
| |\ \ \ \
| | * | | | 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
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Lock down PHPUnit for PHP 5.5Jeremy Benoist2016-11-211-1/+1
| | * | | 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
|\ \ \ \ | |_|/ / |/| | |