summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Remove "/etc/firejail/" from all include paths, now that profile_read will se...Libravatar Glenn Washburn2018-10-17
* Update profile manpage to detail added "include" functionality.Libravatar Glenn Washburn2018-10-17
* Allow include to search userdir then systemdir for "bare" profile file names.Libravatar Glenn Washburn2018-10-17
* Merge pull request #2158 from crass/profile_conditionalLibravatar crass2018-10-17
|\
| * Update documentation for profile conditionals.Libravatar Glenn Washburn2018-10-16
| * Add support for rudimentary conditionals in profiles, currently only the HAS_...Libravatar Glenn Washburn2018-10-16
* | firejail.config: clarify disable-mnt behaviourLibravatar Vincent432018-10-16
* | manpages: update disable-mnt descriptionLibravatar Vincent432018-10-16
|/
* Merge branch 'improve-profile-handling'Libravatar Glenn Washburn2018-10-15
|\
| * Update man pages and usage to reflect --profile enhancement.Libravatar Glenn Washburn2018-10-15
| * Allow specifying a profile "name" with the profile option (eg. --profile=fire...Libravatar Glenn Washburn2018-10-15
| * rename expand_home -> expand_macros to better reflect usage and remove unneed...Libravatar Glenn Washburn2018-10-15
|/
* tentative fix: automatically mount libdir in chroot - #2176Libravatar smitsohu2018-10-15
* Merge branch 'master' of http://github.com/netblue30/firejailLibravatar startx20172018-10-14
|\
| * Merge pull request #2192 from crass/fix-ld.so.preload-pathLibravatar startx20172018-10-14
| |\
| | * The path in ld.so.preload should point to RUN_FIREJAIL_LIB_DIR, as LIBDIR may...Libravatar Glenn Washburn2018-10-13
| * | Merge pull request #2193 from grimskies/join-exit-codeLibravatar startx20172018-10-14
| |\ \
| | * | Make --join return exit code of the invoked programLibravatar Paweł2018-10-14
| |/ /
* / / merge commits from crass and grimskiesLibravatar startx20172018-10-14
|/ /
* | Merge branch 'master' of https://github.com/netblue30/firejailLibravatar smitsohu2018-10-13
|\|
| * Update gnome-pie profile (#2191)Libravatar glitsj162018-10-13
| * bringing in the fix for always have helpers in sandbox (original pull rq from...Libravatar netblue302018-10-13
| * Merge branch 'master' of http://github.com/netblue30/firejailLibravatar netblue302018-10-13
| |\
| | * MergesLibravatar Tad2018-10-13
| | * Merge pull request #2182 from glitsj16/mencoder-take-2Libravatar SkewedZeppelin2018-10-13
| | |\
| | | * Redo mencoder as extending mplayer profileLibravatar glitsj162018-10-13
| | | * Create mencoder.profileLibravatar glitsj162018-10-13
| | * | Merge pull request #2181 from glitsj16/gnome-pieLibravatar SkewedZeppelin2018-10-13
| | |\ \
| | | * | Drop gnome-pie from firecfgLibravatar glitsj162018-10-13
| | | * | Add gnome-pie to firecfgLibravatar glitsj162018-10-13
| | | * | Create gnome-pie.profileLibravatar glitsj162018-10-13
| | | |/
| | * | Merge pull request #2189 from backerman/backerman-bitwarden-patchLibravatar Fred Barclay2018-10-13
| | |\ \
| | | * | Add Bitwarden to blacklisted PW manager filesLibravatar Brad Ackerman2018-10-13
| * | | | private-lib fixLibravatar netblue302018-10-13
| |/ / /
| * | | Merge branch 'master' of http://github.com/netblue30/firejailLibravatar netblue302018-10-13
| |\| |
| | * | Merge pull request #2184 from glitsj16/disable-programsLibravatar Fred Barclay2018-10-13
| | |\ \
| | | * | Add artha & nitroshare to disable-programs.incLibravatar glitsj162018-10-13
| * | | | Revert "Fix issue #2148: Make sure firejail can find helper programs in sandb...Libravatar netblue302018-10-13
| |/ / /
| * | | Merge pull request #2185 from glitsj16/masterpdfeditorLibravatar Vincent432018-10-13
| |\ \ \
| | * | | Add masterpdfeditor to firecfgLibravatar glitsj162018-10-13
| | * | | update disable-programs.inc for masterpdfeditorLibravatar glitsj162018-10-13
| | * | | Create masterpdfeditor5.profileLibravatar glitsj162018-10-13
| | * | | Create masterpdfeditor4.profileLibravatar glitsj162018-10-13
| | * | | Create masterpdfeditor.profileLibravatar glitsj162018-10-13
| | |/ /
| * | | Merge pull request #2186 from crass/fix-2148-always-have-helpers-in-sandboxLibravatar netblue302018-10-13
| |\ \ \ | | |/ / | |/| |
| | * | Fix issue #2148: Make sure firejail can find helper programs in sandbox regar...Libravatar Glenn Washburn2018-10-13
| |/ /
| * | MergesLibravatar Tad2018-10-13
| * | Merge pull request #2183 from glitsj16/nitroshareLibravatar SkewedZeppelin2018-10-13
| |\ \
| | * | Fix extension for nitroshare-nmhLibravatar SkewedZeppelin2018-10-13
| | * | Add nitroshare to firecfgLibravatar glitsj162018-10-13