Merge pull request #1540 from fossasia/development

chore: merge dev into master branch
fossasia · Jan 19, 2019 · 69f1cc5 · 69f1cc5
2 parents 88f7960 + 094b65b
commit 69f1cc5
Show file tree

Hide file tree

Showing 299 changed files with 189 additions and 45,833 deletions.
diff --git a/README.md b/README.md
@@ -41,8 +41,8 @@ Please join us on the following channels:
     <tr>
      <td><img src="/docs/images/view_about_us.png"></td>
      <td><img src="/docs/images/view_navigation_drawer.png"></td>
-     <td><img src="/docs/images/view_pin_layout.png"></td>
-     <td><img src="/docs/images/view_pin_detail_dialog.png"></td>
+     <td><img src="/docs/images/view_pin_layout_front.png"></td>
+     <td><img src="/docs/images/view_pin_layout_back.png"></td>
     </tr>
   </table>
   <table>

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "io.pslab"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 10
-        versionName "2.0.9"
+        versionCode 11
+        versionName "2.0.10"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -45,9 +45,6 @@
         </activity>
         <activity android:name=".activity.SettingsActivity" />
         <activity android:name=".activity.ShowLoggedData" />
-        <activity
-            android:name=".activity.PerformExperimentActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".activity.ControlActivity"
             android:configChanges="orientation|screenSize" />
@@ -78,7 +75,8 @@
         <activity android:name=".activity.DataLoggerActivity" />
         <activity
             android:name=".activity.BarometerActivity"
-            android:configChanges="keyboardHidden|screenSize|orientation" />
+            android:configChanges="keyboardHidden|screenSize|orientation"
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".activity.CompassActivity"
             android:screenOrientation="portrait" />

diff --git a/app/src/main/assets/DOC_HTML/apps/A_AC_AND_DC.html b/app/src/main/assets/DOC_HTML/apps/A_AC_AND_DC.html
diff --git a/app/src/main/assets/DOC_HTML/apps/A_AC_AND_DC.md b/app/src/main/assets/DOC_HTML/apps/A_AC_AND_DC.md
diff --git a/app/src/main/assets/DOC_HTML/apps/A_scope.md b/app/src/main/assets/DOC_HTML/apps/A_scope.md