about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
* scope.sh: Format JSON with either jq or json.toolWojciech Siewierski2018-11-241-0/+5
* Merge branch 'seebye-master'toonn2018-11-075-2/+75
|\
| * Merge branch 'master' of https://github.com/seebye/rangerseebye2018-11-066-16/+34
| |\
| | * Merge branch 'master' into masterWojciech Siewierski2018-10-276-16/+34
| | |\
| * | | ueberzug: remove marginseebye2018-11-061-2/+2
| |/ /
| * | ueberzug: end ueberzug by directly sending SIGTERM, fallback to SIGKILLseebye2018-10-251-7/+3
| * | Merge branch 'master' into masterseebye2018-10-257-21/+38
| |\ \
| * | | ueberzug: fix changed pep8 rulesseebye2018-10-251-4/+4
| * | | ueberzug: timeout: end process with SIGTERM, use SIGKILL as fallbackseebye2018-10-251-3/+6
| * | | ueberzug: remove unused variableseebye2018-10-251-1/+1
| * | | ueberzug: update documentationseebye2018-10-251-0/+1
| * | | ueberzug: ensure the process's death with rangers endseebye2018-10-251-0/+7
| * | | Merge branch 'master' into masterseebye2018-10-1029-298/+559
| |\ \ \
| * | | | ueberzug documentation updatedseebye2018-09-071-0/+4
| * | | | 'ueberzug' added as allowed value to preview_images_methodseebye2018-09-071-1/+2
| * | | | ueberzug suppress stderrseebye2018-08-281-1/+1
| * | | | implement quit (UeberzugImageDisplayer)seebye2018-08-281-4/+7
| * | | | implement quit (TerminologyImageDisplayer)seebye2018-08-281-0/+3
| * | | | implement quit (ITerm2ImageDisplayer)seebye2018-08-281-0/+3
| * | | | quit image displayer on suspending uiseebye2018-08-281-0/+3
| * | | | quit image displayer on changing preview_images_methodseebye2018-08-281-0/+2
| * | | | ueberzug, remove hardcoded python versionseebye2018-08-271-1/+1
| * | | | support ueberzug image displayerseebye2018-08-252-1/+48
* | | | | Merge branch 'baranovskiy-fix_1350'toonn2018-10-281-18/+21
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Placate our pep 8 overlordstoonn2018-10-281-4/+2
| * | | | Refactor encoding detectiontoonn2018-10-281-19/+22
| * | | | Put our guesses back in the except clausetoonn2018-10-281-13/+12
| * | | | File encoding guessing order changed.Baranovskiy Konstantin2018-10-261-13/+16
|/ / / /
* | | | Merge branch 'baranovskiy-fix_decode'toonn2018-10-261-5/+10
|\ \ \ \
| * | | | Broken preview of highlighted text with Python3Baranovskiy Konstantin2018-10-261-5/+10
|/ / / /
* | | | Merge branch 'baranovskiy-fix_1347'toonn2018-10-263-8/+8
|\ \ \ \
| * | | | Restoration of scrolling in pager.Baranovskiy Konstantin2018-10-263-8/+8
|/ / / /
* | | | Merge branch 'manw3moffset'toonn2018-10-262-1/+12
|\ \ \ \
| * | | | Document w3m_offset in Settings section of manpagetoonn2018-10-092-17/+28
| | |/ / | |/| |
* | | | Merge branch 'baranovskiy-fix_1347'toonn2018-10-263-7/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Restoration of scrolling in pager.Baranovskiy Konstantin2018-10-253-7/+9
|/ / /
* | | Merge pull request #1354 from me-ru-ru/masterToon Nolten2018-10-251-2/+0
|\ \ \
| * | | Delete unused variablemeruru2018-10-251-2/+0
|/ / /
* | | Merge pull request #1339 from GermainZ/file_preview_scrolling_limitsWojciech Siewierski2018-10-141-2/+5
|\ \ \
| * \ \ Merge branch 'master' into file_preview_scrolling_limitsWojciech Siewierski2018-10-145-17/+33
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1338 from GermainZ/human-readable-sizes-optionWojciech Siewierski2018-10-145-17/+33
|\ \ \ \ | |_|/ / |/| | |
| * | | Add size_in_bytes setting to show all sizes in bytesGermainZ2018-10-145-17/+33
|/ / /
| * / Do not allow scrolling beyond end of file previewGermainZ2018-10-141-2/+5
|/ /
* | Merge branch 'LeLobster-stborderw3mfix'toonn2018-10-085-18/+31
|\ \
| * \ Merge branch 'master' into stborderw3mfixLeLobster2018-10-071-1/+1
| |\ \
| * | | Resolve requested changesLeLobster2018-10-073-6/+6
| * | | Rename st_* to w3m_* here as well, oopsLeLobster2018-10-072-11/+15
| * | | Rename setting st_* to w3m_*. Did I really forget to change this earlier?LeLobster2018-10-061-1/+1
| * | | Revert "Check the env variable TERM before setting w3m offset"LeLobster2018-10-061-7/+2
| * | | Update man pages and config opt name to be generic in stead of stLeLobster2018-10-053-6/+6