summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Adaptions for API change in json-c v0.130.15.1Libravatar Björn Esser2017-12-17
| | | | | | | | | | Lift restriction on json-c <= 0.12.1 ipc-server: Acquire ownership of referenced json_object properly When adding a referenced json_object with an unknown lifetime to another json_object, it must be done with a wrapped call to json_object_get() to acquire the ownership of that json_object.
* Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15"Libravatar Drew DeVault2017-12-17
| | | | | This reverts commit 1c4a086e7556475139960a25cb642f115d057c23, reversing changes made to 1263ea6497c732bfa1835eea4a8ffe2e6ea6e377.
* Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15Libravatar Drew DeVault2017-12-17
|\
| * Adaptions for API change in json-c v0.13Libravatar Björn Esser2017-12-14
| |
| * ipc-server: Acquire ownership of referenced json_object properlyLibravatar Björn Esser2017-12-14
| | | | | | | | | | | | When adding a referenced json_object with an unknown lifetime to another json_object, it must be done with a wrapped call to json_object_get() to acquire the ownership of that json_object.
| * Lift restriction on json-c <= 0.12.1Libravatar Björn Esser2017-12-14
| |
| * Merge pull request #1455 from etam/dbus_dependencyLibravatar Drew DeVault2017-11-05
| |\ | | | | | | Update dbus dependency
| | * Add dbus info to readmeLibravatar Adam Mizerski2017-11-05
| | |
| | * Dbus must be at least version 1.10Libravatar Adam Mizerski2017-11-05
| | | | | | | | | | | | Function dbus_message_iter_get_element_count is available since 1.10.
| * | Merge pull request #1454 from etam/fix_init_trayLibravatar Drew DeVault2017-11-05
| |\ \ | | |/ | |/| Fix init_tray function declaration
| | * Fix init_tray function declarationLibravatar Adam Mizerski2017-11-05
| |/ | | | | | | | | This fixes compilation failure: error: call to function 'init_tray' without a real prototype
| * Merge pull request #1443 from gferon/gferon-readme-editLibravatar Drew DeVault2017-11-02
| |\ | | | | | | Update README.md
| | * Update README.mdLibravatar Gabriel Féron2017-11-02
| |/
| * Merge pull request #1446 from kon14/patch-1Libravatar Drew DeVault2017-11-01
| |\ | | | | | | Update README.el.md
| | * Update README.el.mdLibravatar Konstantinos Feretos2017-11-01
| | |
| * | Merge pull request #1445 from yuilib/update-readme-jaLibravatar Drew DeVault2017-11-01
| |\ \ | | |/ | |/| Update README.ja.md
| | * Update README.ja.mdLibravatar yuilib2017-11-01
| |/
| * Merge pull request #1441 from ptMuta/masterLibravatar Drew DeVault2017-10-28
| |\ | | | | | | Removed trailing comma from swaybar click event json
| | * Removed trailing comma from swaybar click event jsonLibravatar Joona Romppanen2017-10-28
| |/
| * Merge pull request #1436 from dlrobertson/add_asan_buildLibravatar Drew DeVault2017-10-27
| |\ | | | | | | Add Address Sanitized build type
| | * Add Address Sanitized build typeLibravatar Dan Robertson2017-10-27
| | | | | | | | | | | | - Add -DCMAKE_BUILD_TYPE=ASAN to possible builds
| * | Merge pull request #1438 from mariusor/explicit_json-c_versionLibravatar Drew DeVault2017-10-27
| |\ \ | | |/ | |/| Explicitly setting the version of json-c required
| | * Explicitly setting the version of json-c requiredLibravatar Marius Orcsik2017-10-27
| |/ | | | | | | | | | | | | | | | | | | to 0.12.1. This is needed because the development version breaks the existing API of json_object_array_length() by moving the return from int to size_t. This would fix #1355
| * Merge pull request #1430 from dlrobertson/nvidia_drmLibravatar Drew DeVault2017-10-24
| |\ | | | | | | nvidia: Validate the nvidia_drm module options
| | * nvidia: Validate the nvidia_drm module optionsLibravatar Dan Robertson2017-10-24
| |/ | | | | | | | | When the proprietary nvidia driver is used, ensure the modeset option is set instead of checking /proc/cmdline for nvidia-drm.modeset=1.
| * Merge pull request #1427 from ranisalt/patch-1Libravatar Drew DeVault2017-10-23
| |\ | | | | | | Use add_compile_options instead of interpolation
| | * Use add_compile_options instead of interpolationLibravatar Ranieri Althoff2017-10-24
| |/ | | | | Uses CMake's `add_compile_options` directive instead of interpolating `CMAKE_C_FLAGS` for adding compilation flags.
| * Merge pull request #1425 from ggreer/grab-errorLibravatar Drew DeVault2017-10-22
| |\ | | | | | | swaygrab: Add some error handling.
| | * swaygrab: Add some error handling.Libravatar Geoff Greer2017-10-22
| |/ | | | | | | | | - If IPC response contains `success: false`, abort and print error message. - If tree has no nodes, abort with error msg instead of segfaulting.
| * Merge pull request #1424 from ggreer/swaygrab-jsonLibravatar Drew DeVault2017-10-22
| |\ | | | | | | swaygrab: Prevent segfault if IPC response can't be parsed.
| | * swaygrab: Increase max depth of JSON parsing to 256. Prevent segfault if IPC ↵Libravatar Geoff Greer2017-10-22
| |/ | | | | | | | | | | response can't be parsed. The default max nesting depth of json-c is 32, which can cause some valid trees to fail to be parsed, so increase that. Also instead of segfaulting, just abort and print the error returned by json-c.
| * Merge pull request #1419 from 4e554c4c/better_logsLibravatar Drew DeVault2017-10-20
| |\ | | | | | | Print log level even if STDERR is not a tty
| | * Print log level even if STDERR is not a ttyLibravatar Calvin Lee2017-10-20
| |/ | | | | | | | | Makes reading debug logs much easier, debug lines will start with `E`, info lines with `I` and error lines with `E`.
| * Remove broken link to Spanish translationLibravatar Drew DeVault2017-10-20
| | | | | | | | Fixes #1417
| * Merge pull request #1412 from Hummer12007/rcfixLibravatar Drew DeVault2017-10-17
| |\ | | | | | | handlers: preserve parent pointer value
| | * handlers: preserve parent pointer valueLibravatar Mykyta Holubakha2017-10-17
| |/
| * Add feature freeze notice to readmeLibravatar Drew DeVault2017-10-16
| |
| * Fix crash closing fullscreen windows in containerLibravatar Drew DeVault2017-10-16
| |
| * Merge pull request #1402 from johalun/event-codes-include-fixLibravatar Drew DeVault2017-10-15
| |\ | | | | | | Fix include path to input-event-codes.h for FreeBSD.
| | * Fix include path to input-event-codes.h for FreeBSD.Libravatar Johannes Lundberg2017-10-15
| |/
| * Merge pull request #1401 from ↵Libravatar Drew DeVault2017-10-14
| |\ | | | | | | | | | | | | sideshowdave7/config/add_scale_to_merge_output_config Fixes to changing scale factor with output command
| | * Add scale to merge_output_configLibravatar David Hurst2017-10-14
| |/
| * Merge pull request #1398 from johalun/freebsd-fixLibravatar Drew DeVault2017-10-14
| |\ | | | | | | Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration.
| | * Merge branch 'master' into freebsd-fixLibravatar Drew DeVault2017-10-14
| | |\
| | * | Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration.Libravatar Johannes Lundberg2017-10-14
| | | |
| * | | Merge pull request #1400 from madblobfish/manpagesLibravatar Drew DeVault2017-10-14
| |\ \ \ | | |_|/ | |/| | Various manpage edits
| | * | Various manpage editsLibravatar madblobfish2017-10-14
| | |/ | | | | | | | | | Fix some spelling mistakes, missing punctuation and made some paragraphs more clear.
| * | Merge pull request #1397 from johalun/manpagesLibravatar Drew DeVault2017-10-14
| |\ \ | | |/ | |/| Change install folder for man pages
| | * Change install folder for man pagesLibravatar Johannes Lundberg2017-10-14
| |/
| * Merge pull request #1395 from Zer0-One/masterLibravatar Drew DeVault2017-10-13
| |\ | | | | | | Update man 5 page
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-25 13:55:01 +0000