Merge branch 'master' of https://github.com/PrivateBin/PrivateBin

PrivateBin · Jul 1, 2018 · 4f17dde · 4f17dde
2 parents c1ab1dd + 17a468a
commit 4f17dde
Show file tree

Hide file tree

Showing 25 changed files with 497 additions and 416 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@
     * CHANGED: Shipped .htaccess files were updated for Apache 2.4 (#192)
     * CHANGED: Cleanup of bootstrap template variants and moved icons to `img` directory
     * CHANGED: Removed option to hide clone button on expiring pastes, since this requires reading the paste for rendering the template, which leaks information on the pastes state
-    * CHANGED: Upgrading libraries to: SJCL 1.0.7, jQuery 3.3.1, Base64 2.4.5, Showdown 1.8.6 & DOMpurify 1.0.5
+    * CHANGED: Upgrading libraries to: SJCL 1.0.7, jQuery 3.3.1, Base64 2.4.5, Showdown 1.8.6, DOMpurify 1.0.5 & Prettify 453bd5f
     * CHANGED: Refactored JavaScript code, making it modular with private and public functions, making it much easier to maintain (#178)
     * FIXED: To counteract regressions introduced by the refactoring, we finally introduced property based unit testing for the JavaScript code, this caught several regressions, but also some very old bugs not found so far (#32)
   * **1.1.1 (2017-10-06)**

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     },
     "require": {
         "php": "^5.4.0 || ^7.0",
-        "paragonie/random_compat": "2.0.4",
+        "paragonie/random_compat": "2.0.15",
         "yzalis/identicon": "1.1.0"
     },
     "require-dev": {

diff --git a/css/prettify/desert.css b/css/prettify/desert.css
diff --git a/css/prettify/doxy.css b/css/prettify/doxy.css
diff --git a/css/prettify/prettify.css b/css/prettify/prettify.css
diff --git a/css/prettify/sons-of-obsidian.css b/css/prettify/sons-of-obsidian.css
diff --git a/css/prettify/sunburst.css b/css/prettify/sunburst.css