Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #52 from dritter/dritter/mercurial_dirty_fix | Ben Hilburn | 2015-07-11 | 1 | -4/+0 |
|\ | | | | | | | | | Must always resolve changeset to show Hg repository status. Resolves bug #51. | ||||
| * | simple-mode deactivated. With that option on, vcs_info doesn't detect the ↵ | Dominik Ritter | 2015-07-10 | 1 | -4/+0 |
| | | | | | | | | repository state correctly. | ||||
* | | Merge pull request #50 from dritter/dritter/vim_modelines_improvement | Ben Hilburn | 2015-07-11 | 1 | -1/+1 |
|\ \ | | | | | | | Add VIM default settings: "expandtab", encoding = "utf8" | ||||
| * | | When opening this file in VIM set "expanded tabs"-option and set encoding to ↵ | Dominik Ritter | 2015-07-10 | 1 | -1/+1 |
| |/ | | | | | | | "utf8". | ||||
* | | Merge pull request #49 from dritter/dritter/branch_icon_fixes | Ben Hilburn | 2015-07-11 | 2 | -17/+17 |
|\ \ | | | | | | | | | | | | | Fix the branch icon in the VCS segment. Resolves bug #49. | ||||
| * | | Fix the branch icon and whitespaces in the vcs segment. | Dominik Ritter | 2015-07-10 | 2 | -17/+17 |
| |/ | |||||
* | | Merge Vagrant VM support for development. | Ben Hilburn | 2015-07-11 | 7 | -0/+203 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #44 from dritter/dritter/vagrant-vm | Ben Hilburn | 2015-07-09 | 1 | -3/+4 |
| |\ | | | | | | | Fixed oh-my-zsh test installation in vagrant VM. | ||||
| | * | Fixed oh-my-zsh test installation. | Dominik Ritter | 2015-07-07 | 1 | -3/+4 |
| |/ | |||||
| * | Merging Vagrant test VM from dritter/prezto | Ben Hilburn | 2015-06-29 | 7 | -0/+202 |
| | | |||||
* | | README: Updating for branch icon, ToC | Ben Hilburn | 2015-07-09 | 1 | -4/+7 |
| | | |||||
* | | Merge pull request #46 from dritter/dritter/branch_icon | Ben Hilburn | 2015-07-09 | 2 | -9/+13 |
|\ \ | | | | | | | Add flag to enable / disable branch icon in VCS prompt. Defaults to `off`. | ||||
| * | | Make branch icon configurable. | Dominik Ritter | 2015-07-08 | 2 | -9/+13 |
| | | | |||||
* | | | Merge pull request #45 from dritter/dritter/symfony2_version | Ben Hilburn | 2015-07-09 | 2 | -0/+13 |
|\ \ \ | | | | | | | | | Added a segment that shows the Symfony2 version number. | ||||
| * | | | Added a segment that shows the Symfony2 version number. | Dominik Ritter | 2015-07-07 | 2 | -0/+13 |
| |/ / | |||||
* | | | Merge pull request #43 from martinpelikan/master | Ben Hilburn | 2015-07-09 | 1 | -9/+3 |
|\ \ \ | |/ / |/| | | Correctly set VCS dirty status on first invocation. | ||||
| * | | Correctly set VCS dirty status on first invocation. | Martin Pelikan | 2015-07-08 | 1 | -9/+3 |
|/ / | | | | | | | | | The precmd hook seems to not get called on first invocation, and gets called recursively for every subsequent invocation. | ||||
* | | README: Silly missing comma. | Ben Hilburn | 2015-07-01 | 1 | -1/+1 |
| | | |||||
* | | README: Adding note about theme inspiration. | Ben Hilburn | 2015-07-01 | 1 | -3/+10 |
| | | |||||
* | | Merge pull request #40 from dsager/update-readme | Ben Hilburn | 2015-06-29 | 1 | -1/+4 |
|\ \ | |/ |/| | README: Fixed info for antigen install | ||||
| * | updated info for antigen install option | Daniel Sager | 2015-06-29 | 1 | -1/+4 |
|/ | |||||
* | README: Updating to reflect new system support | Ben Hilburn | 2015-06-29 | 1 | -32/+68 |
| | |||||
* | README: Removing reference to un-merged Vagrant test VM | Ben Hilburn | 2015-06-29 | 1 | -3/+0 |
| | |||||
* | Merging Antigen and Prezto support from `dritter/prezto` | Ben Hilburn | 2015-06-29 | 3 | -63/+115 |
|\ | | | | | | | Not pulling in support for the Vagrant test VM in this branch. | ||||
| * | All top-level usages of "local" removed. That variables need to be global ↵ | Dominik Ritter | 2015-06-13 | 1 | -5/+5 |
| | | | | | | | | for antigen and prezto to work correctly. | ||||
| * | Added a reference to the test-vm folder | Dominik Ritter | 2015-06-11 | 1 | -0/+3 |
| | | |||||
| * | Updated TOC. | Dominik Ritter | 2015-06-11 | 1 | -0/+4 |
| | | |||||
| * | More Documentation. | Dominik Ritter | 2015-06-11 | 1 | -25/+26 |
| | | |||||
| * | Global variables need to be global, so that antigen and prezto see them.. | Dominik Ritter | 2015-06-11 | 1 | -1/+0 |
| | | |||||
| * | It makes no sense, to clone the powerlevel9k-theme in all frameworks. ↵ | Dominik Ritter | 2015-06-11 | 5 | -15/+10 |
| | | | | | | | | Instead, we can simply use the one, which is mounted in /vagrant_data.. | ||||
| * | Added provisioning for all frameworks. | Dominik Ritter | 2015-06-10 | 1 | -4/+4 |
| | | |||||
| * | Added a testing environment in form of a virtual machine. | Dominik Ritter | 2015-06-10 | 8 | -0/+208 |
| | | |||||
| * | Merge branch 'master' into dritter/prezto | Dominik Ritter | 2015-06-09 | 2 | -111/+417 |
| |\ | |/ |/| | |||||
* | | README: Updating picture location | Ben Hilburn | 2015-06-08 | 1 | -5/+6 |
| | | |||||
* | | Merging support for Awesome-Patched-Powerline fonts. | Ben Hilburn | 2015-06-08 | 2 | -57/+106 |
|\ \ | |||||
| * | | Removing the VCS_BRAND_INDICATOR by default | Ben Hilburn | 2015-06-08 | 1 | -8/+13 |
| | | | |||||
| * | | Reordering code. | Dominik Ritter | 2015-06-06 | 1 | -8/+8 |
| | | | |||||
| * | | Updated TOC. | Dominik Ritter | 2015-06-06 | 1 | -2/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'ben/dritter/font_mode' into dritter/font_mode | Dominik Ritter | 2015-06-06 | 2 | -30/+69 |
| |\ \ | |||||
| | * | | Minor changes to docs in README and theme file. | Ben Hilburn | 2015-06-06 | 2 | -5/+9 |
| | | | | |||||
| | * | | README: Changes / reorg regarding new font options | Ben Hilburn | 2015-06-06 | 1 | -27/+62 |
| |/ / |/| | | |||||
| * | | Cleaned up whitespaces: Now the whitespaces are controlled by the functions ↵ | Dominik Ritter | 2015-06-06 | 1 | -9/+11 |
|/ / | | | | | | | that draw the segments (except vcs). This makes it more flexible, and you don't get unwanted whitespaces, when flipping segments from one side to another. | ||||
* | | Added more Icons, that work in `compatible` mode. | Dominik Ritter | 2015-06-05 | 2 | -13/+13 |
| | | |||||
* | | Merge branch 'master' into dritter/font_mode | Dominik Ritter | 2015-06-05 | 1 | -1/+9 |
|\ \ | |||||
| * \ | Merge pull request #34 from dritter/dritter/multiline_rprompt_fix | Ben Hilburn | 2015-06-05 | 1 | -1/+9 |
| |\ \ | | | | | | | | | Put RPROMPT on first line of dual-lined prompts. | ||||
| | * | | Formatting. | Dominik Ritter | 2015-06-05 | 1 | -6/+6 |
| | | | | |||||
| | * | | Fix for Issue #33. Now the RPROMPT is on the first line. | Dominik Ritter | 2015-06-05 | 1 | -1/+9 |
| |/ / | |||||
* | | | Added variable for completeness. | Dominik Ritter | 2015-06-05 | 1 | -0/+1 |
| | | | |||||
* | | | Added `compatible` icons | Dominik Ritter | 2015-06-05 | 1 | -14/+14 |
| | | | |||||
* | | | Formatting. | Dominik Ritter | 2015-06-05 | 1 | -2/+1 |
| | | |