summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'drop-icon-title-setting'toonn2019-12-271-5/+1
|\
| * Drop the update_icon_title settingtoonn2019-12-271-5/+1
|/ | | | | I forgot to remove the setting from `rc.conf` when I merged the behavior into the `update_title` setting.
* Merge branch 'siikamiika-feat-update-icon-title'toonn2019-12-225-13/+26
|\
| * Merge the title settingstoonn2019-12-226-34/+18
| | | | | | | | | | Upon further consideration we've reconsidered and decided to merge the seperate title update settings.
| * Merge branch 'master' into feat-update-icon-titlesiikamiika2019-12-0925-183/+571
| |\
| * | store escape sequence in a constant for claritysiikamiika2019-07-301-1/+6
| | | | | | | | | | | | | | | Escape character is also represented with octal notation to be consistent with prior usage
| * | add update_icon_title optionsiikamiika2019-07-256-8/+32
| | | | | | | | | | | | resolves #1637
* | | Merge branch 'laktak-paste_conflict'toonn2019-12-227-33/+89
|\ \ \
| * | | Use readable formatting for the examplestoonn2019-12-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | `F<file_>` is rendered using underline in a man page, which makes the underscore hard to see. So I switched the file name examples for `pp` to use `C<file_>` which is rendered using "double quotation marks."
| * | | Add example and remove reference from docstoonn2019-12-222-4/+8
| | | |
| * | | Rename APPENDIX to SUFFIXtoonn2019-12-221-3/+3
| | | |
| * | | Merge branch 'master' into paste_conflictChristian Zangl2019-12-0310-41/+83
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into paste_conflictChristian Zangl2019-10-0419-144/+490
| |\ \ \
| * | | | set default make_safe_path=get_safe_pathChristian Zangl2019-07-214-26/+34
| | | | |
| * | | | fix docsChristian Zangl2019-07-192-4/+5
| | | | |
| * | | | Added a make_safe_path parameter to pasteChristian Zangl2019-07-188-90/+87
| | | | | | | | | | | | | | | | | | | | It allows you to specify your own function to generate the path for conflicting files.
| * | | | fix CopyLoaderChristian Zangl2019-07-141-1/+2
| | | | |
| * | | | Added a conflict parameter to the paste actionChristian Zangl2019-07-147-44/+89
| | |_|/ | |/| | | | | | | | | | It allows you to specify 'overwrite', 'rename', or 'rename_ext' (=default) in case of a file name conflict. This obsoletes the overwrite parameter.
* | | | Merge branch 'mime-rifle'toonn2019-12-211-9/+15
|\ \ \ \
| * | | | Bring custom mime types in line with file(1)toonn2019-11-171-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-standard formats missing the `x-` prefix: flac and flv Renamed mime types: video/mkv -> video/x-matroska video/divx -> video/x-msvideo Dropped extension: divx
| * | | | Refine custom mime types for rifletoonn2019-11-171-9/+20
| | |_|/ | |/| |
* | | | Merge branch 'doc-optional-deps'toonn2019-12-213-15/+167
|\ \ \ \
| * | | | Add list of optional deps to man pagetoonn2019-12-213-15/+167
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The man page was missing the various optional dependencies for previews. I revised and then copied the list from the `README.md`. Fixes #1781
* | | | Merge branch 'leiserfg-patch-1'toonn2019-12-214-5/+20
|\ \ \ \
| * | | | Add bat to documentationtoonn2019-12-203-5/+17
| | | | |
| * | | | Uncomment bat for code highlightingtoonn2019-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our default behavior is to use a dependency whenever it's available. Only things that would slow previews down too much are commented out by default.
| * | | | Replace COLORTERM with 8bit for avoiding problems with truecolor.leiserfg2018-12-271-1/+1
| | | | |
| * | | | Remove spacesleiserfg2018-12-251-2/+2
| | | | |
| * | | | Add bat support for code highlightingLeiser Fernández Gallo2018-11-301-0/+3
| | | | |
* | | | | Merge branch 'fix-clean-cache'toonn2019-12-212-5/+2
|\ \ \ \ \
| * | | | | Restore access to a preview cache in clean modetoonn2019-12-212-5/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `--clean` is incredibly useful when testing contributions to `scope.sh` among other things but some (most?) previews require the cache to function. As a compromise every invocation using `--clean` will create a temporary cache directory. Fixes #1783
* | | | | Merge branch 'Sighery-master'toonn2019-12-211-916/+948
|\ \ \ \ \
| * | | | | Document the usage of ? (help)Sighery2019-12-201-79/+96
| | | | | |
| * | | | | Add Space and navigation keys to the cheatsheetSighery2019-12-201-879/+894
|/ / / / / | | | | | | | | | | | | | | | | | | | | Add to the cheatsheet the functionality of Space and some navigation keys: Insert, Home, End, Page Up and Page Down.
* | | | | Merge branch 'artemisart-patch-1'toonn2019-12-201-0/+21
|\ \ \ \ \
| * | | | | use function, cleanup file, proper repaintMathis Chenuet2019-11-081-2/+8
| | | | | |
| * | | | | add doc and bindingMathis Chenuet2019-11-031-0/+10
| | | | | |
| * | | | | port automatic_cd to fishMathis Chenuet2019-11-031-0/+5
| | | | | |
* | | | | | Merge branch 'igoyak-1367_busyloop'toonn2019-12-191-1/+4
|\ \ \ \ \ \
| * | | | | | Minor linting fixestoonn2019-12-181-2/+1
| | | | | | |
| * | | | | | Exit if STDIN is closed #1367Gustav Larsson2019-08-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of entering a busy-loop if STDIN is closed, terminate ranger Fixes #1367 Fixes #87 Fixes #525 Fixed #1534
* | | | | | | Merge branch 'kdheepak-fix-python3-image-preview-iterm2'toonn2019-12-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Return decoded string instead of byte string of imageDheepak Krishnamurthy2019-06-201-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'eMPee584-fix-status-bar-position'toonn2019-12-111-1/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into fix-status-bar-positionMarcel Partap2019-09-1113-19/+111
| |\ \ \ \ \ \ \
| * | | | | | | | Fix fluke command line & status bar position errorMarcel Partap2019-08-071-1/+5
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting f.e. status bar position fails, it will be retried after triggering a same-size resize event. Fixes #1646
* | | | | | | | Merge branch 'callahad-webp-mimetype'toonn2019-11-171-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add image/webp to known mimetypesDan Callahan2019-07-301-0/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'rifle-generic-open'toonn2019-11-171-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add generic openers for linux and mactoonn2019-10-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rifle serves a similar purpose to `xdg-open` on Linux and `open` on macOS. We fall back to those so users can enjoy their xdg and other configuration from rifle.