Skip to content
This repository was archived by the owner on Oct 10, 2018. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kippt/jekyll-incorporated
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ChatSecure/chatsecure.github.io
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
Loading
Showing with 17,653 additions and 346 deletions.
  1. +3 −0 .gitignore
  2. +20 −0 .jshintrc
  3. +1 −0 CNAME
  4. +4 −7 Gemfile
  5. +252 −0 Gemfile.lock
  6. +102 −0 Gruntfile.js
  7. +0 −35 Rakefile
  8. +44 −73 _config.yml
  9. +104 −0 _includes/_bottom_frontpage.html
  10. +18 −0 _includes/_cover.html
  11. +22 −0 _includes/_footer.html
  12. +30 −0 _includes/_head.html
  13. +19 −0 _includes/_navigation.html
  14. +2 −2 _includes/_scripts.html
  15. +33 −0 _includes/frontpage/head.html
  16. +11 −0 _includes/frontpage/social_buttons.html
  17. +3 −63 _layouts/base.html
  18. +24 −0 _layouts/info.html
  19. +3 −1 _layouts/post.html
  20. +0 −1 _plugins/_ext.rb
  21. +14 −0 _posts/2012-05-08-firstpost.md
  22. +30 −0 _posts/2012-06-07-version-12-approved.md
  23. +18 −0 _posts/2012-07-10-we-have-a-mailing-list.md
  24. +21 −0 _posts/2012-07-31-chatsecure-v13-progress.md
  25. +26 −0 _posts/2012-08-10-v13-status-update.md
  26. +24 −0 _posts/2012-09-24-chatsecure-v13-released.md
  27. +21 −0 _posts/2012-11-05-chatsecure-v14-released.md
  28. +22 −0 _posts/2012-12-13-chatsecure-v15-released.md
  29. +0 −108 _posts/2013-10-08-incorporated.md
  30. +24 −0 _posts/2013-10-30-chatsecure-v21-released.md
  31. +24 −0 _posts/2013-11-11-chatsecure-v211-released.md
  32. +21 −0 _posts/2013-11-14-chatsecure-v212-released.md
  33. +14 −0 _posts/2013-12-12-new-servers.md
  34. +26 −0 _posts/2013-6-20-chatsecure-v20-released.md
  35. +37 −0 _posts/2014-1-22-chatsecure-v22-released.md
  36. +16 −0 _posts/2014-1-9-website-redesign.md
  37. +24 −0 _posts/2014-2-22-importance-of-ssl-pinning.md
  38. +135 −0 _posts/2014-4-8-fixing-the-xmpp-push-problem.md
  39. +55 −0 _posts/2015-1-5-chatsecure-ios-v3-released.md
  40. +142 −0 _posts/2015-10-02-chatsecure-conversations-zom.md
  41. +98 −0 _posts/2015-12-08-using-ed25519-public-keys-as-identifiers.md
  42. +52 −0 _posts/2015-6-26-chatsecure-security-audit.md
  43. +64 −0 _posts/2015-8-11-chatsecure-core.md
  44. +49 −0 _posts/2016-04-14-chatsecure-v32-push.md
  45. +33 −0 _posts/2016-07-25-chatsecure-v323-xmpp-push.md
  46. +18 −0 _posts/2016-12-16-chatsecure-android-deprecated.md
  47. +36 −0 _posts/2017-01-17-chatsecure-v4-released.md
  48. +43 −0 _posts/2017-05-23-sustainable-open-source-starts-with-you.md
  49. +52 −0 _posts/2017-06-30-chatsecure-v41-media-messaging.md
  50. +36 −0 _posts/2017-10-24-chatsecure-v42-group-chat.md
  51. +42 −0 _posts/2018-04-09-chatsecure-v43-omemo-group-chat-preview.md
  52. +38 −0 _posts/2018-12-11-chatsecure-v436.md
  53. +33 −0 about.md
  54. +11 −0 apple-app-site-association
  55. +6,203 −0 assets/css/frontpage/bootstrap.css
  56. +5 −0 assets/css/frontpage/bootstrap.min.css
  57. +174 −0 assets/css/frontpage/landing-page.css
  58. +2,323 −0 assets/css/main.min.css
  59. +1,338 −0 assets/font-awesome/css/font-awesome.css
  60. +4 −0 assets/font-awesome/css/font-awesome.min.css
  61. BIN assets/font-awesome/fonts/FontAwesome.otf
  62. BIN assets/font-awesome/fonts/fontawesome-webfont.eot
  63. +414 −0 assets/font-awesome/fonts/fontawesome-webfont.svg
  64. BIN assets/font-awesome/fonts/fontawesome-webfont.ttf
  65. BIN assets/font-awesome/fonts/fontawesome-webfont.woff
  66. +16 −0 assets/font-awesome/less/bordered-pulled.less
  67. +12 −0 assets/font-awesome/less/core.less
  68. +6 −0 assets/font-awesome/less/fixed-width.less
  69. +17 −0 assets/font-awesome/less/font-awesome.less
  70. +412 −0 assets/font-awesome/less/icons.less
  71. +13 −0 assets/font-awesome/less/larger.less
  72. +19 −0 assets/font-awesome/less/list.less
  73. +20 −0 assets/font-awesome/less/mixins.less
  74. +14 −0 assets/font-awesome/less/path.less
  75. +9 −0 assets/font-awesome/less/rotated-flipped.less
  76. +30 −0 assets/font-awesome/less/spinning.less
  77. +20 −0 assets/font-awesome/less/stacked.less
  78. +381 −0 assets/font-awesome/less/variables.less
  79. +16 −0 assets/font-awesome/scss/_bordered-pulled.scss
  80. +12 −0 assets/font-awesome/scss/_core.scss
  81. +6 −0 assets/font-awesome/scss/_fixed-width.scss
  82. +412 −0 assets/font-awesome/scss/_icons.scss
  83. +13 −0 assets/font-awesome/scss/_larger.scss
  84. +19 −0 assets/font-awesome/scss/_list.scss
  85. +20 −0 assets/font-awesome/scss/_mixins.scss
  86. +14 −0 assets/font-awesome/scss/_path.scss
  87. +9 −0 assets/font-awesome/scss/_rotated-flipped.scss
  88. +30 −0 assets/font-awesome/scss/_spinning.scss
  89. +20 −0 assets/font-awesome/scss/_stacked.scss
  90. +381 −0 assets/font-awesome/scss/_variables.scss
  91. +17 −0 assets/font-awesome/scss/font-awesome.scss
  92. 0 _assets/javascripts/main.js → assets/js/_main.js
  93. +2,114 −0 assets/js/bootstrap.js
  94. +6 −0 assets/js/bootstrap.min.js
  95. +4 −0 assets/js/jquery-1.11.0.js
  96. +1 −0 assets/js/scripts.min.js
  97. +44 −0 assets/pubkeys/50F7D255.asc
  98. +233 −0 assets/pubkeys/69B37AA9.asc
  99. 0 {_assets/stylesheets → assets/scss}/_animate.scss
  100. 0 {_assets/stylesheets → assets/scss}/_article.scss
  101. 0 {_assets/stylesheets → assets/scss}/_base.scss
  102. +1 −1 {_assets/stylesheets → assets/scss}/_bootstrap.scss
  103. +0 −1 {_assets/stylesheets → assets/scss}/_icons.scss
  104. 0 {_assets/stylesheets → assets/scss}/_nav.scss
  105. 0 {_assets/stylesheets → assets/scss}/_responsive.scss
  106. 0 {_assets/stylesheets → assets/scss}/_syntax.scss
  107. 0 {_assets/stylesheets → assets/scss}/main.scss
  108. +53 −0 blog/index.html
  109. +56 −0 code/speakkey_v01.py
  110. +29 −0 contribute.md
  111. +23 −0 developers.md
  112. +149 −0 drafts/2015-11-11-speakable-public-identities.md
  113. +11 −0 faq.md
  114. +56 −0 i/index.html
  115. BIN images/accounts.png
  116. +129 −0 images/appstore.svg
  117. BIN images/banner-bg.jpg
  118. BIN images/bitcoin_donate.png
  119. BIN images/blog-cover.jpg
  120. BIN images/business.jpg
  121. BIN images/california-coast.jpg
  122. BIN images/california-sunset.jpg
  123. BIN images/chat.png
  124. BIN images/chatsecure-banner.png
  125. BIN images/chatsecure-conversations-zom.png
  126. BIN images/chatsecure-conversations-zom.psd
  127. BIN images/contact-offline.png
  128. BIN images/contact-online.png
  129. BIN images/emojis.png
  130. BIN images/github-octocat.png
  131. BIN images/guardian_banner.png
  132. BIN images/incorporated.jpg
  133. BIN images/intro-bg.jpg
  134. BIN images/invite_qrcode_sample.jpg
  135. BIN images/knock-received.jpg
  136. BIN images/knock-sent.png
  137. BIN images/ks.png
  138. BIN images/logo.png
  139. BIN images/omemo-file-transfer.png
  140. BIN images/paypal_donate.png
  141. +126 −0 images/playstore.svg
  142. BIN images/roadmap.jpg
  143. BIN images/ssl_pinning.jpg
  144. BIN images/v4-profile.png
  145. +48 −54 index.html
  146. +26 −0 package.json
  147. +44 −0 privacy.md
  148. +9 −0 support.md
  149. +98 −0 terms.md
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
_site/
.DS_Store
.bundle/
node_modules/
deploy.sh
20 changes: 20 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"bitwise": true,
"browser": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
"es5": false,
"esnext": true,
"immed": true,
"jquery": true,
"latedef": true,
"newcap": true,
"noarg": true,
"node": true,
"strict": false,
"trailing": false,
"undef": true,
"multistr": true,
"expr": true
}
1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chatsecure.org
11 changes: 4 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
source 'https://rubygems.org'

