aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorLines
2016-07-14Merge pull request #750 from deklov/sway-lock-01Drew DeVault-1/+7
2016-07-13swaylock: Add -f option to detach from the controlling terminal, fixes #725David Eklov-1/+7
2016-07-12Merge pull request #749 from Hummer12007/patch-2Drew DeVault-1/+1
2016-07-12Enable using non-annotated tags in git-describeHummer12007-1/+1
2016-07-12Merge pull request #747 from deklov/clang-format-01Drew DeVault-0/+7
2016-07-12Merge pull request #748 from Hummer12007/x86fixDrew DeVault-1/+2
2016-07-12Fix build on x86Mykyta Holubakha-1/+2
2016-07-11clang-format configuration for Sway's style as detailed in CONTRIBUTING.mdDavid Eklov-0/+7
2016-07-07Merge pull request #744 from thejan2009/tabbed-stacked-layout-fixesDrew DeVault-3/+22
2016-07-07Fix tabbed/stacked corner case #742D.B-3/+22
2016-07-06Merge pull request #739 from deklov/swaybar-pointer-01Drew DeVault-25/+70
2016-07-06Fix formatting guide violations (spaces instead of tabs)David Eklov-20/+20
2016-07-06Enable windows to register to get notified of pointer button eventsDavid Eklov-0/+20
2016-07-06Check capabilities before using pointer and keyboardDavid Eklov-5/+30
2016-07-05Merge pull request #740 from zandrmartin/json-fixesDrew DeVault-23/+27
2016-07-05get_tree json fixesZandr Martin-23/+27
2016-07-05Merge pull request #738 from deklov/panel-as-shell-02Drew DeVault-21/+61
2016-07-04Fix formatting guide violations (spaces instead of tabs)David Eklov-20/+20
2016-07-04swaybg: Make swaybg a shell surfaceDavid Eklov-0/+1
2016-07-04swaybar: Make swaybar a shell surfaceDavid Eklov-0/+2
2016-07-04Move code to make a window a shell surface into seperate functionDavid Eklov-3/+8
2016-07-04Enable backgrounds and panels to be shell surfacesDavid Eklov-0/+32
2016-07-04Merge pull request #737 from zandrmartin/fix-bar-on-reloadDrew DeVault-0/+1
2016-07-04I think this fixes #678Zandr Martin-0/+1
2016-07-04Merge pull request #735 from zandrmartin/get-tree-commandDrew DeVault-152/+385
2016-07-04Merge branch 'master' into get-tree-commandZandr Martin-40/+273
2016-07-04fix typo in ipc-json.cZandr Martin-1/+1
2016-07-04implement `get_tree` commandZandr Martin-152/+385
2016-07-04Merge pull request #734 from jplatte/patch-1Drew DeVault-0/+22
2016-07-04Create .editorconfigJonas Platte-0/+22
2016-07-03Merge pull request #732 from zandrmartin/set-size-commandDrew DeVault-40/+251
2016-07-03typo in focus.hZandr Martin-1/+1
2016-07-03resize command updates (#713)Zandr Martin-52/+229
2016-07-03match i3 syntax for `resize set`Zandr Martin-9/+43
2016-07-02Merge remote-tracking branch 'upstream/master' into set-size-commandZandr Martin-14/+23
2016-06-30Spawn windows as floating if they have a parentDrew DeVault-2/+6
2016-06-27Merge pull request #728 from deklov/masterDrew DeVault-6/+9
2016-06-27Add get_log_level() to encapsulate v (current log level)David Eklov-6/+9
2016-06-27Merge pull request #723 from deklov/masterDrew DeVault-0/+1
2016-06-26Bug fix: Add missing header file, unistd.hDavid Eklov-0/+1
2016-06-25Merge branch 'set-size-command' of github.com:zandrmartin/sway into set-size-...Zandr Martin-0/+0
2016-06-21Merge pull request #720 from Hummer12007/exec_fixDrew DeVault-2/+3
2016-06-21Check if found ws is focused in new view handlerMykyta Holubakha-2/+3
2016-06-19Minor fix to warning messagesDrew DeVault-2/+2
2016-06-18Merge pull request #716 from Hummer12007/patch-1Drew DeVault-2/+2
2016-06-18Added a null check in tabbed_stacked_parentHummer12007-2/+2
2016-06-11Merge pull request #709 from zandrmartin/set-size-command0.8Drew DeVault-16/+40
2016-06-11Merge branch 'master' into set-size-commandZandr Martin-8/+14
2016-06-11Merge branch 'master' of git://github.com/SirCmpwn/sway into set-size-commandZandr Martin-8/+14
2016-06-11implement resize command for absolute dimensionsZandr Martin-16/+40