Kim Silkebækken
4a0b7e2950
Merge branch 'remove-packages' into develop
2014-01-19 11:20:23 +01:00
Kim Silkebækken
9de9bc7907
Remove archlinux packages
2014-01-19 11:20:15 +01:00
ZyX-I
7cf3171a45
Merge pull request #753 from ZyX-I/fix-functional-tests-diff-2
...
Try to workaround problems with last line in travis
2014-01-17 14:13:49 -08:00
ZyX
2b171cff67
Try to workaround problems with last line in travis
2014-01-18 01:59:19 +04:00
ZyX-I
2a525ae4f8
Merge pull request #667 from kovidgoyal/fix-git-branch-name
...
Fix git branch name sometimes getting stuck with inotify
2014-01-17 10:20:25 -08:00
ZyX-I
5c7e8040e6
Merge pull request #707 from wsnyders/develop
...
Update dependanceies for Arch packages.
2014-01-17 09:55:05 -08:00
ZyX
1dbdc6728d
Merge branch 'fix-functional-tests-diff' into develop
2014-01-17 21:34:57 +04:00
ZyX
56ef798218
On travis there are differences in CRs for some reason
...
This commit strips CRs from *.ok files and test output. Test failure used to be
not recognized due to pipe: `cat -v` always succeeds meaning that `if ! diff
… | cat -v` always succeeds too.
2014-01-17 21:34:18 +04:00
ZyX-I
0c0b4282fe
Merge pull request #708 from ZyX-I/fix-finish_args-typo
...
Fix finish args typo
2014-01-17 09:16:40 -08:00
ZyX-I
b531ffa2b3
Merge pull request #751 from mrrcollins/rc
...
A lowercase f for the unit caused the weather segment to silently fail. ...
2014-01-17 08:56:20 -08:00
ZyX
ac9703e04c
Also check for jobnum
2014-01-17 20:54:47 +04:00
ZyX
a71c49d96b
Add tests
2014-01-17 20:51:38 +04:00
Ryan Collins
40fe3cf938
A lowercase f for the unit caused the weather segment to silently fail. Putting in a capital F works correctly
2014-01-17 00:15:37 -05:00
ZyX
31f85800b6
Merge branch 'kruton-develop' into develop
...
Fixes #748
2014-01-14 23:42:22 +04:00
ZyX
aa3e86b9d9
Rewrite documentation string
2014-01-14 23:38:34 +04:00
Kenny Root
c33d56e73c
Add arg to optionally suppress user segment
...
This adds the option to common.user to suppress display if the username
matches the given string in the new "hide_user" argument.
2014-01-13 23:57:41 -08:00
ZyX-I
057ff37c30
Merge pull request #747 from ZyX-I/more-functional-tests
...
More functional tests
2014-01-13 12:32:11 -08:00
ZyX
2e713269ae
Always show hostname (travis is ssh), fix jobnum in zsh
2014-01-14 00:18:34 +04:00
ZyX
0f0a5e92d3
Replace sed with python script
...
sed escaping is wrong: e.g. re.escape() will escape `+`, but with BRE escaped
plus is quantifier
2014-01-13 22:37:33 +04:00
ZyX
03245f192b
Also replace $USER with USER
2014-01-13 22:11:52 +04:00
ZyX
b16943292b
Add missing zsh.ok
2014-01-13 22:04:44 +04:00
ZyX
d1793fac61
Run apt-get with sudo and -qq like suggested in travis documentation
...
Documentation though suggests using before_install. Not sure why.
2014-01-13 21:48:09 +04:00
ZyX
b55c5da336
Also install screen
2014-01-13 19:48:12 +04:00
ZyX
d9c62d4796
Add zsh functional tests
2014-01-13 19:47:58 +04:00
ZyX
6c27506270
Move tests/test_shells/input.sh to tests/test_shells/input.bash
2014-01-13 01:07:13 +04:00
ZyX
6996896b22
Made it use screen for testing
2014-01-13 00:53:38 +04:00
ZyX
55957ec3cb
Move shell testing to tests/test_shells/test.sh
2014-01-12 23:45:17 +04:00
ZyX
bb9034adcf
Replace zyx-desktop with HOSTNAME
2014-01-11 13:52:07 +04:00
ZyX
ed99b09e86
Use get_output function
2014-01-11 13:36:02 +04:00
ZyX
301dbf2bd3
Add a few empty lines, rename bash directory to 3rd
2014-01-11 13:31:57 +04:00
ZyX
f20792bb38
Add bash functional tests
2014-01-11 13:16:25 +04:00
ZyX
fb00a9586b
Fix copy-paste typo in shell.py
2014-01-11 12:50:50 +04:00
ZyX
bd4173eb1f
Add jobnum segment to default_leftonly theme
2014-01-11 12:43:13 +04:00
ZyX
73d7b0db08
Add functional tests for plugin themes
2014-01-11 11:51:58 +04:00
ZyX
e8b2054868
Make nerdtree segment use bufvar_exists
2014-01-11 11:51:41 +04:00
ZyX
64a32a910b
Add window_cached decorator for ctrlp segment
2014-01-11 11:50:28 +04:00
Kenny Root
54e7fe91ba
Fix common.user test
...
The username was being cached from previous tests, so clear it before
running this test.
2014-01-10 14:15:54 -08:00
ZyX-I
0d64b5ebd2
Merge pull request #745 from cyberdork33/patch-1
...
Update powerline.sh
2014-01-10 13:55:55 -08:00
cyberdork33
01f445bd67
Update powerline.sh
...
I think this was a typo. broke my system.
2014-01-10 15:25:20 -06:00
ZyX-I
1587f262de
Merge pull request #744 from ZyX-I/fix-tests
...
Fix tests
2014-01-10 11:42:41 -08:00
ZyX
e152ecfa9a
Add missing groups to solarizedlight
2014-01-10 23:22:54 +04:00
ZyX
4f80468645
Fix tests broken due to jobnum introduction
2014-01-10 23:17:06 +04:00
ZyX-I
4d408c7c78
Merge pull request #743 from ZyX-I/fix-742
...
Add Args.jobnum property
2014-01-10 11:00:58 -08:00
ZyX
e56bf3606b
Add Args.jobnum property
...
Fixes #742
2014-01-10 23:01:32 +04:00
ZyX-I
759bf043dc
Merge pull request #528 from phunehehe/feature/527-zsh-bash-relative-path
...
Feature/527 zsh bash relative path
2014-01-10 09:55:11 -08:00
ZyX-I
7b3e935461
Merge pull request #694 from Apsu/patch-1
...
Fix weather geoip lookups
2014-01-10 09:47:05 -08:00
ZyX-I
483ed5d0e2
Merge pull request #671 from jarnett/develop
...
workaround for _powerline_tmux_setenv() issue with bash-4.2.45
2014-01-10 09:38:12 -08:00
ZyX-I
0a0f971484
Merge pull request #679 from pdf/feature/678-fix-infinite-recursion-in-powerline_old_prompt_command
...
Avoid infinite recursion in `POWERLINE_OLD_PROMPT_COMMAND`
2014-01-10 09:36:43 -08:00
ZyX-I
d5720bfff8
Merge pull request #682 from toresbe/patch-1
...
Make clearer the naming conflict in PyPI (closes #681 )
2014-01-10 09:35:32 -08:00
ZyX-I
76027fb0c2
Merge pull request #716 from metaphox/develop
...
add Solarized Light colour theme for Vim
2014-01-10 09:30:35 -08:00