Merge branch 'develop'

bacula-web · Jun 22, 2018 · 3b14189 · 3b14189
2 parents 65c7337 + c285582
commit 3b14189
Show file tree

Hide file tree

Showing 34 changed files with 24 additions and 1,359 deletions.
diff --git a/application/config/application.php b/application/config/application.php
@@ -1,6 +1,6 @@
 <?php
 
-$app = [ 'name' => 'Bacula-Web', 'version' => '8.0.0',
+$app = [ 'name' => 'Bacula-Web', 'version' => '8.0.1',
         'routes' => [   'home' => 'Dashboard', 
                         'test' => 'Test',
                         'jobs' => 'Jobs',

diff --git a/core/app/userauth.class.php b/core/app/userauth.class.php
@@ -33,7 +33,7 @@ public function __construct() {
        }
 
        // Check protected assets folder permissions$
-       $webUser = '';
+       $webUser = array();
        exec('whoami', $webUser);
        $webUser = reset($webUser);
 

diff --git a/docs/Changelog b/docs/Changelog
@@ -1,3 +1,14 @@
+=== Release 8.0.1 (June 22 2018)
+
+Changelog
+
+- Documentation
+	- Fix issue with ReadTheDocs theme conflict
+
+Fixed bugs
+
+- 0000248 [documentation] Documentation issue
+
 === Release 8.0.0 (June 1 2018)
 
 Changelog

diff --git a/docs/source/02_install/requirements.rst b/docs/source/02_install/requirements.rst
@@ -39,7 +39,7 @@ General requirements
 
 .. important::
 
-   PHP SQLite is required since verions 8.0.0-rc2
+   PHP SQLite is required since verison 8.0.0-rc2
 
    PHP Posix is required since version 8.0.0
 

diff --git a/docs/source/_static/bacula-web-logo.png b/docs/source/_static/bacula-web-logo.png
diff --git a/...heme/sphinx_rtd_theme/static/js/custom.js → docs/source/_static/js/custom.js b/...heme/sphinx_rtd_theme/static/js/custom.js → docs/source/_static/js/custom.js
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -159,5 +159,6 @@
      'Miscellaneous'),
 ]
 
-
+def setup(app):
+        app.add_javascript("js/custom.js")
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -7,6 +7,14 @@
 Bacula-Web documentation
 ========================
 
+.. image:: _static/bacula-web-logo.png
+  :scale: 100%
+  :align: center
+  :target: https://github.com/bacula-web/bacula-web
+  :alt: Bacula-Web logo
+
+**Version:** 8.0.1
+
 .. toctree::
    :maxdepth: 2
 

diff --git a/docs/theme/sphinx_rtd_theme/__init__.py b/docs/theme/sphinx_rtd_theme/__init__.py
diff --git a/docs/theme/sphinx_rtd_theme/breadcrumbs.html b/docs/theme/sphinx_rtd_theme/breadcrumbs.html
diff --git a/docs/theme/sphinx_rtd_theme/footer.html b/docs/theme/sphinx_rtd_theme/footer.html