Commit graph

2358 commits

Author SHA1 Message Date
Vivek Maskara
67dfa170d2 Merge pull request #666 from whym/tests
Espresso: match with resource names in settings screen
2017-05-24 19:31:23 +05:30
Yusuke Matsubara
28d73d2b96 Espresso: match with resource names in settings screen
Apparently this is more robust (especially for SDK version 25)
2017-05-21 21:38:35 +09:00
Josephine Lim
aeb66492d6 Merge pull request #664 from sandarumk/replace_upload_with_home
Replace upload with home
2017-05-21 12:33:04 +02:00
Josephine Lim
35bead1302 Merge pull request #663 from maskaravivek/guava
Adding support for Guava library
2017-05-21 12:31:29 +02:00
Dinu Kumarasiri
471403d7c3 Replace upload with home 2017-05-21 12:30:54 +02:00
maskara
43d841bdf3 Adding support for Guava library 2017-05-21 12:25:28 +02:00
Josephine Lim
e89369afc0 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-21 11:49:26 +02:00
translatewiki.net
1d2ba94c56 Localisation updates from https://translatewiki.net. 2017-05-21 09:52:06 +02:00
Nicolas Raoul
1e7f7974e3 Merge pull request #660 from domdomegg/bulktranslationfixes
Bulk translation fixes
2017-05-21 10:59:24 +09:00
Adam Jones
fdb0db9cb3 Fix ellipsis characters 2017-05-21 00:10:38 +01:00
Adam Jones
b872ba011d Fix github url 2017-05-21 00:09:53 +01:00
Adam Jones
b92d8e03e8 Fix spaces 2017-05-21 00:08:21 +01:00
Josephine Lim
920efcdbab Merge pull request #648 from whym/importorder
Change import order (coding style)
2017-05-20 19:25:17 +02:00
Josephine Lim
5653d2df75 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-20 19:14:39 +02:00
Vivek Maskara
0e71e817b6 Merge pull request #641 from sandarumk/fix_lint_issues
Fix lint issues
2017-05-20 19:11:07 +02:00
Josephine Lim
0a94c9c0ba Merge pull request #647 from dbrant/rotate1
Fix showing local image if fetching thumbnail fails.
2017-05-20 16:03:37 +02:00
Dmitry Brant
39e24b1863 Don't put local URI into thumbnail cache. 2017-05-20 15:32:41 +02:00
Josephine Lim
b3215b1e78 Merge pull request #645 from maskaravivek/overlayMenu
Add popup menu in nearby info dialog
2017-05-20 15:23:35 +02:00
Josephine Lim
e7bfd40cc4 Merge pull request #637 from dr0ptp4kt/harmonize-licenses-with-upload-wizard
Remove unused interface license message strings
2017-05-20 15:22:19 +02:00
Yusuke Matsubara
58c9e1d09e Change import order (coding style) 2017-05-20 20:51:57 +09:00
maskara
75f3fe4ed6 Fixed codacy issues 2017-05-20 13:43:47 +02:00
Dmitry Brant
5fc684fcc5 Fix showing local image if fetching thumbnail fails. 2017-05-20 13:41:23 +02:00
Dinu Kumarasiri
4a1c7300ee Merge remote-tracking branch 'origin/fix_lint_issues' into fix_lint_issues 2017-05-20 13:34:56 +02:00
Dinu Kumarasiri
1dbe1fe636 Fix codecy issues 2017-05-20 13:34:51 +02:00
maskara
4da88b41ea Added width and height to dimens file 2017-05-20 13:33:23 +02:00
maskara
4823486139 Add popup menu in nearby info dialog 2017-05-20 13:09:16 +02:00
Dinu Kumarasiri
9be1c65dd1 remove Gradle build update 2017-05-20 13:07:01 +02:00
Fotis Tsalampounis
7d5f5853e5 Updated target sdk version to 25
The camera crash bug does not seem to exist anymore. Another fix probably solved this issue too.
2017-05-20 14:05:02 +03:00
Josephine Lim
d07c0947a7 Merge pull request #643 from misaochan/master
Versioning and changelog for v2.4
2017-05-20 12:52:28 +02:00
Josephine Lim
47b452af52 Update changelog.md 2017-05-20 12:45:32 +02:00
Josephine Lim
bc09ee4bba Versioning for v2.4 2017-05-20 12:32:27 +02:00
Josephine Lim
7b4734d3ad Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-20 12:31:56 +02:00
Dinu Kumarasiri
7629e00f33 Fix merge conflicts 2017-05-20 12:28:39 +02:00
Adam Baso
05515ab80c Merge branch 'master' into harmonize-licenses-with-upload-wizard 2017-05-20 05:22:49 -05:00
Josephine Lim
a518ad0b44 Merge pull request #640 from ftsalamp/master
Removed getSupportActionBar command
2017-05-20 12:20:47 +02:00
Josephine Lim
a352104635 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-20 12:20:19 +02:00
Fotis Tsalampounis
b83248505f Removed getSupportActionBar command
The getSupportActionBar method caused a null pointer exception in deviced running Android SDK >21 but there is actually no need for it since the theme doesn't have an Action Bar.
2017-05-20 13:14:11 +03:00
Josephine Lim
a826ca4049 Merge pull request #639 from dbrant/rotate1
Fix display of media detail after screen rotation.
2017-05-20 12:01:32 +02:00
Dinu Kumarasiri
43a707dad5 Fix merge conflicts 2017-05-20 11:58:26 +02:00
Dinu Kumarasiri
83957bae06 [Lint] Remove class variables to local 2017-05-20 11:53:46 +02:00
Josephine Lim
75cbd0afae Merge pull request #638 from maskaravivek/shareBack
Fix back button issue in ShareActivity
2017-05-20 11:53:09 +02:00
Josephine Lim
1586ff1f96 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-20 11:51:28 +02:00
Dinu Kumarasiri
8f5be5a434 [Lint] Add content description to image views 2017-05-20 11:51:22 +02:00
Dmitry Brant
96f9526244 Fix display of media detail after screen rotation. 2017-05-20 11:49:15 +02:00
Dinu Kumarasiri
7ad1cf294f [Lint] Remove class variables to local 2017-05-20 11:37:04 +02:00
maskara
4cb6fb86f8 Fix back button issue in ShareActivity 2017-05-20 11:35:49 +02:00
Dinu Kumarasiri
6b51df51f8 [Lint] Add content description to image views 2017-05-20 11:19:21 +02:00
Vivek Maskara
95ecfbd3c2 Merge pull request #620 from tobias47n9e/master
Add nearby activity Espresso test
2017-05-20 10:59:21 +02:00
translatewiki.net
6a5629186b Localisation updates from https://translatewiki.net. 2017-05-20 10:51:38 +02:00
dr0ptp4kt
db4eb3a699 Remove unused interface license message strings
The app current displays licenses aligned with MediaWiki's
UploadWizard UploadWizard.config.php file for ownWork. Presently,
the aligned licenses are as follows.h

cc-by-sa-4.0
cc-by-sa-4.0
cc-by-sa-3.0
cc-by-4.0
cc-by-3.0
cc-zero

License messages other than these are removed with this patch.

This closes #243.
2017-05-20 01:58:51 -05:00