Merge branch 'master' into development

.gitignore

@@ -11,6 +11,7 @@ nbproject/
 vendor/
 
 obs-diffs/
+exports/*
 
 lib/plugins/ckgedit/fckeditor/userfiles/file
 lib/plugins/ckgedit/fckeditor/userfiles/flash

data/gitrepo/pages/contact.txt

@@ -5,8 +5,3 @@ The Door43 community uses Slack to communicate. When you [[:en:slack|join our sl
 You may also use this form:
 
 {{contact>subj=Door43 Contact}}
-
-----
-
-https://pad.door43.org/p/ta-tS_problem
-{{tag>epady}}

data/gitrepo/pages/home.txt

@@ -1,8 +1,8 @@
-
+Looking for a language that is not here yet? [[https://door43.org/obs-setup|Setup OBS]] for your language (it only takes a moment).
 
 **Choose your language:**
 
-  * [[:ab:home|аҧсуа бызшәа, аҧсшәа (ab)]]
+   * [[:ab:home|аҧсуа бызшәа, аҧсшәа (ab)]]
   * [[:abp:home|Abellen Ayta (abp)]]
   * [[:abs:home|Ambonese Malay (abs)]]
   * [[:adi:home|Adi (adi)]]
@@ -234,8 +234,3 @@
   * [[:zh-tw:home|繁體中文 (zh-tw)]]
   * [[:zmz:home|Mbandja (zmz)]]
   * [[:zu:home|isiZulu (zu)]]
-
-----
-
-Looking for a language that is not here yet? [[https://door43.org/obs-setup|Setup OBS]] for your language (it only takes a moment).
-

data/gitrepo/pages/profile_dorabatson2685.txt

@@ -0,0 +1 @@
+__false__

data/gitrepo/pages/profile_lakeishan44.txt

@@ -0,0 +1 @@
+__false__

data/gitrepo/pages/profile_linneamebane.txt

@@ -0,0 +1 @@
+__false__

data/gitrepo/pages/profile_manuelloughlin3.txt

@@ -0,0 +1 @@
+__false__

data/gitrepo/pages/profile_maybellvoigt141.txt

@@ -0,0 +1 @@
+__false__

data/gitrepo/pages/profile_salvador78f.txt

@@ -0,0 +1 @@
+__false__

data/gitrepo/pages/profile_tiffanicurley.txt

@@ -0,0 +1 @@
+__false__

data/gitrepo/pages/sidebar.txt

@@ -10,7 +10,14 @@ The Door43 community uses Slack to communicate. When you [[:en:slack|join our sl
 
 //Door43 is an open project that is managed by [[https://unfoldingword.org/|unfoldingWord]] and many volunteers.//
 
+==== Get Started ====
+
+Before you get started, you may need to [[:obs-setup|set up Open Bible Stories]] in your language. 
+
+To learn how to translate, check, publish, and use our tools, check out [[en:ta|translationAcademy]].
+
+If you have questions, you can post them on the Helpdesk channel in Slack (see above) or email help@door43.org. 
+
 ==== Recent Changes ====
 
 {{changes>ns = -playground&count=40 }}
-

lib/plugins/door43gitmerge/action.php

@@ -743,20 +743,24 @@ private function render_merge_interface_frame($frame, $data_array) {
         echo '<div class="frame-version-selection">';
         echo $this->getLang('version_to_compare') . ': ';
         echo '<select class="door43gitmerge-diff-switcher" data-frame="' . $frame . '">';
-        foreach ($user_array as $device=>$user) {
-            if (!isset($first_device)) {
-                $first_device = $device;
+        if(isset($user_array) && is_array($user_array)){
+            foreach ($user_array as $device=>$user) {
+                if (!isset($first_device)) {
+                    $first_device = $device;
+                }
+                echo '<option value="'.$device.'">'.$user['name'].'</option>';
             }
-            echo '<option value="'.$device.'">'.$user['name'].'</option>';
         }
         echo '<option value="all">' . $this->getLang('show_all') . '</option>';
         unset($device, $user);
         echo '</select>';
         echo '</div>';
         echo '<div class="frame-diffs">';
-        foreach ($user_array as $device => $user) {
-            $new_content = $this->_content($device, $frame);
-            $this->html_diff($frame, $device, $current_content, $new_content, $device==$first_device);
+        if(isset($user_array) && is_array($user_array)){
+            foreach ($user_array as $device => $user) {
+                $new_content = $this->_content($device, $frame);
+                $this->html_diff($frame, $device, $current_content, $new_content, $device==$first_device);
+            }
         }
         unset($device, $user, $new_content, $first_device);
         echo '</div>';
@@ -871,4 +875,4 @@ private function html_diff($frame, $device, $l_text = '', $r_text = '', $show =
     }
 }
 
-// vim:ts=4:sw=4:et:
+// vim:ts=4:sw=4:et: