Commit Graph

718 Commits

Author SHA1 Message Date
nojhan
322d4e846d Merge branch 'logged-in-user-fix' of https://github.com/jab416171/liquidprompt into develop 2013-04-22 18:13:11 +02:00
nojhan
d1be06565d Merge branch 'patch-1' of https://github.com/rvanlaar/liquidprompt into develop
Keep the new intro from rvanlaar
Conflicts:
	README.md
2013-04-22 18:11:41 +02:00
nojhan
caa7d0b993 Merge branch 'master' of https://github.com/thanatos/liquidprompt into develop 2013-04-22 18:05:12 +02:00
nojhan
16d4014a2e bugfix analog time with a correct and faster implementation 2013-04-22 00:07:45 +02:00
cyli
22b9164ace Add enabling virtualenv option to the liquidpromptrc-dist 2013-04-21 14:18:01 -07:00
cyli
ffa3e894bc Allow setting the color on the virtualenv display 2013-04-21 14:17:30 -07:00
Joseph Bass
9c95ac472e Fixing an issue where logname might not return the right value, but
$LOGNAME does
2013-04-21 11:02:42 -06:00
François Schmidts
454dfddd44 implementing a temp monitoring solution 2013-04-21 16:16:06 +02:00
Roland van Laar
dad4393496 Refined the intro and installation sections.
Hello,

I saw the liquidprompt on Hackernew. 
I tried to give it a more catching intro to focus on 
why a new user should use it and how it helps them save time. 

I also tried to state the install section more clearly. 
This way users can testdrive it quicker. 

