Commit graph

1025 commits

Author SHA1 Message Date
Josephine Lim
c27c1efb09 Update README with new app name 2016-07-10 18:41:48 +12:00
Nicolas Raoul
943fcbc7ea Merge pull request #163 from misaochan/master
Versioning for release
2016-07-08 14:11:33 +09:00
Josephine Lim
3daf127052 Update changelog.md 2016-07-08 17:07:48 +12:00
misaochan
1720514db9 Versioning 2016-07-08 17:06:10 +12:00
Nicolas Raoul
8c22c78808 Merge pull request #159 from misaochan/security-exception
Add permission for google photos
2016-07-07 17:22:30 +09:00
Nicolas Raoul
ef9fdaa83a Merge pull request #162 from misaochan/media-detail-fragment
Always load image from Internet
2016-07-07 17:11:00 +09:00
misaochan
88c87fefea Always load image from Internet 2016-07-07 19:32:03 +12:00
Nicolas Raoul
f6e699fe42 Merge pull request #160 from misaochan/media-detail-fragment
PR for 'Desc/License/Cats empty'
2016-07-07 16:12:02 +09:00
misaochan
58ffe710c0 Replace runtime exception 2016-07-07 18:38:14 +12:00
misaochan
84d93392b0 Add comments 2016-07-07 18:35:04 +12:00
misaochan
916141287f Displays desc, categories and license, but desc and cats are wrong 2016-07-07 18:31:32 +12:00
misaochan
29e5ba3934 Add fixme 2016-07-07 18:28:33 +12:00
misaochan
185411e879 Add notes for debugging 2016-07-07 18:24:24 +12:00
misaochan
87df022431 Added notes for debugging 2016-07-07 18:04:56 +12:00
misaochan
2daf4d3db6 Merge branch 'media-detail-fragment' of https://github.com/misaochan/apps-android-commons into media-detail-fragment 2016-07-07 18:03:11 +12:00
misaochan
f845a9af70 Add comments 2016-07-07 18:03:00 +12:00
misaochan
2989b4a096 Classes at top, methods at bottom 2016-07-07 18:03:00 +12:00
misaochan
9da9dc5202 Put constructor at top of page 2016-07-07 18:03:00 +12:00
misaochan
acaedc4697 Add comments 2016-07-07 18:03:00 +12:00
misaochan
0549dbed56 Add permission for google photos 2016-07-07 02:21:24 +12:00
Nicolas Raoul
f5adb69c6f Merge pull request #158 from misaochan/ssl-exception
Fix SSL Excetption
2016-07-06 15:25:37 +09:00
misaochan
23e7e75a41 Add error logging 2016-07-06 18:05:13 +12:00
misaochan
d2347d00b1 Return empty list if SSLException (under IOException) 2016-07-06 17:49:19 +12:00
misaochan
b45695fdda Add comments 2016-07-05 19:11:11 +12:00
misaochan
433f39ae24 Classes at top, methods at bottom 2016-07-05 19:05:06 +12:00
misaochan
f9037e1360 Put constructor at top of page 2016-07-05 19:04:08 +12:00
misaochan
db4d1f5c8f Add comments 2016-07-05 19:03:50 +12:00
misaochan
e33601875b Comment out debug messages that spam logcat 2016-07-04 17:37:15 +12:00
Nicolas Raoul
d4dc94bdc7 Merge pull request #157 from misaochan/npe-media
Fix NullPointerException in Media.java
2016-07-04 14:24:56 +09:00
misaochan
05c1a83790 Add null check for categories in Media.java 2016-07-04 17:15:47 +12:00
misaochan
11f45a4fd8 Merge remote-tracking branch 'refs/remotes/origin/master' into npe-media 2016-07-04 17:05:42 +12:00
Nicolas Raoul
519cff9299 Merge pull request #156 from misaochan/master
Versioning and changelog for release
2016-07-04 13:47:50 +09:00
Josephine Lim
94eb9e7a48 Update changelog.md 2016-07-04 16:25:17 +12:00
misaochan
39e7b46fa3 Versioning 2016-07-04 16:16:04 +12:00
misaochan
269b5ec4e2 Found source of problem 2016-07-04 16:15:51 +12:00
Nicolas Raoul
4fe412823b Merge pull request #153 from misaochan/fix-illegal-argument
Fix illegal argument
2016-07-04 11:03:48 +09:00
misaochan
27d95276ca Check for IllegalArgumentException 2016-07-04 01:18:20 +12:00
misaochan
ce207edc72 Revert "Leftover files from merge"
This reverts commit abdab32949.
2016-07-04 01:04:09 +12:00
misaochan
abdab32949 Leftover files from merge 2016-07-03 14:07:21 +12:00
misaochan
b9353fcba8 Merge branch 'master' of https://github.com/misaochan/apps-android-commons 2016-07-03 13:44:12 +12:00
misaochan
9ef0240cdd Add descriptive comments 2016-07-03 13:43:51 +12:00
Nicolas Raoul
80ea9fccf8 Merge pull request #151 from whym/merge-dir-commons
Merge "commons" into the project root directory
2016-07-02 16:53:05 +09:00
Yusuke Matsubara
b4231bbfdc Merge "commons" into the project root directory 2016-07-02 16:48:57 +09:00
Nicolas Raoul
d42db0612e Merge pull request #150 from whym/minify2
Update Acra
2016-07-02 13:06:33 +09:00
Yusuke Matsubara
0194caa43d Update Acra
Forgot to commit in Pull request #149
2016-07-02 13:01:29 +09:00
Nicolas Raoul
2bead1e12e Merge pull request #149 from whym/minify
enable minify for release
2016-07-02 12:57:51 +09:00
Yusuke Matsubara
9da2a1f6b1 Tighter exceptions in proguard-rules.txt; Update Acra
Acra pre-4.7.0 had issues with Android API 23 when Proguard is enabled:

https://github.com/ACRA/acra/issues/301
2016-07-02 12:54:46 +09:00
Yusuke Matsubara
b08235cdd7 enable minify 2016-07-02 12:12:55 +09:00
misaochan
31f9b1e970 Merge branch 'refs/heads/contributions-activity' 2016-07-01 17:57:42 +12:00
Nicolas Raoul
845c0b1c11 Merge pull request #148 from misaochan/commons-application
Fix NullPointerException in CommonsApplication.java
2016-07-01 14:44:51 +09:00