Commit Graph

2702 Commits

Author SHA1 Message Date
Michael Stapelberg 1a34d250bb Merge branch 'master' into next 2011-08-29 15:17:53 +02:00
Michael Stapelberg 04a886e4ee Merge branch 'fix-borderless' 2011-08-29 15:17:50 +02:00
Michael Stapelberg 640071163f docs/userguide: new_window: s/borderless/none/ (Thanks bjonnh) 2011-08-29 15:17:31 +02:00
Michael Stapelberg a4804a53b8 Merge branch 'master' into next 2011-08-28 20:18:03 +02:00
Michael Stapelberg 79802cf824 debian: bump version so that apt prefers source builds over debian repository versions 2011-08-28 20:17:38 +02:00
Michael Stapelberg abafb2b235 Merge branch 'master' into next 2011-08-28 20:07:29 +02:00
Michael Stapelberg 0b2e974893 Merge branch 'release-4.0.2' 2011-08-28 20:07:26 +02:00
Michael Stapelberg cd9056afc7 debian: wrap debian/control correctly 2011-08-28 19:56:46 +02:00
Michael Stapelberg f7b23e3a41 bump version number in man/asciidoc.conf 2011-08-28 19:47:03 +02:00
Michael Stapelberg 042d60c9e6 add release notes for v4.0.2 2011-08-28 19:17:43 +02:00
Michael Stapelberg 8b0fecf559 debian: update changelog for the 4.0.2 release 2011-08-28 19:09:57 +02:00
Michael Stapelberg 44ae1b50ef Merge branch 'fix-wsnum' into next 2011-08-28 18:17:25 +02:00
Michael Stapelberg dfda878272 Bugfix: Correctly assign a number to workspaces starting with '0: ' (Thanks SardemFF7) 2011-08-28 18:17:02 +02:00
Michael Stapelberg e7d6cd0f1c Merge branch 'master' into next 2011-08-28 18:03:06 +02:00
Michael Stapelberg 17c0ec19b2 Merge branch 'userguide' 2011-08-28 18:03:03 +02:00
Michael Stapelberg 5796f72885 docs/userguide: properly document command chaining and criteria 2011-08-28 18:02:49 +02:00
Michael Stapelberg e5f10022e7 docs/userguide: properly document the resize command 2011-08-28 17:51:37 +02:00
Michael Stapelberg aa65b507ad Merge branch 'master' into next 2011-08-28 17:44:59 +02:00
Michael Stapelberg 1d83e776f1 Merge branch 'fix-urls' 2011-08-28 17:44:57 +02:00
Mark Kusch 1953f2c707 s/i3.zekjur.net/i3wm.org/g 2011-08-28 17:44:42 +02:00
Michael Stapelberg 57e7266da4 Merge branch 'master' into next 2011-08-28 17:41:23 +02:00
Michael Stapelberg 3950aa730c Merge branch 'fix-ipc-name' 2011-08-28 17:40:15 +02:00
Peter Bui 6e59d693d2 Use name_json if available, rather than non-descriptive name. 2011-08-28 17:36:16 +02:00
Michael Stapelberg f0a0236b7b Merge branch 'master' into next 2011-08-28 17:02:19 +02:00
Michael Stapelberg 833e4233fc Merge branch 'migrate-indention' 2011-08-28 17:02:17 +02:00
Michael Stapelberg 96b219f27b migrate-config: use \s, be a bit more whitespace tolerant (+test) (Thanks sbedivere)
Fixes: #457
2011-08-28 17:01:59 +02:00
Michael Stapelberg 6037050015 Merge branch 'master' into next 2011-08-28 16:18:24 +02:00
Michael Stapelberg b76b9be75a Merge branch 'wizard-fix-mods' 2011-08-28 16:18:21 +02:00
Michael Stapelberg 0dc11b5d22 i3-config-wizard: Bugfix: Check the modifier mapping to decide whether to use Mod1 or Mod4
Fixes #491

Before, we assumed XK_Alt_L was in Mod1 and XK_Super_L was in Mod4 (which is
true on most systems). Now we just check if the keycode is in Mod1 or Mod4 and
write the config accordingly.
2011-08-28 16:16:53 +02:00
Michael Stapelberg 16188af8bf Merge branch 'master' into next 2011-08-28 15:47:35 +02:00
Michael Stapelberg c96b5a12a7 Merge branch 'fix-floatdock' 2011-08-28 15:47:31 +02:00
Michael Stapelberg 5618875df8 Bugfix: Make 'floating enable' check for dock windows (Thanks edelkind)
Fixes #501
2011-08-28 15:46:50 +02:00
Michael Stapelberg 0b0a2dad51 t/66-assign: check if i3 crashes when assigning a dock window to floating 2011-08-28 15:43:51 +02:00
Michael Stapelberg f269d85232 Merge branch 'master' into next 2011-08-28 14:55:17 +02:00
Michael Stapelberg 3380f76310 Merge branch 'userguide-wrapping' 2011-08-28 14:55:14 +02:00
Michael Stapelberg c846ff272f docs/userguide: document force_focus_wrapping config directive 2011-08-28 14:54:58 +02:00
Michael Stapelberg 61cbf7a658 Merge branch 'colors-userguide' into next 2011-08-27 16:47:53 +02:00
Michael Stapelberg 808491a020 Merge branch 'colors-userguide' 2011-08-27 16:47:49 +02:00
Michael Stapelberg 30c892adf4 docs/userguide: use the default colors in the colors example 2011-08-27 16:47:36 +02:00
Michael Stapelberg 057e0e9794 Merge branch 'master' into next 2011-08-27 15:28:34 +02:00
Michael Stapelberg 47ae4d4f66 Merge branch 'fix-userguide' 2011-08-27 15:28:31 +02:00
Michael Stapelberg 2d627ad9de docs/userguide: s/mod+h/mod+s for stacking (Thanks Tim) 2011-08-27 15:28:11 +02:00
Michael Stapelberg 8114ecda47 Merge branch 'master' into next 2011-08-27 13:47:57 +02:00
Michael Stapelberg 9e46f7bd8f Merge branch 'fix-dock-reconfigure' 2011-08-27 13:47:51 +02:00
Michael Stapelberg e97a7e34f7 Bugfix: Re-implement reconfiguring height of dock windows (+test) (Thanks thomasba) 2011-08-27 13:47:10 +02:00
Michael Stapelberg 6c42a179ec Merge branch 'master' into next 2011-08-27 13:03:20 +02:00
Michael Stapelberg 05d10fdb2c Merge branch 'fix-focus-assign' 2011-08-27 13:03:17 +02:00
Michael Stapelberg 4c01dbd726 Bugfix: Don’t always focus floating windows (fixes focus stealing with assignments) (+test) (Thanks aksr) 2011-08-27 13:02:44 +02:00
Michael Stapelberg 4cb95b3ab3 Merge branch 'fix-yajl-warning' into next 2011-08-26 23:33:40 +02:00
stfn 8e8b9b93f4 ipc.c: Fix warning 2011-08-26 23:33:11 +02:00