Commit graph

907 commits

Author SHA1 Message Date
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
misaochan
a21a923243 Minor formatting changes 2016-02-19 17:22:19 +13:00
misaochan
0edbf2f356 Added docs for GPSExtractor 2016-02-19 17:08:36 +13:00
misaochan
a71c324af1 Added Javadocs for CategorizationFragment 2016-02-19 16:43:09 +13:00
misaochan
daf10e29a3 Documentation for Updater classes 2016-02-19 16:10:25 +13:00
Nicolas Raoul
f4b76fcf11 Implemented script to find resources syntax bugs 2016-02-18 16:16:23 +09:00
Nicolas Raoul
e978c53b3b Fixed more resource syntax 2016-02-18 13:38:07 +09:00
Nicolas Raoul
6d4a614c43 Merge pull request #67 from misaochan/master
Changelog etc
2016-02-17 11:18:43 +09:00
misaochan
83cb9c706e Changelog for v1.11 2016-02-17 14:21:57 +13:00
Josephine Lim
abc396e96c Merge pull request #11 from nicolas-raoul/master
Issue with merging
2016-02-17 14:14:08 +13:00
Nicolas Raoul
91f72d5035 Reversed debug tests committed by mistake 2016-02-16 17:21:37 +09:00