From 2434f207a55bb1bffdd016e501777c8d8879cfde Mon Sep 17 00:00:00 2001 From: Norman Stanke Date: Thu, 4 Jun 2015 17:17:29 +0200 Subject: [PATCH 1/3] Add OwnNote --- setup/owncloud.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup/owncloud.sh b/setup/owncloud.sh index f16d0024..7a318f6d 100755 --- a/setup/owncloud.sh +++ b/setup/owncloud.sh @@ -17,6 +17,7 @@ apt-get purge -qq -y owncloud* # Install ownCloud from source of this version: owncloud_ver=8.0.3 owncloud_hash=3192f3d783f81247eaf2914df63afdd593def4e5 +ownnote_ver=1.0 # Check if ownCloud dir exist, and check if version matches owncloud_ver (if either doesn't - install/upgrade) if [ ! -d /usr/local/lib/owncloud/ ] \ @@ -60,6 +61,11 @@ if [ ! -d /usr/local/lib/owncloud/ ] \ hide_output sudo -u www-data php /usr/local/lib/owncloud/occ upgrade fi +# Update OwnNote +if [ ! grep -q $ownnote_ver /usr/local/lib/owncloud/apps/ownnote/appinfo/info.xml ]; then + git_clone https://github.com/owncloud/contacts $ownnote_ver '' /usr/local/lib/owncloud/apps/ownnote +fi + # ### Configuring ownCloud # Setup ownCloud if the ownCloud database does not yet exist. Running setup when @@ -75,7 +81,7 @@ if [ ! -f $STORAGE_ROOT/owncloud/owncloud.db ]; then 'instanceid' => '$instanceid', - 'trusted_domains' => + 'trusted_domains' => array ( 0 => '$PRIMARY_HOSTNAME', ), From f21eab5843dc81ed6a6e0e2e735062f4d20b31ec Mon Sep 17 00:00:00 2001 From: Norman Stanke Date: Sat, 6 Jun 2015 15:18:20 +0200 Subject: [PATCH 2/3] fix typo --- management/templates/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/management/templates/index.html b/management/templates/index.html index 78e2365f..ec1fd01e 100644 --- a/management/templates/index.html +++ b/management/templates/index.html @@ -98,7 +98,7 @@
  • SSL Certificates
  • Backup Status
  • -
  • Advanced Pagess
    • +
  • Advanced Pages
  • Custom DNS
  • External DNS
  • Munin Monitoring
    • @@ -210,8 +210,8 @@ $(function() { $('#global_modal').on('shown.bs.modal', function (e) { // set focus to first input in the global modal's body var input = $('#global_modal .modal-body input'); - if (input.length > 0) $(input[0]).focus(); - }) + if (input.length > 0) $(input[0]).focus(); + }) $('#global_modal .btn-danger').click(function() { // Don't take action now. Wait for the modal to be totally hidden // so that we don't attempt to show another modal while this one @@ -226,7 +226,7 @@ $(function() { if (global_modal_state == null) global_modal_state = 1; // cancel if the user hit ESC or clicked outside of the modal if (global_modal_funcs && global_modal_funcs[global_modal_state]) global_modal_funcs[global_modal_state](); - }) + }) }) function show_modal_error(title, message, callback) { @@ -289,7 +289,7 @@ function ajax(options) { }; options.error = function(jqxhr) { hide_loading_indicator(); - if (!old_error) + if (!old_error) show_modal_error("Error", "Something went wrong, sorry.") else old_error(jqxhr.responseText, jqxhr); From b60b7fae0667b7a53633d69e3bacf5e626ebaa09 Mon Sep 17 00:00:00 2001 From: Norman Stanke Date: Sat, 6 Jun 2015 15:20:34 +0200 Subject: [PATCH 3/3] Revert "Add OwnNote" This reverts commit 2434f207a55bb1bffdd016e501777c8d8879cfde. --- setup/owncloud.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/setup/owncloud.sh b/setup/owncloud.sh index 7a318f6d..f16d0024 100755 --- a/setup/owncloud.sh +++ b/setup/owncloud.sh @@ -17,7 +17,6 @@ apt-get purge -qq -y owncloud* # Install ownCloud from source of this version: owncloud_ver=8.0.3 owncloud_hash=3192f3d783f81247eaf2914df63afdd593def4e5 -ownnote_ver=1.0 # Check if ownCloud dir exist, and check if version matches owncloud_ver (if either doesn't - install/upgrade) if [ ! -d /usr/local/lib/owncloud/ ] \ @@ -61,11 +60,6 @@ if [ ! -d /usr/local/lib/owncloud/ ] \ hide_output sudo -u www-data php /usr/local/lib/owncloud/occ upgrade fi -# Update OwnNote -if [ ! grep -q $ownnote_ver /usr/local/lib/owncloud/apps/ownnote/appinfo/info.xml ]; then - git_clone https://github.com/owncloud/contacts $ownnote_ver '' /usr/local/lib/owncloud/apps/ownnote -fi - # ### Configuring ownCloud # Setup ownCloud if the ownCloud database does not yet exist. Running setup when @@ -81,7 +75,7 @@ if [ ! -f $STORAGE_ROOT/owncloud/owncloud.db ]; then 'instanceid' => '$instanceid', - 'trusted_domains' => + 'trusted_domains' => array ( 0 => '$PRIMARY_HOSTNAME', ),