summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'palikar-paste-dest'toonn2019-03-051-7/+7
|\
| * Fix dest check for :pastetoonn2019-03-051-7/+7
| | | | | | | | | | | | | | The new destination argument for `:paste` requires a guard on whether it is a valid target. A bug snuck in because of copious negation : ) This is now fixed, we only allow the target to be a directory or `None` which means the current tab's working directory.
* | Revert "Merge branch 'slackhead-venv-gitignore'"toonn2019-03-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f5639cd2c4b2f635ec98330da83edbe774a0849d, reversing changes made to aead73e9488be599e92418cea5d9523da459fde1. `.venv` is not a canonical name for python virtualenvs so there's no reason to assume it's common among developers. To avoid potential surprises because of the ignore we're reverting it. We recommend using `.git/info/exclude` instead to specify project-specific ignores that apply only to your setup.
* | Merge branch 'slackhead-venv-gitignore'toonn2019-03-031-0/+1
|\ \
| * | Add .venv to .gitignoredive2019-03-031-0/+1
| | |
* | | Merge branch 'slackhead-reset_previews'toonn2019-03-031-0/+11
|\ \ \ | |/ / |/| | | | | Fixes #1483
| * | Move reset_previews command to commands.pydive2019-03-032-8/+11
| | |
| * | Add a reset_previews commanddive2019-03-031-0/+8
|/ / | | | | | | | | This add a reset_previews command, which helps when switching preview_script on-the-fly.
* | Merge branch 'palikar-paste-dest'toonn2019-02-283-6/+14
|\| | | | | | | Fixes #1473
| * New keybindings for paste to destinationtoonn2019-02-281-0/+3
| | | | | | | | | | pd opens up the console to allow pasting to a path. p'<any> and p`<any> allow for pasting to a bookmark.
| * Minor docstring rephrasingtoonn2019-02-281-2/+2
| |
| * Fixing the dumb clearing mistakeStanislav Arnaudov2019-02-271-1/+1
| |
| * Merge branch 'master' into paste-destStanislav Arnaudov2019-02-271-0/+2
| |\ | |/ |/|
* | Merge pull request #1481 from bigbigtor/fix_issue_1296Toon Nolten2019-02-251-0/+2
|\ \ | | | | | | Fixes #1296
| * | filter out empty lines before parsing the statusVictor Lopez2019-02-241-0/+2
|/ /
| * Clearing up some whitespacesStanislav Arnaudov2019-02-262-2/+2
| |
| * Implementing destination argument for the built in paste commandStanislav Arnaudov2019-02-242-7/+12
|/
* Fix typo in manpagetoonn2019-02-242-3/+3
| | | | | Spotted a `2?` where I'd expected `?c`, figured maybe prefixing might work but testing showed it doesn't.
* Clarify some paths in manpage point to the repotoonn2019-02-162-7/+7
|
* Merge pull request #1469 from Zaeph/rename-append-check-if-dirWojciech Siewierski2019-02-131-1/+1
|\ | | | | rename_append: Use `rename` if point is on a directory
| * Merge conditions with an ‘or’Leo Vivier2019-02-131-5/+1
| |
| * rename_append: Use `rename` if point is on a directoryLeo Vivier2019-02-101-0/+4
|/ | | | | | When the directory at point has full-stops in it, rename_append would put the point at the last period in the dir-name, as it would with a file.
* Ensure that `--clean` doesn't require writable confdirhut2019-02-052-3/+12
|
* Merge pull request #1462 from carloabelli/imvWojciech Siewierski2019-01-311-0/+1
|\ | | | | add imv to rifle.conf
| * add imv to rifle.confCarlo Abelli2019-01-291-0/+1
|/
* Fix #1452 for Python 2 tooWojciech Siewierski2019-01-271-3/+3
|
* Alternative approach to #1452 (which didn't seem to work)Wojciech Siewierski2019-01-271-4/+4
|
* Add .txz to CONTAINER_EXTENSIONStoonn2019-01-271-4/+6
| | | | | It's in the mime database so it's common enough for me. I also fixed up the line widths because they overflowed 80 columns.
* Merge pull request #1454 from Vifon/lazy-bookmark-validationWojciech Siewierski2019-01-272-4/+16
|\
| * Refactor the bookmark validation codeWojciech Siewierski2019-01-272-6/+13
| | | | | | | | | | Now it's trivial for the test module to mock the bookmark validation without introducing too much logic about this mocking to the actual class.
| * Make it easier to test bookmarks by optionally disabling validationWojciech Siewierski2019-01-272-5/+6
| | | | | | | | | | The test bookmarks were intentionally bogus as we cannot reliably predict valid paths on the test system, so validation doesn't make any sense there.
| * container.bookmarks: Don't remove invalid bookmarks at allWojciech Siewierski2019-01-261-2/+1
| | | | | | | | | | Non-existent bookmarks may be only temporarily unreachable (eg. pendrive, NFS), no point in removing them.
| * container.bookmarks: Remove invalid bookmarks only on accessWojciech Siewierski2019-01-261-2/+7
| | | | | | | | | | | | | | | | | | Previously ranger was validating the bookmarks (whether they are existing directories) when loading the bookmark file. It caused the remote filesystems like autofs to wake up unnecessarily and in general caused more problems than solved. Fixes #1365.
* | Merge pull request #1458 from Vifon/doctest-failToon Nolten2019-01-2712-12/+28
|\ \ | | | | | | Fix our doctests
| * | Mock the SettingsAware class for one test that accesses the settingsWojciech Siewierski2019-01-271-0/+7
| | | | | | | | | | | | Related issue: #1457
| * | doctests are no longer silently failing (when failing)Wojciech Siewierski2019-01-2712-12/+21
|/ / | | | | | | | | | | Related issue: #1457 See: https://stackoverflow.com/a/25691978
* | Merge branch 'more-previews' of https://github.com/pkkm/rangerWojciech Siewierski2019-01-261-3/+26
|\ \ | |/ |/|
| * scope.sh: Add Calibre e-book previews (commented out)Paweł Kraśnicki2019-01-181-4/+6
| |
| * Drop dots after file typestoonn2019-01-181-2/+2
| |
| * scope.sh: Minor code style changePaweł Kraśnicki2019-01-181-1/+1
| |
| * scope.sh: Small refactor for robustnessPaweł Kraśnicki2019-01-181-2/+3
| |
| * scope.sh: Add ePub previews (commented out)Paweł Kraśnicki2019-01-181-0/+9
| |
| * scope.sh: Add DjVu previews (commented out)Paweł Kraśnicki2019-01-181-1/+12
| |
* | Merge pull request #1452 from s-n-g/masterWojciech Siewierski2019-01-261-1/+1
|\ \ | | | | | | fix Ctrl+Space crash
| * | adding py2 supportSpiros Georgaras2019-01-261-1/+1
| | |
| * | fix Ctrl+Space crashSpiros Georgaras2019-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in input mode (e.g. search, :mkdir, :rename, etc.), pressing Ctrl+Space makes ranger crash This will fix this issue Crash example: ``` ranger version: ranger-master 1.9.2 Python version: 3.7.2 (default, Jan 10 2019, 23:51:51) [GCC 8.2.1 20181127] Locale: el_GR.UTF-8 Current file: '/home/spiros/1. "aaa" \'aaa\'' Traceback (most recent call last): File "/usr/lib/python3.7/site-packages/ranger/gui/curses_shortcuts.py", line 36, in addstr self.win.addstr(*args) ValueError: embedded null character During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/usr/lib/python3.7/site-packages/ranger/core/main.py", line 195, in main fm.loop() File "/usr/lib/python3.7/site-packages/ranger/core/fm.py", line 394, in loop ui.redraw() File "/usr/lib/python3.7/site-packages/ranger/gui/ui.py", line 338, in redraw self.draw() File "/usr/lib/python3.7/site-packages/ranger/gui/ui.py", line 365, in draw DisplayableContainer.draw(self) File "/usr/lib/python3.7/site-packages/ranger/gui/displayable.py", line 256, in draw displayable.draw() File "/usr/lib/python3.7/site-packages/ranger/gui/widgets/console.py", line 111, in draw self.addstr(0, len(self.prompt), str(line[x:])) File "/usr/lib/python3.7/site-packages/ranger/gui/curses_shortcuts.py", line 44, in addstr self.win.addstr(*_fix_surrogates(args)) ValueError: embedded null character ranger crashed. Please report this traceback at: https://github.com/ranger/ranger/issues ```
* | | Merge pull request #1418 from cjbassi/masterWojciech Siewierski2019-01-251-2/+9
|\ \ \ | |/ / |/| | Load plugin directories located in ~/.config/ranger/plugins
| * | Load plugin directories located in ~/.config/ranger/pluginsCaleb Bassi2019-01-241-2/+9
| | |
* | | Merge branch 'zaeph-font-viewing'toonn2019-01-192-0/+26
|\ \ \ | |_|/ |/| |
| * | Invert conditionLeo Vivier2019-01-191-2/+2
| | | | | | | | | | | | | | | Since we’re now checking whether fontimage runs successfully rather than if it throws an error, the conditions needs to be inverted.