Josephine Lim
ba8f7103c2
Merge pull request #115 from domdomegg/remove-sherlock
...
Remove sherlock
2016-06-06 19:55:15 +12:00
Adam Jones
99cbad747f
Migrate from ActionBarSherlock to AppCompat
...
Better future support, now that ActionBarSherlock is deprecated (https://github.com/JakeWharton/ActionBarSherlock ).
2016-06-06 08:50:22 +01:00
Josephine Lim
307dc7234b
Merge pull request #112 from domdomegg/master
...
Migrating to gradle
2016-06-06 19:43:52 +12:00
Adam Jones
e403a46d79
Update README.md
...
Add instructions to disable instant run
2016-06-06 08:29:13 +01:00
Adam Jones
a29cc3443c
Fix 4.0 licenses I broke with merge
2016-06-06 07:37:49 +01:00
Adam Jones
ba222e147d
Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master'
...
Conflicts:
commons/res/values-br/strings.xml
commons/res/values-ca/strings.xml
commons/res/values-cs/strings.xml
commons/res/values-cy/strings.xml
commons/res/values-da/strings.xml
commons/res/values-de/strings.xml
commons/res/values-el/strings.xml
commons/res/values-es/strings.xml
commons/res/values-fi/strings.xml
commons/res/values-fo/strings.xml
commons/res/values-fr/strings.xml
commons/res/values-gl/strings.xml
commons/res/values-id/strings.xml
commons/res/values-it/strings.xml
commons/res/values-ja/strings.xml
commons/res/values-ka/strings.xml
commons/res/values-km/strings.xml
commons/res/values-ko/strings.xml
commons/res/values-ky/strings.xml
commons/res/values-la/strings.xml
commons/res/values-lb/strings.xml
commons/res/values-mk/strings.xml
commons/res/values-ml/strings.xml
commons/res/values-ms/strings.xml
commons/res/values-mt/strings.xml
commons/res/values-nb/strings.xml
commons/res/values-ne/strings.xml
commons/res/values-nl/strings.xml
commons/res/values-oc/strings.xml
commons/res/values-or/strings.xml
commons/res/values-pa/strings.xml
commons/res/values-pl/strings.xml
commons/res/values-pt-rBR/strings.xml
commons/res/values-pt/strings.xml
commons/res/values-qq/strings.xml
commons/res/values-ro/strings.xml
commons/res/values-ru/strings.xml
commons/res/values-sk/strings.xml
commons/res/values-su/strings.xml
commons/res/values-sv/strings.xml
commons/res/values-te/strings.xml
commons/res/values-tr/strings.xml
commons/res/values-uk/strings.xml
commons/res/values-vi/strings.xml
commons/res/values-yi/strings.xml
commons/res/values-zh-rCN/strings.xml
commons/res/values-zh-rTW/strings.xml
commons/res/values-zh/strings.xml
commons/res/values/strings.xml
2016-06-06 07:29:27 +01:00
Nicolas Raoul
46ea00f9a3
Merge pull request #113 from domdomegg/fix-translations
...
Fix translations
2016-06-06 14:19:33 +09:00
Adam Jones
43fd09827c
Fix translations
...
Change from some using \u00A0 to represent space, no longer required. Also fixed some malformed translations which missed out the backslash so they were just messed up (see bug #42 )
2016-06-03 21:50:31 +01:00
Adam Jones
0451819e49
Update README.md for gradle
2016-06-03 10:12:35 +01:00
Adam Jones
a4bcfc93f8
Merge branch 'nicolas-raoul-master'
2016-06-03 09:46:42 +01:00
Adam Jones
177eb9c694
Merge branch 'master' of https://github.com/nicolas-raoul/apps-android-commons into nicolas-raoul-master
2016-06-03 09:46:20 +01:00
Nicolas Raoul
110ecde5a6
Merge pull request #111 from misaochan/master
...
Update changelog & version for release
2016-06-03 12:29:45 +09:00
misaochan
bd9807f8fc
More detailed changelog
2016-06-03 11:57:49 +12:00
misaochan
edf5eb4407
Update changelog
2016-06-03 11:03:25 +12:00
misaochan
275856c543
Versioning and tagging
2016-06-03 11:02:15 +12:00
Adam Jones
29059340ff
Merge branch 'master' of https://github.com/nicolas-raoul/apps-android-commons into nicolas-raoul-master
2016-06-02 20:30:31 +01:00
Adam Jones
41f26ec1f2
Remove gradle related files added before .gitignore was in place
2016-06-02 20:25:24 +01:00
Adam Jones
6afa1362c8
Update .gitignore
2016-06-02 20:21:55 +01:00
Adam Jones
9e63c5b013
Update gitignore for gradle
2016-06-02 20:19:39 +01:00
Adam Jones
2230921780
Gradle test
2016-06-02 16:18:12 +01:00
Nicolas Raoul
3130d3f6e3
Merge pull request #110 from misaochan/master
...
Null check for image URI in ShareActivity
2016-06-02 23:58:24 +09:00
Adam Jones
966e72f3ba
Merge pull request #1 from nicolas-raoul/master
...
Update
2016-06-02 15:21:50 +01:00
misaochan
62525fa346
Added null check for mediaUri
2016-06-02 21:20:20 +12:00
misaochan
7d6a5c2cc3
Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master'
2016-06-02 18:38:59 +12:00
Nicolas Raoul
bfc537b804
Merge pull request #105 from domdomegg/patch-1
...
Update README.md
2016-06-02 11:42:02 +09:00
Adam Jones
83acb95e18
Merged branch patch-1 into patch-1
2016-06-01 23:41:11 +01:00
Adam Jones
f39c4fd759
Update settings to reduce the number of steps needed to set up
...
Update AndroidManifest.xml to target version 23 (for DocumentsContract to work), which means we can elimnate step 13
Update pom.xml to use bytecode version 1.8, so we can eliminate step 12 and 14
Update README.md to reflect these changes
2016-06-01 23:40:42 +01:00
Adam Jones
95858407c7
Update settings to reduce the number of steps needed to set up
...
Update AndroidManifest.xml to target version 23 (for DocumentsContract to work), which means we can elimnate step 13
Update pom.xml to use bytecode version 1.8, so we can eliminate step 12 and 14
Update README.md to reflect these changes
2016-06-01 18:13:14 +01:00
misaochan
d073bf696d
Merge branch 'master' of https://github.com/misaochan/apps-android-commons
2016-06-01 16:13:19 +12:00
Nicolas Raoul
841b69ef0b
Merge pull request #108 from domdomegg/master
...
Remove text advising to skip categories
2016-06-01 11:46:22 +09:00
Nicolas Raoul
6ae48c08c8
Merge pull request #107 from domdomegg/patch-2
...
Fix crash on viewing unknown licenses + add viewing creative commons 4.0 licenses
2016-06-01 11:44:57 +09:00
Adam Jones
d95bab800c
Remove text advising to skip categories
2016-05-31 21:28:36 +01:00
Adam Jones
18e34af0ff
Update strings.xml
...
Add support for viewing photo's CC-BY-4.0 and CC-BY-SA-4.0 licenses.
2016-05-31 19:44:38 +01:00
Adam Jones
02c82a90c2
Update LicenseList.java
...
Fix crash upon opening unknown license
2016-05-31 19:42:02 +01:00
Adam Jones
57ff0420a9
Update README.md
...
Provide instructions on how to import project properly.
Much trial and error
Such google
Many stackoverflow
2016-05-31 19:04:24 +01:00
misaochan
8bbc53df11
Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master'
2016-05-28 02:26:46 +12:00
Josephine Lim
dd3923a4fd
Update README
2016-05-28 02:25:03 +12:00
Josephine Lim
49712ec1b2
Update README
2016-05-28 02:15:52 +12:00
misaochan
a79c4e9d1f
Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master'
2016-05-27 18:15:52 +12:00
Nicolas Raoul
0a54444120
Merge pull request #98 from domdomegg/patch-1
...
Add creative commons 4.0 licenses
2016-05-25 16:21:09 +09:00
Adam Jones
85cd6970ea
Update wikimedia_licenses.xml
...
Fix typo in url: by-sa -> by
2016-05-24 15:26:46 +01:00
Adam Jones
8131e9daef
Add creative commons 4.0 licenses
...
Specifically:
CC-BY-4.0: https://commons.wikimedia.org/wiki/Template:Cc-by-4.0
CC-BY-SA-4.0: https://commons.wikimedia.org/wiki/Template:Cc-by-sa-4.0
2016-05-24 15:12:45 +01:00
Nicolas Raoul
88f9b394bb
Fixed typo
2016-03-29 18:13:53 +09:00
Nicolas Raoul
d20daceb11
Merge pull request #83 from misaochan/master
...
Added QuadTree JAR
2016-03-09 13:20:33 +09:00
misaochan
3c1d3bcf55
Added QuadTree JAR
2016-03-09 17:17:39 +13:00
Nicolas Raoul
f21dba23cc
Fixed #69
2016-02-22 11:41:58 +09:00
Nicolas Raoul
e56f8b88dd
Merge pull request #71 from misaochan/master
...
Added Javadocs
2016-02-19 14:27:50 +09:00
misaochan
8c29b75e10
Last few docs
2016-02-19 18:20:15 +13:00
misaochan
43c6494e07
Docs for ShareActivity
2016-02-19 18:18:17 +13:00
misaochan
f4823c7dd2
Changelog and versioning
2016-02-19 17:43:13 +13:00