gem 'jekyll'
gem 'jekyll-assets'
gem 'maruku'
gem 'rake'
gem 'sass'
gem 'uglifier'
gem 'github-pages'
gem 'github-pages', group: :jekyll_plugins
gem 'jekyll-paginate', group: :jekyll_plugins
gem 'kramdown', group: :jekyll_plugins
gem 'RedCloth', group: :jekyll_plugins
252 changes: 252 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
commonmarker (0.17.13)
ruby-enum (~> 0.5)
concurrent-ruby (1.1.3)
dnsruby (1.61.2)
addressable (~> 2.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.11.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
ffi (1.9.25)
forwardable-extended (2.6.0)
gemoji (3.0.0)
github-pages (193)
activesupport (= 4.2.10)
github-pages-health-check (= 1.8.1)
jekyll (= 3.7.4)
jekyll-avatar (= 0.6.0)
jekyll-coffeescript (= 1.1.1)
jekyll-commonmark-ghpages (= 0.1.5)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.11.0)
jekyll-gist (= 1.5.0)
jekyll-github-metadata (= 2.9.4)
jekyll-mentions (= 1.4.1)
jekyll-optional-front-matter (= 0.3.0)
jekyll-paginate (= 1.1.0)
jekyll-readme-index (= 0.2.0)
jekyll-redirect-from (= 0.14.0)
jekyll-relative-links (= 0.5.3)
jekyll-remote-theme (= 0.3.1)
jekyll-sass-converter (= 1.5.2)
jekyll-seo-tag (= 2.5.0)
jekyll-sitemap (= 1.2.0)
jekyll-swiss (= 0.4.0)
jekyll-theme-architect (= 0.1.1)
jekyll-theme-cayman (= 0.1.1)
jekyll-theme-dinky (= 0.1.1)
jekyll-theme-hacker (= 0.1.1)
jekyll-theme-leap-day (= 0.1.1)
jekyll-theme-merlot (= 0.1.1)
jekyll-theme-midnight (= 0.1.1)
jekyll-theme-minimal (= 0.1.1)
jekyll-theme-modernist (= 0.1.1)
jekyll-theme-primer (= 0.5.3)
jekyll-theme-slate (= 0.1.1)
jekyll-theme-tactile (= 0.1.1)
jekyll-theme-time-machine (= 0.1.1)
jekyll-titles-from-headings (= 0.5.1)
jemoji (= 0.10.1)
kramdown (= 1.17.0)
liquid (= 4.0.0)
listen (= 3.1.5)
mercenary (~> 0.3)
minima (= 2.5.0)
nokogiri (>= 1.8.2, < 2.0)
rouge (= 2.2.1)
terminal-table (~> 1.4)
github-pages-health-check (1.8.1)
addressable (~> 2.3)
dnsruby (~> 1.60)
octokit (~> 4.0)
public_suffix (~> 2.0)
typhoeus (~> 1.3)
html-pipeline (2.9.1)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.7.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-avatar (0.6.0)
jekyll (~> 3.0)
jekyll-coffeescript (1.1.1)
coffee-script (~> 2.2)
coffee-script-source (~> 1.11.1)
jekyll-commonmark (1.2.0)
commonmarker (~> 0.14)
jekyll (>= 3.0, < 4.0)
jekyll-commonmark-ghpages (0.1.5)
commonmarker (~> 0.17.6)
jekyll-commonmark (~> 1)
rouge (~> 2)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.11.0)
jekyll (~> 3.3)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-github-metadata (2.9.4)
jekyll (~> 3.1)
octokit (~> 4.0, != 4.4.0)
jekyll-mentions (1.4.1)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-optional-front-matter (0.3.0)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
jekyll-readme-index (0.2.0)
jekyll (~> 3.0)
jekyll-redirect-from (0.14.0)
jekyll (~> 3.3)
jekyll-relative-links (0.5.3)
jekyll (~> 3.3)
jekyll-remote-theme (0.3.1)
jekyll (~> 3.5)
rubyzip (>= 1.2.1, < 3.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.5.0)
jekyll (~> 3.3)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
jekyll-swiss (0.4.0)
jekyll-theme-architect (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-cayman (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-dinky (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-hacker (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-leap-day (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-merlot (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-midnight (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-minimal (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-modernist (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-primer (0.5.3)
jekyll (~> 3.5)
jekyll-github-metadata (~> 2.9)
jekyll-seo-tag (~> 2.0)
jekyll-theme-slate (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-tactile (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-time-machine (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-titles-from-headings (0.5.1)
jekyll (~> 3.3)
jekyll-watch (2.1.2)
listen (~> 3.0)
jemoji (0.10.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
kramdown (1.17.0)
liquid (4.0.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
mini_portile2 (2.3.0)
minima (2.5.0)
jekyll (~> 3.5)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.11.3)
multipart-post (2.0.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
octokit (4.13.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (2.0.5)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (2.2.1)
ruby-enum (0.7.2)
i18n
ruby_dep (1.5.0)
rubyzip (1.2.2)
safe_yaml (1.0.4)
sass (3.7.2)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.4.0)

PLATFORMS
ruby

DEPENDENCIES
RedCloth
github-pages
jekyll-paginate
kramdown

BUNDLED WITH
1.17.2
Loading