Commit graph

2375 commits

Author SHA1 Message Date
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
Yusuke Matsubara
3beeac2a4f Merge pull request #623 from tobias47n9e/feature/test-length-utils
Add some tests for the LengthUtils class
2017-05-20 10:29:25 +09:00
Josephine Lim
76b84c65bc Merge pull request #635 from dbrant/deleted
Don't show uploads that have been deleted.
2017-05-19 21:03:08 +02:00
Josephine Lim
dbf5f06b67 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-19 18:08:12 +02:00
Dmitry Brant
269cef559b Don't show uploads that have been deleted. 2017-05-19 17:59:26 +02:00
Josephine Lim
e34ef2b3f9 Merge pull request #634 from dbrant/master
Final touch-ups for improved image loading.
2017-05-19 17:49:41 +02:00
Dmitry Brant
ac22525c69 Merge remote-tracking branch 'upstream/master' 2017-05-19 17:38:24 +02:00
Dmitry Brant
38e7cad345 Final touch-ups to improved image loading. 2017-05-19 17:19:10 +02:00
Josephine Lim
f8f1f5e612 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-19 17:12:14 +02:00
Josephine Lim
9d4c3cd2d9 Merge pull request #633 from maskaravivek/mediaDetail
Fix issue where there was no way to back from MediaDetailFragment
2017-05-19 17:02:05 +02:00
maskara
97c76208bd Fix issue where there was no way to back from MediaDetailFragment 2017-05-19 17:01:26 +02:00
Josephine Lim
8155a0d3d6 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-19 16:51:44 +02:00
Josephine Lim
0540a586c2 Merge pull request #632 from dbrant/master
Further improve image loading, and remove a lot of unused code.
2017-05-19 16:34:22 +02:00
Dmitry Brant
7a4062a377 Merge remote-tracking branch 'upstream/master' 2017-05-19 16:27:08 +02:00
Dmitry Brant
9469bf29e4 Remove dependency on old image-loading library, and remote a lot of code. 2017-05-19 16:24:04 +02:00
Josephine Lim
02cbb8ec2c Merge pull request #630 from maskaravivek/stateloss
Fixes #614: Crash: Fragment State loss exception
2017-05-19 16:17:47 +02:00
Dmitry Brant
85b15cd1c1 Further improve image loading, and remove unused code. 2017-05-19 15:57:25 +02:00
maskara
5fc9f84e79 Fixes #614: Crash: Fragment State loss exception 2017-05-19 15:44:15 +02:00
Josephine Lim
7500c36cf9 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-19 15:39:58 +02:00
Josephine Lim
f6a7759317 Merge pull request #600 from whym/nearby-file
Read once and reuse the query file's content
2017-05-19 15:36:49 +02:00
Josephine Lim
6232e35816 Merge pull request #627 from dbrant/master
Clean up image loading code, and switch to using Fresco.
2017-05-19 15:20:33 +02:00
Dmitry Brant
a9d58d4757 Merge changes for switching to Fresco. 2017-05-19 15:16:53 +02:00
Dmitry Brant
a3f3ee7fdb Merge remote-tracking branch 'upstream/master' 2017-05-19 15:14:29 +02:00
Josephine Lim
2bc15c5d97 Merge pull request #626 from sandarumk/integrate_leak_canary
Integrate leak canary
2017-05-19 15:13:07 +02:00
Dmitry Brant
bb49fb9801 Clean up image loading code, and switch to using Fresco. 2017-05-19 15:08:29 +02:00
Dinu Kumarasiri
7d6c836e31 Leak Canary Integration 2017-05-19 15:06:15 +02:00
Dinu Kumarasiri
a81aa7fec0 Remove the unnecessary comment 2017-05-19 14:54:21 +02:00
Josephine Lim
e9b2f42242 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-05-19 12:18:38 +02:00
Tobias Schönberg
d5bba99faa Add some tests for the LengthUtils class
Currently the LengthUtils class has no tests. This commit
adds some basic tests for the distance computations.
2017-05-18 09:52:23 +02:00
Tobias Schönberg
2f713baeb9 Code style: Order of imports 2017-05-17 20:40:24 +02:00
Tobias Schönberg
0f75bb58f9 Add nearby activity Espresso test
Currently the nearby activity is not included in the Espresso
tests.
This commit adds one test that checks if the activity loads
and the headline is displayed.
2017-05-17 19:07:37 +02:00
Yusuke Matsubara
19eddb7d26 Merge pull request #619 from f4ww4z/replace-clear
Replace 'removeAll(c)' with 'clear()'
2017-05-17 20:28:37 +09:00
Yusuke Matsubara
f039ec37bc Merge pull request #596 from domdomegg/codestyle
Lint issues
2017-05-17 20:15:10 +09:00
Yusuke Matsubara
22f5f51082 Read once and reuse the query file's content 2017-05-17 17:08:31 +09:00