Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Enforce lowercase on domain name filter | Kevin Decherf | 2016-11-26 | 2 | -1/+10 | |
|/ / / | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
* | | | Merge pull request #2622 from Kdecherf/ui-changes | Nicolas Lœuillet | 2016-11-25 | 2 | -4/+92 | |
|\ \ \ | | | | | | | | | Material UI Changes | |||||
| * | | | Minified CSS | Nicolas Lœuillet | 2016-11-25 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Material: update size of text in article | Kevin Decherf | 2016-11-25 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
| * | | | Material: render blockquote in italic and strong in bold in article | Kevin Decherf | 2016-11-25 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
| * | | | Material: update style of pre in article | Kevin Decherf | 2016-11-25 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
| * | | | Material: update style of ul in article | Kevin Decherf | 2016-11-25 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
| * | | | Material: update style of article links | Kevin Decherf | 2016-11-25 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
| * | | | Material: increase max width of article on large screens | Kevin Decherf | 2016-11-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
| * | | | Material: prevent bold in title, update title font size | Kevin Decherf | 2016-11-25 | 1 | -0/+33 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
| * | | | Material: change color of background, article content and titles | Kevin Decherf | 2016-11-25 | 1 | -1/+14 | |
|/ / / | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
* | | | Merge pull request #2642 from wallabag/fix-logout-shortcut | Nicolas Lœuillet | 2016-11-23 | 4 | -4/+4 | |
|\ \ \ | | | | | | | | | Fixed logout shortcut | |||||
| * | | | Fixed logout shortcut | Nicolas Lœuillet | 2016-11-23 | 4 | -4/+4 | |
|/ / / | ||||||
* | | | Merge pull request #2620 from wallabag/fix-password-layout | Jeremy Benoist | 2016-11-23 | 17 | -28/+72 | |
|\ \ \ | | | | | | | | | Fix password layout | |||||
| * | | | Remove empty line | Jeremy Benoist | 2016-11-23 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Add migration for new FOSUser version | Jeremy Benoist | 2016-11-22 | 1 | -0/+57 | |
| | | | | ||||||
| * | | | Fix MonologBundle deprecation | Jeremy Benoist | 2016-11-22 | 1 | -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 branch | Jeremy Benoist | 2016-11-22 | 4 | -8/+9 | |
| | | | | ||||||
| * | | | Fix Travis | Jeremy Benoist | 2016-11-22 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Use the correct template | Jeremy Benoist | 2016-11-22 | 1 | -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 anymore | Jeremy Benoist | 2016-11-22 | 10 | -17/+4 | |
| | | | | | | | | | | | | | | | | Translation were moved to the global one | |||||
* | | | | Merge pull request #2640 from wallabag/fix-openoriginal | Nicolas Lœuillet | 2016-11-23 | 7 | -62/+70 | |
|\ \ \ \ | |/ / / |/| | | | Fixed entry shortcuts available in list view | |||||
| * | | | Fixed entry shortcuts available in list view | Nicolas Lœuillet | 2016-11-22 | 7 | -62/+70 | |
|/ / / | ||||||
* | | | Merge pull request #2637 from wallabag/mruminski-patch-1 | Jeremy Benoist | 2016-11-22 | 1 | -28/+28 | |
|\ \ \ | | | | | | | | | Update messages.pl.yml | |||||
| * | | | Update messages.pl.yml | Mateusz Rumiński | 2016-11-22 | 1 | -28/+28 | |
| | | | | | | | | | | | | translate shortcuts section to polish | |||||
* | | | | Merge pull request #2317 from wallabag/restricted-access | Jeremy Benoist | 2016-11-22 | 28 | -1/+484 | |
|\ \ \ \ | |/ / / |/| | | | Added authentication for restricted access articles | |||||
| * | | | Added documentation and missing translations | Nicolas Lœuillet | 2016-11-22 | 18 | -1/+183 | |
| | | | | ||||||
| * | | | Added internal setting to enable/disable articles with paywall | Nicolas Lœuillet | 2016-11-22 | 6 | -2/+67 | |
| | | | | ||||||
| * | | | Cleared CookieJar to avoid websites who use cookies for analytics | Nicolas Lœuillet | 2016-11-22 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Added authentication for restricted access articles | Bertrand Dunogier | 2016-11-22 | 7 | -1/+235 | |
| | | | | | | | | | | | | | | | | Fix #438. Thank you so much @bdunogier | |||||
* | | | | Merge pull request #2612 from wallabag/add-shortcuts-help | Thomas Citharel | 2016-11-22 | 17 | -28/+535 | |
|\ \ \ \ | |/ / / |/| | | | Added help about shortcuts | |||||
| * | | | Translations for shortcuts help | Nicolas Lœuillet | 2016-11-22 | 12 | -0/+360 | |
| | | | | ||||||
| * | | | Added help about shortcuts | Nicolas Lœuillet | 2016-11-22 | 5 | -28/+175 | |
|/ / / | ||||||
* | | | Merge pull request #2635 from wallabag/304-reload | Jeremy Benoist | 2016-11-22 | 2 | -8/+4 | |
|\ \ \ | | | | | | | | | Return 304 when content isn't reloaded using the API | |||||
| * | | | Return 304 when content isn't reloaded using the API | Jeremy Benoist | 2016-11-22 | 2 | -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-overlap | Thomas Citharel | 2016-11-22 | 5 | -29/+33 | |
|\ \ \ | | | | | | | | | Fix card action overlap | |||||
| * | | | Fix card action overlap | Jeremy Benoist | 2016-11-20 | 5 | -29/+33 | |
| | | | | | | | | | | | | | | | | On smaller resolution | |||||
* | | | | Merge pull request #2614 from wallabag/api-reload | Nicolas Lœuillet | 2016-11-22 | 2 | -0/+85 | |
|\ \ \ \ | | | | | | | | | | | Add ability to reload entry from API | |||||
| * | | | | Return an explicit error if reload fail | Jeremy Benoist | 2016-11-20 | 2 | -7/+8 | |
| | | | | | ||||||
| * | | | | Fixing tests | Jeremy Benoist | 2016-11-20 | 2 | -4/+3 | |
| | | | | | ||||||
| * | | | | Add ability to reload entry from API | Jeremy Benoist | 2016-11-20 | 2 | -0/+85 | |
| | | | | | ||||||
* | | | | | Merge pull request #2632 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2016-11-21 | 1 | -11/+11 | |
|\ \ \ \ \ | | | | | | | | | | | | | Update messages.pl.yml | |||||
| * | | | | | Update messages.pl.yml | Mateusz Rumiński | 2016-11-21 | 1 | -11/+11 | |
|/ / / / / | | | | | | | | | | | missing polish translation added | |||||
* | | | | | Merge pull request #2630 from ThibaudDauce/fix-black-headings | Jeremy Benoist | 2016-11-21 | 1 | -6/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add white-text class to card-title too | |||||
| * | | | | | Add white-text class to card-title too | Thibaud Dauce | 2016-11-21 | 1 | -6/+6 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-21 | 3 | -4/+14 | |
|\| | | | | ||||||
| * | | | | Merge pull request #2624 from Rurik19/master | Jeremy Benoist | 2016-11-21 | 1 | -1/+3 | |
| |\ \ \ \ | | | | | | | | | | | | | Fix #2056 update config.yml | |||||
| | * | | | | wrong spaces | Yuriy Evdokimov | 2016-11-21 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | Fix #2056 update config.yml | Yuriy Evdokimov | 2016-11-21 | 1 | -1/+3 | |
| | | |_|/ | | |/| | | | | | | | Resolves refresh token lifetime issue | |||||
| * | | | | Merge pull request #2625 from wallabag/prepare-215 | Nicolas Lœuillet | 2016-11-21 | 2 | -1/+6 | |
| |\ \ \ \ | | | | | | | | | | | | | Prepare wallabag 2.1.5 |