Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pr_272 merge conflict #301

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8ccb4c3
initial folder structure
Keksmo Jul 29, 2024
a0089db
completed u2f
Keksmo Jul 29, 2024
0eff6a1
added OpenPGP as feature
Keksmo Jul 29, 2024
fc0629f
added putty, ssh, smime and totp as features
Keksmo Jul 29, 2024
5ec8187
added openvpn as feature
Keksmo Jul 30, 2024
772c599
added ECC, GPA, EID as features
Keksmo Jul 30, 2024
3f28f92
added screen lock, CA, desktop login and hard disk encryption as feature
Keksmo Jul 30, 2024
d91a663
finished NK Pro and its features
Keksmo Jul 30, 2024
29202e2
almost finished nk storage
Keksmo Jul 30, 2024
987c46c
completed storage
Keksmo Jul 31, 2024
494c83e
completed nitrokey start
Keksmo Jul 31, 2024
810e576
mostly finished nk3, still needs restructure of index and features + …
Keksmo Jul 31, 2024
3316457
updated github CI test
Keksmo Jul 31, 2024
4796212
mostly finished fido2
Keksmo Jul 31, 2024
c4d75a0
finished hsm
Keksmo Aug 2, 2024
f5484e2
put most features into their corresponding category
Keksmo Aug 5, 2024
8f8ec8f
finished most things, only minor fixes and redirects left to do
Keksmo Aug 7, 2024
3a9cbd8
fixed most CI errors
Keksmo Aug 7, 2024
0032289
fixed CI errors
Keksmo Aug 8, 2024
e198c86
fixed some build errors
Keksmo Aug 8, 2024
68a1e02
fixed last commit
Keksmo Aug 8, 2024
49a7bbe
probably fixed all build errors
Keksmo Aug 8, 2024
31d13f3
fixed change pin path
Keksmo Aug 8, 2024
c4b3271
fixed broken links
Keksmo Aug 8, 2024
f3af190
corrected last commit
Keksmo Aug 8, 2024
e089d9b
cleaned up openpgp card
Keksmo Aug 8, 2024
3356b44
fixed the features order and cleaned up Nitrokey 3
Keksmo Aug 8, 2024
5a49802
moved guides and features into index
Keksmo Aug 12, 2024
8e66525
fixed getting started order in nitrokey 3
Keksmo Aug 12, 2024
d8c5957
removed small feature folders
Keksmo Aug 12, 2024
370b2b9
added applicable for table and fixed toctrees
Keksmo Aug 13, 2024
1b096df
fixed errors
Keksmo Aug 13, 2024
232e0a9
added css for products table and redirects
Keksmo Aug 14, 2024
f21b92e
Merge branch 'Keksmo/master' into pr_272
alexgithublab Oct 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Syntax check
run: |
. venv/bin/activate
rstcheck --recursive --ignore-directives "tabs" fido2/ hsm/ nethsm/ nextbox/ nitrokey3/ nitropad/ nitropc/ nitrophone/ nitrowall/ pro/ software/ start/ storage/ u2f/
rstcheck --recursive --ignore-directives "tabs" nitrokeys/ nethsm/ nextbox/ nitropad/ nitropc/ nitrophone/ nitrowall/ software/
build-error-check:
name: Check build error
runs-on: ubuntu-latest
Expand Down
180 changes: 180 additions & 0 deletions _redirects/.htaccess

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions _static/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -718,3 +718,14 @@ article ul li {
#breadcrumbs a:last-child:after {
display: none;
}

.products-table td p {
text-align: center;
font-size: 1.25em !important;
margin: 0 !important;
}
.products-table td {
padding: 0 !important;
}


7 changes: 0 additions & 7 deletions fido2/2fa-nextcloud.rst

This file was deleted.

23 changes: 0 additions & 23 deletions fido2/index.rst

This file was deleted.

4 changes: 0 additions & 4 deletions fido2/linux/2fa-nextcloud.rst

This file was deleted.

1 change: 0 additions & 1 deletion fido2/linux/2fa-odoo.rst

This file was deleted.

1 change: 0 additions & 1 deletion fido2/linux/firmware-update.rst

This file was deleted.

26 changes: 0 additions & 26 deletions fido2/linux/index.rst

This file was deleted.

1 change: 0 additions & 1 deletion fido2/linux/reset.rst

This file was deleted.

4 changes: 0 additions & 4 deletions fido2/mac/2fa-nextcloud.rst

This file was deleted.

1 change: 0 additions & 1 deletion fido2/mac/2fa-odoo.rst

This file was deleted.

1 change: 0 additions & 1 deletion fido2/mac/firmware-update.rst

This file was deleted.

13 changes: 0 additions & 13 deletions fido2/mac/index.rst

This file was deleted.

1 change: 0 additions & 1 deletion fido2/mac/reset.rst

This file was deleted.

17 changes: 0 additions & 17 deletions fido2/shared/index-content2.rst.inc

This file was deleted.

4 changes: 0 additions & 4 deletions fido2/windows/2fa-nextcloud.rst

This file was deleted.

1 change: 0 additions & 1 deletion fido2/windows/2fa-odoo.rst

This file was deleted.

1 change: 0 additions & 1 deletion fido2/windows/firmware-update.rst

This file was deleted.

Binary file not shown.
13 changes: 0 additions & 13 deletions fido2/windows/index.rst

This file was deleted.

46 changes: 0 additions & 46 deletions hsm/ipsec.rst.inc

This file was deleted.

4 changes: 0 additions & 4 deletions hsm/linux/apache2-tls.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/linux/automatic-screen-lock.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/linux/certificate-authority.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/linux/gpa.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/linux/hard-disk-encryption.rst

This file was deleted.

4 changes: 0 additions & 4 deletions hsm/linux/import-keys-certs.rst

This file was deleted.

30 changes: 0 additions & 30 deletions hsm/linux/index.rst

This file was deleted.

4 changes: 0 additions & 4 deletions hsm/linux/ipsec.rst

This file was deleted.

5 changes: 0 additions & 5 deletions hsm/linux/n-of-m-schemes.rst

This file was deleted.

4 changes: 0 additions & 4 deletions hsm/linux/pkcs11-url.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/linux/smime-outlook.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/linux/smime-thunderbird.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/linux/smime.rst

This file was deleted.

4 changes: 0 additions & 4 deletions hsm/linux/stunnel.rst

This file was deleted.

4 changes: 0 additions & 4 deletions hsm/mac/apache2-tls.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/mac/certificate-authority.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/mac/gpa.rst

This file was deleted.

4 changes: 0 additions & 4 deletions hsm/mac/hard-disk-encryption.rst

This file was deleted.

4 changes: 0 additions & 4 deletions hsm/mac/import-keys-certs.rst

This file was deleted.

27 changes: 0 additions & 27 deletions hsm/mac/index.rst

This file was deleted.

4 changes: 0 additions & 4 deletions hsm/mac/pkcs11-url.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/mac/smime-outlook.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/mac/smime-thunderbird.rst

This file was deleted.

1 change: 0 additions & 1 deletion hsm/mac/smime.rst

This file was deleted.

Loading
Loading