Tree: ef003b76c2

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'ef003b76c2'

${ noResults }

Commit Graph

271 Commits (ef003b76c22c7c99602c1cd5fe71317fb4605697)

 

All Branches   

Search

Author	SHA1	Message	Date
Chris Guillott	ef003b76c2	update changelog to include clock version #	8 years ago
Chris Guillott	18a9572482	Add clock functionality and swap default time/date format strings I set them to what I use because I'm an asshole.	8 years ago
Chris Guillott	5e1de46792	also narrow the new keystroke width	8 years ago
Chris Guillott	5a5741bc22	add example lock script	8 years ago
Chris Guillott	e4301604e5	add custom time formatter strings	8 years ago
Chris Guillott	158623508a	add basic clock feature	8 years ago
Chris Guillott	ee0f50de06	add debug make target	8 years ago
Chris Guillott	970bdb5810	upstream merge	8 years ago
eplanet	d2130092cf	Display error message when locking failed (#99) To give a feedback for when the pointer couldn't be grabbed, displaying an error message before exiting.	8 years ago
Chris Guillott	87ba982a18	also fix my gitignore lol	8 years ago
Chris Guillott	16006c60b8	merge upstream	8 years ago
eplanet	1c97a84847	Displaying locking message when grabbing the pointer/keyboard. (#88) Display "locking…" message when grabbing the pointer/keyboard, after at least 250 ms of unfruitful attempts. If grabbing eventually fails, application will not fork and return 1.	8 years ago
Chris Guillott	c8e1aece73	Merge pull request #8 from i3/master i3lock: Stop leaking the image_path dup. (#93)	8 years ago
Diogo Ferreira	fd2215b0f0	i3lock: Stop leaking the image_path dup. (#93)	8 years ago
Chris Guillott	cbd454e493	Merge branch 'master' of https://github.com/i3/i3lock	8 years ago
koebi	17b7b77893	unlock automatically after authentication failure (#90) This will make i3 unlock automatically after authentication failure and correct input without pressing <Enter> again after the "wrong"-indicator is gone.	8 years ago
Chris Guillott	1ebdc36c5b	upstream again	8 years ago
Vasilij Schneidermann	893aff1bd0	Set font face (#89)	8 years ago
Chris Guillott	6e63604fff	merge upstream	8 years ago
eplanet	0d111aaede	Added version files for release tarball. Fixes #40 (#86)	8 years ago
Chris Guillott	38a70376f2	resolve merge conflict with upstream	8 years ago
Florian Zipperle	cca7d4e6c3	Removed obsolete inactivity timeout (#84) * Removed obsolete inactivity timeout	8 years ago
Chris Guillott	70d2648639	Merge remote-tracking branch 'upstream/master'	9 years ago
Michael Stapelberg	679fb57acc	i3lock.1: use signal names without SIG prefix (Thanks rodfersou) see #32	9 years ago
Chris Guillott	36146964d8	Merge pull request #6 from boatrite/zb-update-readme Add specific apt-get command to install dependencies in Ubuntu	9 years ago
Zach Boatrite	81689fea57	Add specific apt-get command to install dependencies in Ubuntu	9 years ago
Chris Guillott	2e8c3fd291	Merge upstream commits ya	9 years ago
Michael Stapelberg	619c791a20	update CHANGELOG	9 years ago
Michael Stapelberg	ce1c5cecc0	clang-format-3.5 Not sure why travis didn’t warn about this on the PR. The only reference to the PR I can find is https://travis-ci.org/i3/i3lock/builds/130470377	9 years ago
Michael Stapelberg	a5c6b2653e	add CONTRIBUTING.md …so that people know we don’t want to extend i3lock’s image handling. related to #81, #68, #31	9 years ago
Chris Guillott	de6bea2603	Merge pull request #4 from i3/master Merge upstream commits	9 years ago
Christoph Ruegge	463d38fed6	Add support for `xss-lock --transfer-sleep-lock' (#75) Add support for `xss-lock --transfer-sleep-lock'	9 years ago
martin	402254b575	Flush xcb connection after opening fullscreen window (#74) We need to ensure that the window handle is valid, i. e. the window is actually created and accessible, before returning. This is necessary because we immediately fork after returning, and the child process opens its own X11 connection and expects the window handle to be valid. Fixes #46	9 years ago
Chris Guillott	63a4c23ec6	Merge pull request #3 from i3/master Allow CTRL+J as enter and CTRL+H as backspace (#72)	9 years ago
Karl Tarbe	9a7604bb35	Allow CTRL+J as enter and CTRL+H as backspace (#72) fixes #71	9 years ago
Chris Guillott	c27e4c092c	Merge pull request #2 from joeythesaint/optional-xkbcompose compose: make usage of xkbcompose optional	9 years ago
Joe MacDonald	3afa2b710f	compose: make usage of xkbcompose optional Older versions of libxkbcommon-dev (in Debian / Ubuntu) don't provide xkbcommon-compose.h and the accompanying API. Detect whether the header file is present when building and if not, revert to the behaviour prior to ef3ef30400, the commit that introduced the usage of that header. Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>	9 years ago
Chris Guillott	b2c32475a0	Merge pull request #1 from meskarune/master changed package so it creates an i3lock binary instead of i3lock-colo…	9 years ago
meskarune	c0fbddcd09	changed package so it creates an i3lock binary instead of i3lock-color as they are direct replacements	9 years ago
Chris Guillott	b332ce611b	update help/makefile/man page	9 years ago
Chris Guillott	ed326ee463	add option for single-display unlock indicator	9 years ago
Chris Guillott	177024ddc0	Update README.md yeah I'm bad at readmes	9 years ago
Chris Guillott	3aee980f30	Update README.md	9 years ago
Chris Guillott	7fb899bcd5	expose separator color for theming + bug fix I did a double take, apparently he messed up a copy/paste.	9 years ago
Chris Guillott	fdaf1b22d8	update .gitignore to include i3lock-color instead of i3lock	9 years ago
Chris Guillott	5a2a6e4f61	Merge branch 'master' of github.com:Arcaena/i3lock-color	9 years ago
Chris Guillott	cf522a301f	add a couple options for drawing the line color	9 years ago
Chris Guillott	003c2d16a7	I accidentally a word, somehow.	9 years ago
Chris Guillott	986608a1fb	update makefile so you can have i3lock-color installed alongside i3lock	9 years ago
Chris Guillott	0a05fc0778	have I mentioned I'm bad at markdown?	9 years ago