Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'laktak-paste_conflict' | toonn | 2019-12-22 | 7 | -33/+89 |
|\ | |||||
| * | Use readable formatting for the examples | toonn | 2019-12-22 | 2 | -2/+2 |
| * | Add example and remove reference from docs | toonn | 2019-12-22 | 2 | -4/+8 |
| * | Rename APPENDIX to SUFFIX | toonn | 2019-12-22 | 1 | -3/+3 |
| * | Merge branch 'master' into paste_conflict | Christian Zangl | 2019-12-03 | 10 | -41/+83 |
| |\ | |||||
| * \ | Merge branch 'master' into paste_conflict | Christian Zangl | 2019-10-04 | 19 | -144/+490 |
| |\ \ | |||||
| * | | | set default make_safe_path=get_safe_path | Christian Zangl | 2019-07-21 | 4 | -26/+34 |
| * | | | fix docs | Christian Zangl | 2019-07-19 | 2 | -4/+5 |
| * | | | Added a make_safe_path parameter to paste | Christian Zangl | 2019-07-18 | 8 | -90/+87 |
| * | | | fix CopyLoader | Christian Zangl | 2019-07-14 | 1 | -1/+2 |
| * | | | Added a conflict parameter to the paste action | Christian Zangl | 2019-07-14 | 7 | -44/+89 |
* | | | | Merge branch 'mime-rifle' | toonn | 2019-12-21 | 1 | -9/+15 |
|\ \ \ \ | |||||
| * | | | | Bring custom mime types in line with file(1) | toonn | 2019-11-17 | 1 | -19/+14 |
| * | | | | Refine custom mime types for rifle | toonn | 2019-11-17 | 1 | -9/+20 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'doc-optional-deps' | toonn | 2019-12-21 | 3 | -15/+167 |
|\ \ \ \ | |||||
| * | | | | Add list of optional deps to man page | toonn | 2019-12-21 | 3 | -15/+167 |
|/ / / / | |||||
* | | | | Merge branch 'leiserfg-patch-1' | toonn | 2019-12-21 | 4 | -5/+20 |
|\ \ \ \ | |||||
| * | | | | Add bat to documentation | toonn | 2019-12-20 | 3 | -5/+17 |
| * | | | | Uncomment bat for code highlighting | toonn | 2019-12-20 | 1 | -1/+1 |
| * | | | | Replace COLORTERM with 8bit for avoiding problems with truecolor. | leiserfg | 2018-12-27 | 1 | -1/+1 |
| * | | | | Remove spaces | leiserfg | 2018-12-25 | 1 | -2/+2 |
| * | | | | Add bat support for code highlighting | Leiser Fernández Gallo | 2018-11-30 | 1 | -0/+3 |
* | | | | | Merge branch 'fix-clean-cache' | toonn | 2019-12-21 | 2 | -5/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Restore access to a preview cache in clean mode | toonn | 2019-12-21 | 2 | -5/+2 |
|/ / / / / | |||||
* | | | | | Merge branch 'Sighery-master' | toonn | 2019-12-21 | 1 | -916/+948 |
|\ \ \ \ \ | |||||
| * | | | | | Document the usage of ? (help) | Sighery | 2019-12-20 | 1 | -79/+96 |
| * | | | | | Add Space and navigation keys to the cheatsheet | Sighery | 2019-12-20 | 1 | -879/+894 |
|/ / / / / | |||||
* | | | | | Merge branch 'artemisart-patch-1' | toonn | 2019-12-20 | 1 | -0/+21 |
|\ \ \ \ \ | |||||
| * | | | | | use function, cleanup file, proper repaint | Mathis Chenuet | 2019-11-08 | 1 | -2/+8 |
| * | | | | | add doc and binding | Mathis Chenuet | 2019-11-03 | 1 | -0/+10 |
| * | | | | | port automatic_cd to fish | Mathis Chenuet | 2019-11-03 | 1 | -0/+5 |
* | | | | | | Merge branch 'igoyak-1367_busyloop' | toonn | 2019-12-19 | 1 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Minor linting fixes | toonn | 2019-12-18 | 1 | -2/+1 |
| * | | | | | | Exit if STDIN is closed #1367 | Gustav Larsson | 2019-08-15 | 1 | -0/+4 |
* | | | | | | | Merge branch 'kdheepak-fix-python3-image-preview-iterm2' | toonn | 2019-12-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Return decoded string instead of byte string of image | Dheepak Krishnamurthy | 2019-06-20 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'eMPee584-fix-status-bar-position' | toonn | 2019-12-11 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into fix-status-bar-position | Marcel Partap | 2019-09-11 | 13 | -19/+111 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix fluke command line & status bar position error | Marcel Partap | 2019-08-07 | 1 | -1/+5 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'callahad-webp-mimetype' | toonn | 2019-11-17 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add image/webp to known mimetypes | Dan Callahan | 2019-07-30 | 1 | -0/+2 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rifle-generic-open' | toonn | 2019-11-17 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add generic openers for linux and mac | toonn | 2019-10-16 | 1 | -0/+6 |
* | | | | | | | | | Merge branch 'mime-opus' | toonn | 2019-11-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add .opus as extension for audio/ogg | toonn | 2019-10-02 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'vifon-rifle-offbyone-hotfix' | toonn | 2019-11-16 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Hotfix for an off-by-one in rifle | Wojciech Siewierski | 2019-10-02 | 1 | -0/+3 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'paste-non-existing-target' | toonn | 2019-11-07 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | self is not available in default argument value | toonn | 2019-11-07 | 1 | -1/+3 |
| * | | | | | | | | | | Check current dir exists when pasting | toonn | 2019-11-07 | 1 | -3/+3 |
|/ / / / / / / / / / |