Commit Graph

454 Commits

Author SHA1 Message Date
Tom Limoncelli 07546c6205 Whitespace 2018-05-31 17:01:24 -04:00
Tom Limoncelli 17d1a1a98b Fix whitespace. 2018-04-30 13:50:00 -04:00
Tom Limoncelli 8f6bef8542 Merge pull request #248 from tullis/fix-removeadmin-suggested-command
Suggest committing changes to pubring.gpg when running blackbox_removeadmin
2018-04-11 07:56:11 -04:00
Ben Tullis 7cebec9450 Ensure that git commits the changes to pubring.gpg when running blackbox_removeadmin
This relates to https://github.com/StackExchange/blackbox/issues/247 where it has been observed that the blackbox_removeadmin script prompts the user to run an incorrect command after running blackbox_removeadmin. This commit simply adds pubring.gpg to the list of files to be committed.
2018-04-11 11:06:14 +01:00
jciskey 906ecd0f82 Fix typo (#246) 2018-03-12 06:45:32 -04:00
Tom Limoncelli 6efbd24c58 Improve installation instructions (#244)
* Clarify manual-install -> symlinks-install
2018-02-22 13:46:42 -05:00
Tom Limoncelli b9e456019b Add missing library: libffi-dev 2018-02-12 08:06:55 -05:00
Kwok-kuen Cheung 5162cb1cac Fix replacing-expired-keys link in README (#241) 2018-02-06 06:08:29 -05:00
Tom Limoncelli 6a04a6599f Merge pull request #239 from benhc123/patch-15
quick corrections
2018-01-07 13:58:21 -05:00
Ben Holden-Crowther cbfce0b9f0 quick corrections 2018-01-07 18:42:07 +00:00
Tom Limoncelli f94f2e339e Merge pull request #238 from benhc123/patch-14
Corrections on new section
2018-01-06 11:12:42 -05:00
Ben Holden-Crowther 34c132b713 Corrections on new section 2018-01-06 15:13:35 +00:00
Pim Snel 0c4cdace10 Fix problems when gpg2 is installed next to gpg (#237)
* implement fixes from https://stackoverflow.com/questions/44247308/blackbox-gpg-decrypt-fails-dont-know-ctb-00
* fix problems when working with gpg2 next to gpg. Add's readme section
* fix anchor
2018-01-05 08:05:57 -05:00
Mike Newswanger 5f6e91659e Merge pull request #231 from benhc123/patch-10
BlackBox vs Blackbox or blackbox
2018-01-02 10:03:53 -05:00
Mike Newswanger 001915dacb Merge pull request #232 from benhc123/patch-11
"BlackBox" vs "blackbox"
2018-01-02 10:03:30 -05:00
Mike Newswanger 7d8979ea1b Merge pull request #233 from benhc123/patch-12
BlackBox vs Blackbox
2018-01-02 10:03:07 -05:00
Mike Newswanger 8656b10d44 Merge pull request #236 from benhc123/patch-13
Update license year
2018-01-02 10:02:42 -05:00
Ben Holden-Crowther 058d765a07 Update license year 2017-12-31 16:17:44 +00:00
Ben Holden-Crowther 0028fa49fb BlackBox vs Blackbox 2017-12-15 21:49:48 +00:00
Ben Holden-Crowther b70a215c61 "BlackBox" vs "blackbox" 2017-12-15 21:48:26 +00:00
Ben Holden-Crowther 90c34b5e0c BlackBox vs Blackbox or blackbox
consistency
2017-12-15 21:46:47 +00:00
Tom Limoncelli 292eb07768 Merge pull request #230 from benhc123/patch-9
Spelling
2017-12-15 14:51:43 -05:00
Ben Holden-Crowther 3203a7aa10 Spelling 2017-12-15 12:35:20 +00:00
Ben Holden-Crowther 242c34955e Spelling (#229) 2017-12-14 21:08:44 -05:00
Ben Holden-Crowther 8e0e96be5e Doc: fix typos (#228)
And another one :)
2017-12-14 17:31:34 -05:00
Ben Holden-Crowther eb4ad38548 Misspelling (#227) 2017-12-14 17:30:16 -05:00
Ben Holden-Crowther 7f085fc32c Spelling (#226) 2017-12-14 06:01:19 -05:00
Ben Holden-Crowther 0f0d813392 docs: Fix spacing (#225)
tiny spacing correction
2017-12-12 14:38:35 -05:00
Tom Limoncelli 174b0d5ba5 Improve README.md formatting
Improve formatting
2017-12-10 07:28:48 -05:00
Ben Holden-Crowther 6a9bc745f1 Improve formatting
link
2017-12-10 12:15:36 +00:00
Tom Limoncelli 89566f7dd2 Merge pull request #223 from jinnko/master
Exclude our default keyring from import
2017-11-11 08:47:21 -08:00
Jinn Koriech 3fda14fd23 Exclude our default keyring from import
By default GPG will continue to perform actions against our default keyring.

During the keychain import stage this results in the export of both the
keyring for the repository we're working on, plus our own default keyring.
The import phase then continues to import all these exported keys, which
include the entries from our default keyring, for which all those entries
already exist.  If you have a lot of keys in your default keyring this takes a
long time, and can be noisy due to validation, yet offers absolutely no value.

To avoid all this overhead we only need to pass the `--no-default-keyring`
option to GPG during this export phase.  The result will still be what we're
expecting - i.e. that all entries from the repository pubring are imported
into our default keyring.
2017-11-11 09:34:59 +00:00
Tom Limoncelli 9ff5892ddf .gitattributes not created in some situations
Replaces https://github.com/StackExchange/blackbox/pull/146
2017-11-07 10:57:08 -05:00
Jon Bardin 043b66dc50 Fixes issue were .gitignore is not included in the commit when you register new file (#206)
* this should fix the .gitignore not be including in the commit when registering a new file
2017-11-07 07:52:34 -08:00
Tom Limoncelli 972abfc03f CI 2017-09-18 17:31:02 -04:00
Aymeric Beaumet 60e782a09e Store keys in .blackbox directory (#218) 2017-09-17 18:13:36 -04:00
Tom Limoncelli 103106e08f "make clean" should be idempotent. 2017-09-17 17:39:14 -04:00
Tom Limoncelli ca99a1ebb4 Revert redundant circleci badge 2017-09-16 11:07:51 -04:00
Tom Limoncelli 318e21b4c8 Add CircleCI badge 2017-09-16 10:54:11 -04:00
Tom Limoncelli 57b5f59ca7 Fixing circleci 2017-09-16 10:40:12 -04:00
Paul Romero 53cc02e419 Corrected English in README (#209)
Nonsensical English corrected
2017-09-15 12:00:30 -04:00
Aymeric Beaumet 3cbfb2ba8c Update readme with CircleCI link (#216) 2017-09-15 11:40:39 -04:00
Aymeric Beaumet 2e894ea86f Run the tests on a CI (#215)
* Add CircleCI and make tests pass on ubuntu:16.04
* Add badge to readme
* Add debian stable to CircleCI
* Fix pkill on CircleCI debian
2017-09-15 11:15:12 -04:00
James Gregory 0626efa7e8 Fixed Alpine compatibility (chmod) (#212) 2017-09-01 05:01:20 -07:00
Jessica Evans c60ca184f3 Made LICENSE link (#210) 2017-08-28 04:24:27 -07:00
Paul Romero 0ec0cd3762 Formatting improvements (#208)
Converted raw URLs to links
2017-08-24 04:23:09 -07:00
BHC 4528796279 Update license year (#205)
to 2017
2017-08-22 10:29:15 -07:00
Patrick Sanders b483f65c0b direct repobase message to stderr (#204) 2017-08-17 08:57:04 -07:00
Tom Limoncelli ced82815cf Improve tip about storing GPG keys 2017-08-08 09:56:23 -04:00
Tom Limoncelli a3032aec07 NEW: .gitattributes Set Unix-only files to eol=lf 2017-07-14 14:38:00 -04:00