aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2659 from ↵Nicolas Lœuillet2016-11-285-1/+54
|\ | | | | | | | | akovalyov/bugfix/non-latin-characters-in-reading-time-calculation Fix incorrect reading time calculation for entries in non-latin languages.
| * Fix incorrect reading time calculation for entries in languages withAndrew Kovalyov2016-11-285-1/+54
| | | | | | | | non-latin chars subset.
* | Merge pull request #2654 from Kdecherf/domain-filterJeremy Benoist2016-11-272-1/+10
|\ \ | | | | | | Enforce lowercase on domain name filter
| * | Enforce lowercase on domain name filterKevin Decherf2016-11-262-1/+10
|/ / | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #2622 from Kdecherf/ui-changesNicolas Lœuillet2016-11-252-4/+92
|\ \ | | | | | | Material UI Changes
| * | Minified CSSNicolas Lœuillet2016-11-251-2/+2
| | |
| * | Material: update size of text in articleKevin Decherf2016-11-251-0/+2
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Material: render blockquote in italic and strong in bold in articleKevin Decherf2016-11-251-0/+8
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Material: update style of pre in articleKevin Decherf2016-11-251-0/+14
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Material: update style of ul in articleKevin Decherf2016-11-251-0/+9
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Material: update style of article linksKevin Decherf2016-11-251-0/+9
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Material: increase max width of article on large screensKevin Decherf2016-11-251-1/+1
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Material: prevent bold in title, update title font sizeKevin Decherf2016-11-251-0/+33
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Material: change color of background, article content and titlesKevin Decherf2016-11-251-1/+14
|/ / | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 22:26:55 +0000