Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
33ee748
Add option to provide signed token to verify key ownership
zeripath Dec 18, 2020
527a22b
Merge remote-tracking branch 'origin/master' into gpg-key-token-signed
zeripath Mar 2, 2021
68b6228
Ensure verified keys can act for all active emails for the user
zeripath Mar 2, 2021
6c72b6a
Add code to mark keys as verified
zeripath Mar 2, 2021
0ece493
Slight UI adjustments
zeripath Mar 3, 2021
175c003
Slight UI adjustments 2
zeripath Mar 3, 2021
66f6e7d
Simplify signature verification slightly
zeripath Mar 3, 2021
3d145ec
fix postgres test
zeripath Mar 3, 2021
3105706
add api routes
zeripath Mar 3, 2021
c4529b8
prepare for merge
zeripath Mar 20, 2021
9818df0
Merge branch 'master' into gpg-key-token-signed
zeripath Mar 20, 2021
e3a2770
as per @6543
zeripath Mar 20, 2021
43b967c
Merge remote-tracking branch 'origin/master' into gpg-key-token-signed
zeripath Apr 5, 2021
f006ef7
Merge branch 'master' into gpg-key-token-signed
zeripath May 3, 2021
223c71e
Merge branch 'main' into gpg-key-token-signed
zeripath May 8, 2021
164daeb
prepare for update
zeripath Jun 6, 2021
068fef3
Merge remote-tracking branch 'origin/main' into gpg-key-token-signed
zeripath Jun 6, 2021
c4d94ef
pre-merge
zeripath Jun 14, 2021
de80f0a
Merge remote-tracking branch 'origin/main' into gpg-key-token-signed
zeripath Jun 14, 2021
47d9cad
prepare merge
zeripath Jun 14, 2021
830f345
Merge remote-tracking branch 'origin/main' into gpg-key-token-signed
zeripath Jun 14, 2021
cee8a8c
handle swapped primarykeys
zeripath Jun 15, 2021
34d2ac7
prepare to merge
zeripath Jun 17, 2021
a2b733b
Merge remote-tracking branch 'origin/main' into gpg-key-token-signed
zeripath Jun 17, 2021
eb69eff
prepare merge
zeripath Jun 24, 2021
f10251e
Merge remote-tracking branch 'origin/main' into gpg-key-token-signed
zeripath Jun 24, 2021
7609edd
pre-merge
zeripath Jun 25, 2021
5275103
Merge remote-tracking branch 'origin/main' into gpg-key-token-signed
zeripath Jun 25, 2021
bf7ef6c
Merge remote-tracking branch 'origin/main' into gpg-key-token-signed
zeripath Jun 26, 2021
4e5c668
Verify the no-reply address for verified keys
zeripath Jun 26, 2021
4aa4015
Merge branch 'main' into gpg-key-token-signed
6543 Jun 27, 2021
18df555
Only add email addresses that are activated to keys
zeripath Jun 27, 2021
020d5f7
fix committer shortcut properly
zeripath Jun 27, 2021
6e2a15a
Restructure gpg_keys.go
zeripath Jun 27, 2021
4af7d8c
Use common Verification Token code
zeripath Jun 27, 2021
4caba0d
Merge branch 'gpg-key-token-signed' of github.com:zeripath/gitea into…
zeripath Jun 27, 2021
3bb22c4
fix tests
zeripath Jun 27, 2021
26e401b
Merge branch 'main' into gpg-key-token-signed
6543 Jun 27, 2021
c728845
Update models/gpg_key_verify.go
6543 Jun 27, 2021
64801a0
Merge branch 'main' into gpg-key-token-signed
6543 Jun 27, 2021
452eca3
Merge branch 'master' into gpg-key-token-signed
6543 Jun 29, 2021
6446bb7
Merge branch 'main' into gpg-key-token-signed
6543 Jun 30, 2021
ce2a2d2
Update models/gpg_key_add.go
techknowlogick Jul 9, 2021
408ba96
Update models/gpg_key_commit_verification.go
techknowlogick Jul 9, 2021
caf4b6e
Merge commit 'bc6f060b8cd89685cc32980c4f03cba58850cab1' into merge-at…
zeripath Jul 13, 2021
e7bc4c9
Merge commit 'e0296b6a6de6450c474fdf7fe62635a05beb49ab' into merge-at…
zeripath Jul 13, 2021
4b4de16
Merge remote-tracking branch 'origin/main' into merge-attempts
zeripath Jul 13, 2021
49690df
Merge branch 'main' into gpg-key-token-signed
6543 Jul 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Slight UI adjustments 2
Signed-off-by: Andrew Thornton <[email protected]>
  • Loading branch information
zeripath committed Mar 3, 2021
commit 175c0037af9d22e5b45348f600ce7d4b650a43e0
4 changes: 2 additions & 2 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,9 @@ ssh_key_been_used = This SSH key has already been added to the server.
ssh_key_name_used = An SSH key with same name already exists on your account.
ssh_principal_been_used = This principal has already been added to the server.
gpg_key_id_used = A public GPG key with same ID already exists.
gpg_no_key_email_found = This GPG key is not usable with any email address associated with your account. It may still be added if you sign the provided token.
gpg_no_key_email_found = This GPG key does not match any activated email address associated with your account. It may still be added if you sign the provided token.
gpg_key_matched_identities = Matched Identities:
gpg_key_matched_identities_long=The embedded identities in this key match the following activated email addresses for this user and commits with matching these email addresses can be verified with this key.
gpg_key_matched_identities_long=The embedded identities in this key match the following activated email addresses for this user and commits matching these email addresses can be verified with this key.
gpg_key_verified=Verified Key
gpg_key_verified_long=Key has been verified with a token and can be used to verify commits matching any activated email addresses for this user in addition to any matched identities for this key.
gpg_key_verify=Verify
Expand Down