Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of https://github.com/dlemieux/WiktionaryMobile-1

… into dale_merge

Conflicts:
	.classpath
	AndroidManifest.xml
	assets/www/android/platform.js
	assets/www/index.html
  • Loading branch information...
commit 10b32f72c76406d77d8cd006aad2835e6a499e4a 2 parents 5d28536 + c89715a
@pfhayes pfhayes authored
View
4 .classpath
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="lib" path="libs/phonegap-1.3.0.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
View
4 .gitignore
@@ -1,7 +1,4 @@
/*.properties
-bin/*
-gen/*
-
/.settings
/bin
/gen
@@ -18,4 +15,3 @@ lint.xml
*.perspective
*.perspectivev3
xcuserdata
-
View
5 AndroidManifest.xml
@@ -37,6 +37,11 @@
<action android:name="android.intent.action.SEARCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.SEND" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="text/*" />
+ </intent-filter>
<meta-data android:name="android.app.searchable" android:resource="@xml/searchable_wiki" />
</activity>
<provider android:name=".SearchSuggestionsProvider" android:authorities="org.wiktionary.searchsuggestions"></provider>
View
BIN  assets/www/image/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 assets/www/js/settings.js
@@ -15,14 +15,14 @@ window.appSettings = function() {
if(locales.length == 0) {
$.ajax({
- type:'GET',
- url:requestUrl,
+ type:'GET',
+ url:requestUrl,
dataType: 'json',
success:function(results) {
var allLocales = results.sitematrix;
$.each(allLocales, function(key, value) {
- // Because the JSON result from sitematrix is messed up
+ // Because the JSON result from the sitematrix is messed up
if(!isNaN(key)) {
if(value.site.some(function(site) { return site.code == "wiki"; })) {
locales.push({
View
9 project.properties
@@ -1,2 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
# Project target.
target=Google Inc.:Google APIs:10
View
BIN  res/drawable-hdpi/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-ldpi/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-xhdpi/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 10b32f7

Please sign in to comment.
Something went wrong with that request. Please try again.