Congrats on the Hackernews list. 
I hope you accept these changes.
2013-04-21 14:06:26 +03:00
Roy Wellington Ⅳ
865df9ffa6 More grammar touchups. 2013-04-20 16:01:36 -07:00
Roy Wellington Ⅳ
bff75a8f8d Touch up spelling and grammar. 2013-04-20 15:32:22 -07:00
nojhan
f483697fda Merge branch 'develop' of github.com:nojhan/liquidprompt into develop 2013-04-20 21:53:09 +02:00
nojhan
91959b636a Add an analog clock
Using `LP_TIME_ANALOG`, you can now display an analog clock instead of
numeric values. The analog clock is "accurate" to the nearest half hour.
2013-04-20 21:51:55 +02:00
nojhan
86fc212656 Merge pull request #136 from jaesivsm/issue/135
Issue/135 — default prompt mark
2013-04-19 08:55:07 -07:00
nojhan
0a0a37abd5 Merge pull request #133 from jaesivsm/develop
fixing issue #132 — force the Internal Field Separator
2013-04-19 08:53:50 -07:00
François Schmidts
74f9ca846c updating documentation 2013-04-17 14:19:16 +02:00
François Schmidts
2b9d9c7aae implementing default prompt mark
as described in issue #135
2013-04-17 14:12:17 +02:00
François Schmidts
289782f350 fixing issue #132
forcing a certain value for IFS in _lp_load_color
2013-04-12 14:46:17 +02:00
nojhan
42af71d3f1 Merge branch 'master' of https://github.com/alexprengere/liquidprompt into develop 2013-04-11 21:32:19 +02:00
Alex
ca41823cdb Update mail for contributor in comments 2013-04-10 00:55:24 +02:00
nojhan
b77940ed2e Update the README about LP_DISABLED_VCS_PATH 2013-04-09 23:00:05 +02:00
nojhan
ceeb3ae8e7 Merge branch 'develop' of https://github.com/milouse/liquidprompt into develop 2013-04-09 22:37:24 +02:00
Julien Pecqueur (JPEC)
f1860cd64f Add debian package (buildscript and package) 2013-03-30 18:34:04 +01:00
Julien Pecqueur
5e232b7b73 Merge pull request #1 from nojhan/master
Sync with official repo
2013-03-28 02:54:14 -07:00
Étienne Deparis
4a25d9d236 Fix bug in fossil branch management 2013-03-25 20:57:46 +01:00
nojhan
256191c11b Merge branch 'develop' 2013-03-25 20:14:24 +01:00
nojhan
7edb81287e Merge pull request #128 from ldidry/badregex
Fix bad regex for submodule from #118
2013-03-25 12:07:45 -07:00
nojhan
b4d83f7fcf Merge pull request #126 from jsleroy/master
Add shortened path mark user configuration
2013-03-25 12:03:34 -07:00
Luc Didry
a1db31b7e3 Fix bad regex for submodule from #118
The regex in bash and zsh doesn't need to be quoted. It resulted a
bad regex warning in zsh (#127) and it didn't worked in submodule.
Plus, bash and zsh regexes have perlish syntax.
2013-03-25 19:40:04 +01:00
Jean-Sebastien Leroy
9e53b9a0a7 Add shortened path mark user configuration 2013-03-21 21:22:20 +01:00
Johann Dreo
0b0398015b bugfix: display git-svn branches 2013-03-20 14:02:09 +01:00
Johann Dreo
ff58dac980 Merge branch 'develop' of github.com:nojhan/liquidprompt into develop 2013-03-20 13:59:11 +01:00
Johann Dreo
79e51ded84 Use a double mark for git-svn repos
If the current git repository is a git-svn one (if it has a .git/svn
directory), use ±‡ as a prompt instead of just ±.
2013-03-20 13:56:44 +01:00
nojhan
59ac71a2b9 Merge pull request #120 from augmentedfourth/sucheck
Handle remote sessions that have changed user
2013-03-16 00:52:44 -07:00
nojhan
dc0edaeda5 Merge branch 'master' of https://github.com/jpec/liquidprompt into develop 2013-03-15 20:15:20 +01:00
nojhan
3fc566b3a3 Merge pull request #123 from polyphemus/tmux
tmux sessions support
2013-03-15 12:11:33 -07:00
nojhan
d1c7c9d394 Merge pull request #121 from ldidry/115
Resolving Issue #115
2013-03-15 12:06:00 -07:00
polyphemus
9bae88a686 update README about tmux support. 2013-03-14 23:18:20 +01:00
polyphemus
ecfdc47a8d Only match detached tmux sessions, not all. 2013-03-14 22:58:27 +01:00
polyphemus
9221d0916c tmux support. Cleanup of _lp_jobcount_color. Adds number of screens sessions and number of tmux sessions as a total of detached sessions. 2013-03-14 22:41:09 +01:00
Julien Pecqueur (JPEC)
729459c9d9 Add Archlinux PKGBUILD. 2013-03-14 20:09:06 +01:00
Brad Beyenhof
fc5da29acb Handle remote sessions that have changed user
Previously, if you were connected via SSH but had changed user with
su/sudo, the _lp_connection function would report you as being connected
via telnet. Now, if the parent process of your shell is 'su' or 'sudo',
it sets the hostname to the color LP_COLOR_SU (default: bold yellow).

This is probably only useful for people who have installed liquidprompt
in a global location and run it with a globally-accessible shell config
(/etc/profile or similar). But since there's already code to handle a
current user of 'root', I assume this has already happened.
2013-03-14 10:15:55 -07:00
nojhan
9d42e53c1e Merge pull request #118 from dotinfra/develop
git submodules & no title for linux console
2013-03-14 03:32:39 -07:00
Luc Didry
9b9191823f Resolving Issue #115 2013-03-14 08:33:21 +01:00
Nicolas LACOURTE
ac92772061 No title for linux console 2013-03-13 23:37:43 +01:00
Nicolas LACOURTE
8b17356596 Add git submodule support 2013-03-13 23:36:15 +01:00
nojhan
4f036f1f0c Merge branch 'master' of https://github.com/LeStef/liquidprompt into develop 2013-03-13 23:01:19 +01:00
nojhan
2869cbaeb4 Test SVN root + temporary remove of result escape
Now use a direct echo instead of an escaped string, should be fixed.
2013-03-13 22:49:23 +01:00
Stéphane Pajot
a00944c490 Add some Mercurial informations : nb of lines inserted, deleted and nb of changes to commit 2013-03-13 18:31:26 +01:00
nojhan
8beba7babe Handle cases where git has no upstream with default locals 2013-03-13 16:09:46 +01:00