Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Patrick Hayes pfhayes authored
4 .classpath
... ... @@ -1,9 +1,9 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <classpath>
3   - <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
4   - <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
5 3 <classpathentry kind="src" path="src"/>
6 4 <classpathentry kind="src" path="gen"/>
  5 + <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
  6 + <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
7 7 <classpathentry kind="lib" path="libs/phonegap-1.3.0.jar"/>
8 8 <classpathentry kind="output" path="bin/classes"/>
9 9 </classpath>
4 .gitignore
... ... @@ -1,7 +1,4 @@
1 1 /*.properties
2   -bin/*
3   -gen/*
4   -
5 2 /.settings
6 3 /bin
7 4 /gen
@@ -18,4 +15,3 @@ lint.xml
18 15 *.perspective
19 16 *.perspectivev3
20 17 xcuserdata
21   -
5 AndroidManifest.xml
@@ -37,6 +37,11 @@
37 37 <action android:name="android.intent.action.SEARCH" />
38 38 <category android:name="android.intent.category.DEFAULT" />
39 39 </intent-filter>
  40 + <intent-filter>
  41 + <action android:name="android.intent.action.SEND" />
  42 + <category android:name="android.intent.category.DEFAULT" />
  43 + <data android:mimeType="text/*" />
  44 + </intent-filter>
40 45 <meta-data android:name="android.app.searchable" android:resource="@xml/searchable_wiki" />
41 46 </activity>
42 47 <provider android:name=".SearchSuggestionsProvider" android:authorities="org.wiktionary.searchsuggestions"></provider>
BIN  assets/www/image/logo.png
6 assets/www/js/settings.js
@@ -15,14 +15,14 @@ window.appSettings = function() {
15 15
16 16 if(locales.length == 0) {
17 17 $.ajax({
18   - type:'GET',
19   - url:requestUrl,
  18 + type:'GET',
  19 + url:requestUrl,
20 20 dataType: 'json',
21 21 success:function(results) {
22 22 var allLocales = results.sitematrix;
23 23
24 24 $.each(allLocales, function(key, value) {
25   - // Because the JSON result from sitematrix is messed up
  25 + // Because the JSON result from the sitematrix is messed up
26 26 if(!isNaN(key)) {
27 27 if(value.site.some(function(site) { return site.code == "wiki"; })) {
28 28 locales.push({
9 project.properties
... ... @@ -1,2 +1,11 @@
  1 +# This file is automatically generated by Android Tools.
  2 +# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
  3 +#
  4 +# This file must be checked in Version Control Systems.
  5 +#
  6 +# To customize properties used by the Ant build system use,
  7 +# "ant.properties", and override values to adapt the script to your
  8 +# project structure.
  9 +
1 10 # Project target.
2 11 target=Google Inc.:Google APIs:10
BIN  res/drawable-hdpi/icon.png
BIN  res/drawable-ldpi/icon.png
BIN  res/drawable-mdpi/icon.png
BIN  res/drawable-xhdpi/icon.png

0 comments on commit 10b32f7

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