diff --git a/_articles/account/change-your-email.md b/_articles/account/change-your-email.md index ded10f27..c6596cc6 100644 --- a/_articles/account/change-your-email.md +++ b/_articles/account/change-your-email.md @@ -1,7 +1,7 @@ --- layout: article title: Change your email -categories: [Getting Started, Account Management] +categories: [account-management] featured: false popular: false tags: [account, email] diff --git a/_articles/account/change-your-master-password.md b/_articles/account/change-your-master-password.md index dcfb80ea..f7164492 100644 --- a/_articles/account/change-your-master-password.md +++ b/_articles/account/change-your-master-password.md @@ -1,7 +1,7 @@ --- layout: article title: Change your master password -categories: [Getting Started, Account Management] +categories: [getting-started, account-management] featured: false popular: false tags: [password, account] diff --git a/_articles/account/delete-your-account.md b/_articles/account/delete-your-account.md index ebd23359..0182f221 100644 --- a/_articles/account/delete-your-account.md +++ b/_articles/account/delete-your-account.md @@ -1,7 +1,7 @@ --- layout: article title: Delete your account -categories: [Account Management] +categories: [account-management] featured: false popular: false tags: [account, delete] diff --git a/_articles/account/export-your-data.md b/_articles/account/export-your-data.md index 259a49f3..4af8c69b 100644 --- a/_articles/account/export-your-data.md +++ b/_articles/account/export-your-data.md @@ -1,7 +1,7 @@ --- layout: article title: Export your vault data -categories: [Account Management] +categories: [account-management] featured: false popular: false tags: [export, accounts, csv] diff --git a/_articles/account/forgot-master-password.md b/_articles/account/forgot-master-password.md index f26da390..935bc68f 100644 --- a/_articles/account/forgot-master-password.md +++ b/_articles/account/forgot-master-password.md @@ -1,7 +1,7 @@ --- layout: article title: I forgot my master password -categories: [Account Management] +categories: [account-management] featured: true popular: false tags: [master password, account] diff --git a/_articles/account/lost-two-step-device.md b/_articles/account/lost-two-step-device.md index cace7f6b..1093cdb5 100644 --- a/_articles/account/lost-two-step-device.md +++ b/_articles/account/lost-two-step-device.md @@ -1,7 +1,7 @@ --- layout: article title: I lost my two-step login (2FA) device -categories: [Account Management] +categories: [account-management] featured: false popular: false tags: [two-step login, 2fa, two factor authentication, account] diff --git a/_articles/account/setup-two-step-login-authenticator.md b/_articles/account/setup-two-step-login-authenticator.md index d5279a3b..64d5dadb 100644 --- a/_articles/account/setup-two-step-login-authenticator.md +++ b/_articles/account/setup-two-step-login-authenticator.md @@ -1,7 +1,7 @@ --- layout: article title: Set up two-step login with an authenticator app -categories: [Account Management] +categories: [account-management] featured: false popular: false tags: [two-step login, 2fa, two factor authentication, account, google authenticator, authy, totp] diff --git a/_articles/account/setup-two-step-login-duo.md b/_articles/account/setup-two-step-login-duo.md index 56386d9b..e4133441 100644 --- a/_articles/account/setup-two-step-login-duo.md +++ b/_articles/account/setup-two-step-login-duo.md @@ -1,7 +1,7 @@ --- layout: article title: Set up two-step login with Duo Security -categories: [Account Management] +categories: [account-management] featured: false popular: false tags: [two-step login, 2fa, two factor authentication, account, duo, sms] diff --git a/_articles/account/setup-two-step-login-email.md b/_articles/account/setup-two-step-login-email.md index 0d890e59..773d4381 100644 --- a/_articles/account/setup-two-step-login-email.md +++ b/_articles/account/setup-two-step-login-email.md @@ -1,7 +1,7 @@ --- layout: article title: Set up two-step login with email -categories: [Account Management] +categories: [account-management] featured: false popular: false tags: [two-step login, 2fa, two factor authentication, account, email, totp] diff --git a/_articles/account/setup-two-step-login-u2f.md b/_articles/account/setup-two-step-login-u2f.md index 20ef3306..b25edeef 100644 --- a/_articles/account/setup-two-step-login-u2f.md +++ b/_articles/account/setup-two-step-login-u2f.md @@ -1,7 +1,7 @@ --- layout: article title: Set up two-step login with FIDO U2F -categories: [Account Management] +categories: [account-management] featured: false popular: false tags: [two-step login, 2fa, two factor authentication, account, u2f, fido] diff --git a/_articles/account/setup-two-step-login-yubikey.md b/_articles/account/setup-two-step-login-yubikey.md index ee48db24..c5d8cdde 100644 --- a/_articles/account/setup-two-step-login-yubikey.md +++ b/_articles/account/setup-two-step-login-yubikey.md @@ -1,7 +1,7 @@ --- layout: article title: Set up two-step login with YubiKey -categories: [Account Management] +categories: [account-management] featured: false popular: false tags: [two-step login, 2fa, two factor authentication, account, yubikey, yubi, yubico] diff --git a/_articles/account/setup-two-step-login.md b/_articles/account/setup-two-step-login.md index 645bbe8c..7ca87c3c 100644 --- a/_articles/account/setup-two-step-login.md +++ b/_articles/account/setup-two-step-login.md @@ -1,7 +1,7 @@ --- layout: article title: Set up two-step login (2FA) -categories: [Getting Started, Account Management] +categories: [getting-started, account-management] featured: false popular: true tags: [two-step login, 2fa, two factor authentication, account] diff --git a/_articles/account/update-encryption-key.md b/_articles/account/update-encryption-key.md index a5bb3fb2..dcfadfad 100644 --- a/_articles/account/update-encryption-key.md +++ b/_articles/account/update-encryption-key.md @@ -1,7 +1,7 @@ --- layout: article title: Updating an old encryption key -categories: [Account Management] +categories: [account-management] featured: false popular: false tags: [encryption key, account] diff --git a/_articles/directory-connector/azure-active-directory.md b/_articles/directory-connector/azure-active-directory.md index 6a38e7ba..fcedcee7 100644 --- a/_articles/directory-connector/azure-active-directory.md +++ b/_articles/directory-connector/azure-active-directory.md @@ -1,7 +1,7 @@ --- layout: article title: Configuring directory sync with Azure Active Directory -categories: [Organizations] +categories: [organizations] featured: true popular: false hidden: true diff --git a/_articles/directory-connector/directory-sync.md b/_articles/directory-connector/directory-sync.md index 9fd25a8e..931ea97d 100644 --- a/_articles/directory-connector/directory-sync.md +++ b/_articles/directory-connector/directory-sync.md @@ -1,7 +1,7 @@ --- layout: article title: Syncing users and groups with a directory -categories: [Organizations] +categories: [organizations] featured: true popular: false tags: [] diff --git a/_articles/directory-connector/gsuite-directory.md b/_articles/directory-connector/gsuite-directory.md index 3aa5fe28..ef0ff045 100644 --- a/_articles/directory-connector/gsuite-directory.md +++ b/_articles/directory-connector/gsuite-directory.md @@ -1,7 +1,7 @@ --- layout: article title: Configuring directory sync with G Suite (Google) -categories: [Organizations] +categories: [organizations] featured: true popular: false hidden: false diff --git a/_articles/directory-connector/ldap-directory.md b/_articles/directory-connector/ldap-directory.md index 97ebe614..5c74d66a 100644 --- a/_articles/directory-connector/ldap-directory.md +++ b/_articles/directory-connector/ldap-directory.md @@ -1,7 +1,7 @@ --- layout: article title: Configuring directory sync with Active Directory or other LDAP servers -categories: [Organizations] +categories: [organizations] featured: true popular: false tags: [] diff --git a/_articles/directory-connector/user-group-filters.md b/_articles/directory-connector/user-group-filters.md index a45d13a2..77dd68a7 100644 --- a/_articles/directory-connector/user-group-filters.md +++ b/_articles/directory-connector/user-group-filters.md @@ -1,7 +1,7 @@ --- layout: article title: Configuring user and group sync filters -categories: [Organizations] +categories: [organizations] featured: false popular: false hidden: false diff --git a/_articles/hosting/what-platforms-are-supported.md b/_articles/hosting/what-platforms-are-supported.md new file mode 100644 index 00000000..09c6114e --- /dev/null +++ b/_articles/hosting/what-platforms-are-supported.md @@ -0,0 +1,12 @@ +--- +layout: article +title: What platforms can I host on? +categories: [hosting] +featured: false +popular: false +tags: [platforms, hosting] +--- + +Bitwarden is a cross-platform application that is deployed using Docker Linux containers. This means that bitwarden can be hosted on Linux, macOS, and Windows machines. + +You can read more about Docker and container technologies at [https://www.docker.com/what-docker](https://www.docker.com/what-docker){:target="_blank"}. diff --git a/_articles/importing/import-data.md b/_articles/importing/import-data.md index d60ce449..c5700839 100644 --- a/_articles/importing/import-data.md +++ b/_articles/importing/import-data.md @@ -1,7 +1,7 @@ --- layout: article title: Import your data from another application -categories: [Getting Started] +categories: [getting-started] featured: true popular: true tags: [import] diff --git a/_articles/importing/import-from-1password.md b/_articles/importing/import-from-1password.md index 86de474e..c1fb69d0 100644 --- a/_articles/importing/import-from-1password.md +++ b/_articles/importing/import-from-1password.md @@ -1,7 +1,7 @@ --- layout: article title: Import your data from 1Password -categories: [Getting Started] +categories: [getting-started] featured: true popular: true tags: [import, 1password] diff --git a/_articles/importing/import-from-chrome.md b/_articles/importing/import-from-chrome.md index 1982ab5f..99b7eec3 100644 --- a/_articles/importing/import-from-chrome.md +++ b/_articles/importing/import-from-chrome.md @@ -1,7 +1,7 @@ --- layout: article title: Import your data from Google Chrome -categories: [Getting Started] +categories: [getting-started] featured: true popular: false tags: [import, chrome, opera, vivaldi] diff --git a/_articles/importing/import-from-lastpass.md b/_articles/importing/import-from-lastpass.md index 8f2a7d08..a1370041 100644 --- a/_articles/importing/import-from-lastpass.md +++ b/_articles/importing/import-from-lastpass.md @@ -1,7 +1,7 @@ --- layout: article title: Import your data from LastPass -categories: [Getting Started] +categories: [getting-started] featured: true popular: true tags: [import, lastpass] diff --git a/_articles/miscellaneous/auto-fill-android.md b/_articles/miscellaneous/auto-fill-android.md index 28f2a66b..1b7b49e0 100644 --- a/_articles/miscellaneous/auto-fill-android.md +++ b/_articles/miscellaneous/auto-fill-android.md @@ -1,7 +1,7 @@ --- layout: article title: Auto-fill logins on Android -categories: [Miscellaneous] +categories: [miscellaneous] featured: false popular: false tags: [android, autofill, auto-fill] diff --git a/_articles/miscellaneous/extension-wont-load-in-private-mode.md b/_articles/miscellaneous/extension-wont-load-in-private-mode.md index 0d57363f..db799967 100644 --- a/_articles/miscellaneous/extension-wont-load-in-private-mode.md +++ b/_articles/miscellaneous/extension-wont-load-in-private-mode.md @@ -1,7 +1,7 @@ --- layout: article title: Extension won't load in Firefox Private Browsing mode -categories: [Miscellaneous] +categories: [miscellaneous] featured: false popular: false tags: [firefox, extension, private mode, private browsing] diff --git a/_articles/miscellaneous/localization.md b/_articles/miscellaneous/localization.md index 0291acc4..b860f238 100644 --- a/_articles/miscellaneous/localization.md +++ b/_articles/miscellaneous/localization.md @@ -1,7 +1,7 @@ --- layout: article title: Help translate bitwarden to other languages -categories: [Miscellaneous] +categories: [miscellaneous] featured: false popular: false tags: [localize, l10n, translate, i18n, internationalization, language] diff --git a/_articles/organizations/collections.md b/_articles/organizations/collections.md index 69f731bd..18123e92 100644 --- a/_articles/organizations/collections.md +++ b/_articles/organizations/collections.md @@ -1,7 +1,7 @@ --- layout: article title: Collections -categories: [Organizations] +categories: [organizations] featured: true popular: false tags: [] diff --git a/_articles/organizations/groups.md b/_articles/organizations/groups.md index 4b8383e0..76918c8b 100644 --- a/_articles/organizations/groups.md +++ b/_articles/organizations/groups.md @@ -1,7 +1,7 @@ --- layout: article title: User groups -categories: [Organizations] +categories: [organizations] featured: true popular: false tags: [] diff --git a/_articles/organizations/managing-users.md b/_articles/organizations/managing-users.md index 4016f8fd..991836f1 100644 --- a/_articles/organizations/managing-users.md +++ b/_articles/organizations/managing-users.md @@ -1,7 +1,7 @@ --- layout: article title: Managing users for your organization -categories: [Organizations] +categories: [organizations] featured: true popular: false tags: [] diff --git a/_articles/organizations/what-is-an-organization.md b/_articles/organizations/what-is-an-organization.md index 1cba2ae1..73ef0fc9 100644 --- a/_articles/organizations/what-is-an-organization.md +++ b/_articles/organizations/what-is-an-organization.md @@ -1,7 +1,7 @@ --- layout: article title: What are organizations? -categories: [Organizations] +categories: [organizations] featured: true popular: false tags: [] diff --git a/_articles/security/can-bitwarden-see-my-passwords.md b/_articles/security/can-bitwarden-see-my-passwords.md index 9296479b..70a33402 100644 --- a/_articles/security/can-bitwarden-see-my-passwords.md +++ b/_articles/security/can-bitwarden-see-my-passwords.md @@ -1,7 +1,7 @@ --- layout: article title: Can the bitwarden team see my passwords? -categories: [Security] +categories: [security] featured: true popular: false tags: [] diff --git a/_articles/security/cloud-server-security.md b/_articles/security/cloud-server-security.md index d5894794..dd21b914 100644 --- a/_articles/security/cloud-server-security.md +++ b/_articles/security/cloud-server-security.md @@ -1,7 +1,7 @@ --- layout: article title: How do you keep the cloud servers secure? -categories: [Security] +categories: [security] featured: true popular: false tags: [cloud, azure] diff --git a/_articles/security/how-is-data-securely-transmitted-and-stored.md b/_articles/security/how-is-data-securely-transmitted-and-stored.md index 64e39e06..7a35221c 100644 --- a/_articles/security/how-is-data-securely-transmitted-and-stored.md +++ b/_articles/security/how-is-data-securely-transmitted-and-stored.md @@ -1,7 +1,7 @@ --- layout: article title: How is my data securely trasmitted and stored on bitwarden servers? -categories: [Security] +categories: [security] featured: true popular: false tags: [encryption] diff --git a/_articles/security/password-salt-hash.md b/_articles/security/password-salt-hash.md index 37ba4fb2..832c96b3 100644 --- a/_articles/security/password-salt-hash.md +++ b/_articles/security/password-salt-hash.md @@ -1,7 +1,7 @@ --- layout: article title: Does bitwarden use a salted hash for my password? -categories: [Security] +categories: [security] featured: true popular: false tags: [encryption, hash] diff --git a/_articles/security/what-encryption-is-used.md b/_articles/security/what-encryption-is-used.md index 5d94dc08..ef66b7d0 100644 --- a/_articles/security/what-encryption-is-used.md +++ b/_articles/security/what-encryption-is-used.md @@ -1,7 +1,7 @@ --- layout: article title: What encryption is being used? -categories: [Security] +categories: [security] featured: true popular: false tags: [encryption] diff --git a/_articles/security/what-happens-if-bitwarden-is-hacked.md b/_articles/security/what-happens-if-bitwarden-is-hacked.md index aa29a56f..e3c5d336 100644 --- a/_articles/security/what-happens-if-bitwarden-is-hacked.md +++ b/_articles/security/what-happens-if-bitwarden-is-hacked.md @@ -1,7 +1,7 @@ --- layout: article title: What happens if bitwarden gets hacked? -categories: [Security] +categories: [security] featured: true popular: false tags: [hacked] diff --git a/_articles/security/what-information-is-encrypted.md b/_articles/security/what-information-is-encrypted.md index 656f132b..5e608101 100644 --- a/_articles/security/what-information-is-encrypted.md +++ b/_articles/security/what-information-is-encrypted.md @@ -1,7 +1,7 @@ --- layout: article title: What information is encrypted? -categories: [Security] +categories: [security] featured: true popular: false tags: [] diff --git a/_articles/security/where-is-data-stored-cloud.md b/_articles/security/where-is-data-stored-cloud.md index 08fb20f4..64a7fbd7 100644 --- a/_articles/security/where-is-data-stored-cloud.md +++ b/_articles/security/where-is-data-stored-cloud.md @@ -1,7 +1,7 @@ --- layout: article title: Where is my data stored in the cloud? -categories: [Security] +categories: [security] featured: true popular: false tags: [cloud] diff --git a/_articles/security/where-is-data-stored-computer.md b/_articles/security/where-is-data-stored-computer.md index 740b24aa..1c87dde6 100644 --- a/_articles/security/where-is-data-stored-computer.md +++ b/_articles/security/where-is-data-stored-computer.md @@ -1,7 +1,7 @@ --- layout: article title: Where is my data stored on my computer/device? -categories: [Security] +categories: [security] featured: true popular: false tags: [] diff --git a/_articles/security/why-should-i-trust-bitwarden.md b/_articles/security/why-should-i-trust-bitwarden.md index 4baff21f..93840ce7 100644 --- a/_articles/security/why-should-i-trust-bitwarden.md +++ b/_articles/security/why-should-i-trust-bitwarden.md @@ -1,7 +1,7 @@ --- layout: article title: Why should I trust bitwarden with my passwords? -categories: [Security] +categories: [security] featured: true popular: true tags: [] diff --git a/_categories/hosting.md b/_categories/hosting.md new file mode 100644 index 00000000..0fa22cd4 --- /dev/null +++ b/_categories/hosting.md @@ -0,0 +1,5 @@ +--- +layout: category +title: On-premise Hosting +featured: true +--- diff --git a/_layouts/article.html b/_layouts/article.html index 3d0f547f..0201f373 100644 --- a/_layouts/article.html +++ b/_layouts/article.html @@ -1,6 +1,8 @@ --- layout: default --- +{% assign catIteration = 0 %} +{% assign catSize = page.categories | size %}

@@ -8,9 +10,13 @@ layout: default {{page.title}}

- {{ page.categories | size | pluralize: 'Category', 'Categories' }}: - {% for category in page.categories %} - {{category}}{% if forloop.last != true %}, {% endif %} + {{ catSize | pluralize: 'Category', 'Categories' }}: + {% for category in site.categories %} + {% assign catFilename = category.path | filename %} + {% if page.categories contains catFilename %} + {% assign catIteration = catIteration | plus: 1 %} + {{category.title}}{% if catIteration != catSize %}, {% endif %} + {% endif %} {% endfor %}
diff --git a/_layouts/category.html b/_layouts/category.html index 6270f300..0e6131ee 100644 --- a/_layouts/category.html +++ b/_layouts/category.html @@ -12,7 +12,8 @@ layout: default
    {% for article in sorted_articles %} - {% if article.categories contains page.title and article.hidden != true %} + {% assign pageFilename = page.path | filename %} + {% if article.categories contains pageFilename and article.hidden != true %}
  1. {{article.title}}
    2. {% endif %} {% endfor %} diff --git a/_plugins/filename.rb b/_plugins/filename.rb new file mode 100644 index 00000000..f21e3719 --- /dev/null +++ b/_plugins/filename.rb @@ -0,0 +1,9 @@ +module FileName + def filename(path) + extn = File.extname path + name = File.basename path, extn + "#{name}" + end +end + +Liquid::Template.register_filter(FileName) \ No newline at end of file diff --git a/index.html b/index.html index 6a31a3ba..8ed79e3d 100644 --- a/index.html +++ b/index.html @@ -36,7 +36,8 @@ title: Help Center
      {% for article in sorted_articles %} - {% if article.categories contains category.title and article.hidden != true %} + {% assign catFilename = category.path | filename %} + {% if article.categories contains catFilename and article.hidden != true %}
    • {{article.title}} diff --git a/search/index.html b/search/index.html index 761c0ee2..3b33510e 100644 --- a/search/index.html +++ b/search/index.html @@ -21,10 +21,9 @@ title: Search Results {% if article.hidden != true %} "{{article.url | slugify}}": { "title": "{{article.title | xml_escape}}", - "categories": "{{article.categories | join: ', ' | xml_escape}}", "tags": "{{article.tags | join: ', ' | xml_escape}}", "content": {{article.content | strip_html | strip_newlines | jsonify}}, - "url": "{{article.url | xml_escape}}" + "url": "{{article.url | xml_escape}}" } {% unless forloop.last %},{% endunless %} {% endif %} @@ -75,7 +74,6 @@ title: Search Results var idx = lunr(function () { this.field('id'); this.field('title', { boost: 20 }); - this.field('categories'); this.field('tags', { boost: 10 }); this.field('content'); }); @@ -84,7 +82,6 @@ title: Search Results idx.add({ 'id': key, 'title': window.store[key].title, - 'categories': window.store[key].categories, 'tags': window.store[key].tags, 'content': window.store[key].content });