Merge branch 'develop'

Conflicts: JekyllForAndroid/build.gradle JekyllForAndroid/src/main/AndroidManifest.xml JekyllForAndroid/src/main/java/gr/tsagi/jekyllforandroid/fragments/DraftsListFragment.java JekyllForAndroid/src/main/java/gr/tsagi/jekyllforandroid/fragments/PostsListFragment.java
tsangiotis · Aug 17, 2014 · 0e35a5d · 0e35a5d
2 parents 3336a04 + 306e136
commit 0e35a5d
Show file tree

Hide file tree

Showing 49 changed files with 1,896 additions and 1,406 deletions.
diff --git a/JekyllForAndroid/build.gradle b/JekyllForAndroid/build.gradle
@@ -37,8 +37,8 @@ android {
         applicationId 'gr.tsagi.jekyllforandroid'
         minSdkVersion 11
         targetSdkVersion 19
-        versionCode 111
-        versionName "1.4.2"
+        versionCode 112
+        versionName "1.5.0"
     }
 
     compileOptions {

diff --git a/JekyllForAndroid/src/main/AndroidManifest.xml b/JekyllForAndroid/src/main/AndroidManifest.xml
@@ -38,6 +38,12 @@
             </intent-filter>
         </activity>
         <activity android:name=".activities.SetPreferenceActivity" />
+
+        <provider
+            android:authorities="@string/content_authority"
+            android:name=".data.PostsProvider"
+            android:exported="false"
+            android:syncable="true" />
     </application>
 
 </manifest>