aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-07-04Merge pull request #737 from zandrmartin/fix-bar-on-reloadDrew DeVault
2016-07-04I think this fixes #678Zandr Martin
2016-07-04Merge pull request #735 from zandrmartin/get-tree-commandDrew DeVault
2016-07-04Merge branch 'master' into get-tree-commandZandr Martin
2016-07-04fix typo in ipc-json.cZandr Martin
2016-07-04implement `get_tree` commandZandr Martin
2016-07-04Merge pull request #734 from jplatte/patch-1Drew DeVault
2016-07-04Create .editorconfigJonas Platte
2016-07-03Merge pull request #732 from zandrmartin/set-size-commandDrew DeVault
2016-07-03typo in focus.hZandr Martin
2016-07-03resize command updates (#713)Zandr Martin
2016-07-03match i3 syntax for `resize set`Zandr Martin
2016-07-02Merge remote-tracking branch 'upstream/master' into set-size-commandZandr Martin
2016-06-30Spawn windows as floating if they have a parentDrew DeVault
2016-06-27Merge pull request #728 from deklov/masterDrew DeVault
2016-06-27Add get_log_level() to encapsulate v (current log level)David Eklov
2016-06-27Merge pull request #723 from deklov/masterDrew DeVault
2016-06-26Bug fix: Add missing header file, unistd.hDavid Eklov
2016-06-25Merge branch 'set-size-command' of github.com:zandrmartin/sway into set-size-...Zandr Martin
2016-06-21Merge pull request #720 from Hummer12007/exec_fixDrew DeVault
2016-06-21Check if found ws is focused in new view handlerMykyta Holubakha
2016-06-19Minor fix to warning messagesDrew DeVault
2016-06-18Merge pull request #716 from Hummer12007/patch-1Drew DeVault
2016-06-18Added a null check in tabbed_stacked_parentHummer12007
2016-06-11Merge pull request #709 from zandrmartin/set-size-commandDrew DeVault
2016-06-11Merge branch 'master' into set-size-commandZandr Martin
2016-06-11Merge branch 'master' of git://github.com/SirCmpwn/sway into set-size-commandZandr Martin
2016-06-11implement resize command for absolute dimensionsZandr Martin
2016-06-11Merge pull request #708 from zandrmartin/assign-commandDrew DeVault
2016-06-11couple small fixesZandr Martin
2016-06-11Merge pull request #701 from zandrmartin/assign-commandDrew DeVault
2016-06-11cleanup + add timeouts for pid_workspace listZandr Martin
2016-06-11Merge branch 'master' into assign-commandZandr Martin
2016-06-11clean up pid/workspace stuffZandr Martin
2016-06-10Many improvements to man pagesDrew DeVault
2016-06-10Merge pull request #706 from zandrmartin/swaybg-reloadDrew DeVault
2016-06-10trigger bg change on config reloadZandr Martin
2016-06-10semi-working (only non-client/server wayland apps)Zandr Martin
2016-06-06Merge pull request #703 from thuck/variables_corner_casesDrew DeVault
2016-06-06Fix segfault when using include with *thuck
2016-06-06messy, unfinished versionZandr Martin
2016-06-06Merge pull request #693 from thuck/variables_corner_casesDrew DeVault
2016-06-06Merge branch 'master' into variables_corner_casesDenis Doria
2016-06-05Merge pull request #699 from roosemberth/masterDrew DeVault
2016-06-06Common: Readline: Ignore newline on '\' escaped line ends.Roosembert Palacios
2016-06-05Sway: Configuration: Support for escaping line breaks.Roosembert Palacios
2016-06-05Merge pull request #697 from zandrmartin/assign-commandDrew DeVault
2016-06-05document `assign` commandZandr Martin
2016-06-05Merge branch 'master' into variables_corner_casesDenis Doria
2016-06-04Merge pull request #696 from zandrmartin/numpad-enter-swaylock-fixDrew DeVault