Skip to content

Commit 69f1cc5

Browse files
authored
Merge pull request #1540 from fossasia/development
chore: merge dev into master branch
2 parents 88f7960 + 094b65b commit 69f1cc5

File tree

299 files changed

+189
-45833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+189
-45833
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Please join us on the following channels:
4141
<tr>
4242
<td><img src="/docs/images/view_about_us.png"></td>
4343
<td><img src="/docs/images/view_navigation_drawer.png"></td>
44-
<td><img src="/docs/images/view_pin_layout.png"></td>
45-
<td><img src="/docs/images/view_pin_detail_dialog.png"></td>
44+
<td><img src="/docs/images/view_pin_layout_front.png"></td>
45+
<td><img src="/docs/images/view_pin_layout_back.png"></td>
4646
</tr>
4747
</table>
4848
<table>

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "io.pslab"
99
minSdkVersion rootProject.ext.minSdkVersion
1010
targetSdkVersion rootProject.ext.targetSdkVersion
11-
versionCode 10
12-
versionName "2.0.9"
11+
versionCode 11
12+
versionName "2.0.10"
1313
multiDexEnabled true
1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1515
}

app/src/main/AndroidManifest.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
</activity>
4646
<activity android:name=".activity.SettingsActivity" />
4747
<activity android:name=".activity.ShowLoggedData" />
48-
<activity
49-
android:name=".activity.PerformExperimentActivity"
50-
android:configChanges="orientation|screenSize|keyboardHidden" />
5148
<activity
5249
android:name=".activity.ControlActivity"
5350
android:configChanges="orientation|screenSize" />
@@ -78,7 +75,8 @@
7875
<activity android:name=".activity.DataLoggerActivity" />
7976
<activity
8077
android:name=".activity.BarometerActivity"
81-
android:configChanges="keyboardHidden|screenSize|orientation" />
78+
android:configChanges="keyboardHidden|screenSize|orientation"
79+
android:screenOrientation="portrait"/>
8280
<activity
8381
android:name=".activity.CompassActivity"
8482
android:screenOrientation="portrait" />

app/src/main/assets/DOC_HTML/apps/A_AC_AND_DC.html

-229
This file was deleted.

app/src/main/assets/DOC_HTML/apps/A_AC_AND_DC.md

-43
This file was deleted.

app/src/main/assets/DOC_HTML/apps/A_scope.md

-19
This file was deleted.

0 commit comments

Comments
 (0)