mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
4173 commits 78 branches 116 tags 495 MiB
Commit graph

4173 commits

This branch
This branch
All branches
Author SHA1 Message Date
nemobis
2e9af3c33a Correct name is "Wikidata", not "wiki data" 
Reported at https://phabricator.wikimedia.org/T196439
 2018-06-14 00:17:21 +10:00
nemobis
135d885a0d Correct name is "Wikidata", not "wiki data" 
Reported at https://phabricator.wikimedia.org/T196439
 2018-06-13 10:12:46 +09:00
misaochan
a2b1f5bb4d Merge remote-tracking branch 'refs/remotes/commons-app/2.8-release' into 2.8-release-fork 2018-06-12 19:59:28 +10:00
Josephine Lim
da28d4f945 Versioning and changelog for v2.7.2 (#1610) 
* Versioning for v2.7.2

* Update changelog.md
 2018-06-12 19:57:34 +10:00
misaochan
887f152be8 Merge remote-tracking branch 'refs/remotes/origin/2.8-release' 2018-06-12 19:45:57 +10:00
misaochan
699d150fed Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release' 2018-06-12 19:43:21 +10:00
Sean Nemann
22a5178e04 Updated comments and method headers to clarify that the block status being checked within AuthenticatedActivity refers to the Wikimedia Commons block status of the user 2018-06-11 13:07:54 -04:00
Josephine Lim
7f6d6158c5 Modify allow_gps_summary string (#1608) 2018-06-11 19:20:28 +10:00
Tony Afula
7f02524522 Add comments to parameters for sorting featured images 2018-06-11 17:46:58 +09:00
Tony Afula
8d62103bd4 add parameters to sort featured images by order of recency 2018-06-11 17:46:58 +09:00
Josephine Lim
89defc5a33
Versioning and changelog for v2.7.2 (#1610) 
* Versioning for v2.7.2

* Update changelog.md
 2018-06-11 17:29:29 +10:00
Josephine Lim
1adb052705
Revert "Fix issue #1332 : Contribution Image auto/manual refresh if fetching fails" (#1609) 
* Revert "Modify allow_gps_summary string (#1608)"

This reverts commit 3b6c94c8d6.

* Revert "Fix issue #1332 : Contribution Image auto/manual refresh if fetching fails"

This reverts commit 5aba7459bd.
 2018-06-11 16:53:23 +10:00
misaochan
a772b97462 Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release' 2018-06-11 16:51:46 +10:00
Josephine Lim
3b6c94c8d6
Modify allow_gps_summary string (#1608) 2018-06-11 16:47:01 +10:00
neslihanturan
b3b45679bc
Merge pull request #1592 from misaochan/fix-failed-uploads 
Attempt to fix failed uploads
 2018-06-07 22:39:12 +03:00
tanvidadu
a934d24a2d Introducing a brief exp of Image License 2018-06-07 15:22:07 +05:30
misaochan
7e40f434af More explicit failure toast 2018-06-07 16:53:27 +10:00
misaochan
e7d3584b8d Add forceLogin to case where authentication fails during upload 2018-06-07 16:48:32 +10:00
misaochan
baab89c076 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2018-06-07 16:40:30 +10:00
translatewiki.net
3f47d39cdf Localisation updates from https://translatewiki.net. 2018-06-07 08:05:24 +02:00
misaochan
34fd6e52ec Merge remote-tracking branch 'refs/remotes/origin/master' into 2.8-release 2018-06-06 19:00:46 +10:00
misaochan
a458b8ad06 Merge branch 'master' of https://github.com/commons-app/apps-android-commons 2018-06-06 18:59:37 +10:00
misaochan
5c479b5624 Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release' 2018-06-06 18:59:29 +10:00
Vivek Maskara
b5a4b58b26
Merge pull request #1552 from misaochan/upload-overhaul-fork 
Refactor ShareActivity
 2018-06-05 22:08:17 +05:30
Yusuke Matsubara
862318c578 Bump max line length to 140 characters in Checkstyle rules (#1590) 
Fixes #465
 2018-06-05 19:33:51 +10:00
misaochan
a9ae072c73 Merge remote-tracking branch 'refs/remotes/commons-app/master' into upload-overhaul-fork 
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
 2018-06-05 18:28:41 +10:00
Vivek Maskara
32d45b2687
Merge pull request #1584 from commons-app/wikidataEdits 
Merge Wikidata edits branch to master
 2018-06-05 01:09:55 +05:30
maskara
ed5cc82fa2 Check for null entity ID 2018-06-05 00:28:49 +05:30
maskara
d1b33933cf Fix build failure 2018-06-05 00:03:56 +05:30
Sean Nemann
f9eed2027c Merge branch 'show-block-status' of https://github.com/seannemann21/apps-android-commons into show-block-status 2018-06-04 11:48:44 -04:00
Sean Nemann
4aac81d627 Added javadoc comments to showBlockStatus method 2018-06-04 11:48:09 -04:00
Sean Nemann
fcfae643c3 Updated isUserBlocked method to check the expiration time instead of just if an expiration time exists. Updated tests accordingly 2018-06-04 11:48:07 -04:00
Sean Nemann
01a3a233a9 Added comments to isUserBlocked method and tests for the method 2018-06-04 11:48:05 -04:00
Sean Nemann
39096cf30b Upon creating AuthenticatedActivity, now checking if the user is blocked via api call and notifying the user if they are blocked via snackbar 2018-06-04 11:48:02 -04:00
misaochan
3ccfcac130 Reinstate MultipleShareActivity intent 2018-06-04 19:52:14 +10:00
misaochan
90334edd32 Remove unnecessary class 2018-06-04 19:45:10 +10:00
misaochan
b4f2404045 Remove unnecessary vars 2018-06-04 19:41:44 +10:00
misaochan
c9ae7176c0 Optimize formatting and imports 2018-06-04 19:40:49 +10:00
misaochan
4e1bf80361 Fix comments 2018-06-04 19:30:18 +10:00
misaochan
147367d75f Get decimal coords to pass into startUpload() 2018-06-04 19:25:29 +10:00
misaochan
4db5dfb5d8 Merge remote-tracking branch 'refs/remotes/commons-app/master' into upload-overhaul-fork 2018-06-04 18:57:30 +10:00
Vivek Maskara
f7c57c03ba Log P18 edits with custom tag (#1583) 
* Log P18 edits by adding custom tag to the edits

* Add javadocs
 2018-06-04 17:50:50 +10:00
translatewiki.net
8cd8baf49c Localisation updates from https://translatewiki.net. 2018-06-04 07:53:59 +02:00
maskara
e46228205e Merge branch 'master' of https://github.com/commons-app/apps-android-commons into wikidataEdits 2018-06-03 12:52:16 +05:30
Vivek Maskara
46dcb8bd53
Merge pull request #1575 from whym/settingsactivitytest 
Add dependencies to com.android.support.test.rules and runner
 2018-06-01 21:35:15 +05:30
Yusuke Matsubara
c123767ae0 Add dependencies to com.android.support.test.rules and runner 
Needed for ActivityTestRule used in SettingsActivityTest
 2018-06-01 15:37:59 +09:00
maskara
edaa0dd05a Fix build 2018-06-01 01:15:28 +05:30
Sean Nemann
db30e03cf2 Added javadoc comments to showBlockStatus method 2018-05-31 13:37:55 -04:00
Sean Nemann
47bffa1b21 Updated isUserBlocked method to check the expiration time instead of just if an expiration time exists. Updated tests accordingly 2018-05-31 11:28:56 -04:00
Sean Nemann
39bf214c57 Added comments to isUserBlocked method and tests for the method 2018-05-31 09:44:09 -04:00