3053 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
maskara	463f75e8b3	Show location permission denied dialog in all relevant scenarios	2017-12-02 20:58:31 +05:30
maskara	2796e4277c	Fix issues around location in nearby activity	2017-12-02 20:58:31 +05:30
Nicolas Raoul	90857d09cc	Merge pull request #992 from eflyjason/master ... Added screenshots for Chinese (Simplified) zh-CN	2017-12-01 21:30:56 +09:00
Yifei He	adecbea12e	Added screenshots for Chinese (Simplified) zh-CN	2017-12-01 20:17:07 +08:00
Paul Hawke	fb30a34478	Merge branch 'master' into dependency-injection	2017-11-30 21:41:38 -06:00
Vivek Maskara	078feb9531	Merge pull request #990 from psh/nearby-unit-test ... Created a Robolectric unit test replacement for the (failing) NearbyActivity integration test	2017-11-30 19:46:06 +05:30
translatewiki.net	df1872781f	Localisation updates from https://translatewiki.net.	2017-11-30 08:31:14 +01:00
Paul Hawke	ce32505ca3	Created a Robolectric unit test replacement for the NearbyActivity test.	2017-11-29 21:29:09 -06:00
Nicolas Raoul	9a5bff42d0	Merge pull request #989 from eflyjason/master ... Added screenshots for Chinese (Traditional) zh-TW	2017-11-29 21:21:04 +09:00
Yifei He	ddfafa45b3	Added screenshots for Chinese (Traditional) zh-TW	2017-11-29 19:15:28 +08:00
Yusuke Matsubara	15e0f48819	Merge pull request #968 from maskaravivek/uploadTests ... Test for file upload util method	2017-11-28 22:46:08 +09:00
Josephine Lim	569b82e748	Merge pull request #987 from misaochan/master ... Hopefully fixes crashes on Play Store version	2017-11-27 21:39:15 +10:00
misaochan	b3b20223a1	Merge remote-tracking branch 'refs/remotes/commons-app/master'	2017-11-27 21:37:48 +10:00
misaochan	86b9bddab0	Increment version	2017-11-27 21:27:29 +10:00
misaochan	42ffc1396e	Temp fix for Google Play issue	2017-11-27 21:26:41 +10:00
misaochan	b4ad4e5751	Merge branch 'master' of https://github.com/misaochan/apps-android-commons	2017-11-27 20:33:19 +10:00
misaochan	e0fc100cdd	Merge remote-tracking branch 'refs/remotes/commons-app/master' ... # Conflicts: # app/build.gradle	2017-11-27 20:33:04 +10:00
Josephine Lim	76b8b990f8	Merge pull request #985 from misaochan/master ... Versioning and changelog for v 2.6.0	2017-11-27 18:56:31 +10:00
Josephine Lim	289ad24ae3	Merge branch 'master' into master	2017-11-27 18:53:19 +10:00
Josephine Lim	1d150ebd2f	Merge branch 'master' into master	2017-11-27 18:52:28 +10:00
misaochan	ed09189fa6	Versioning for v2.6.0	2017-11-27 18:48:26 +10:00
Josephine Lim	f129390f01	Update changelog.md	2017-11-27 18:47:43 +10:00
translatewiki.net	5916e669e8	Localisation updates from https://translatewiki.net.	2017-11-27 07:54:21 +01:00
Paul Hawke	07577d73a1	Refactoring based on code review feedback.	2017-11-25 14:23:50 -06:00
Paul Hawke	6d77243329	Fixed issue found by tests running on Android API 21/22	2017-11-25 12:52:42 -06:00
Paul Hawke	17e1ff20d7	Update based on code-review feedback.	2017-11-25 11:46:41 -06:00
Paul Hawke	02b5b9b680	Merge branch 'master' into dependency-injection	2017-11-24 22:30:08 -06:00
Josephine Lim	7a9ff8cc22	Merge pull request #977 from maskaravivek/apkName ... Use modified branch names for APK	2017-11-24 15:52:02 +10:00
maskara	68261c303f	Use modified branch names for APK	2017-11-24 00:14:38 +05:30
Vivek Maskara	b91847e5b4	Merge pull request #976 from misaochan/fix-nearby-loading ... Call setupPlaceList() onResume in NearbyActivity	2017-11-23 18:25:45 +05:30
misaochan	f96169baa7	Changed to refreshView	2017-11-23 21:32:26 +10:00
misaochan	7a50a7dbdf	Call setupPlaceList onResume	2017-11-23 18:31:57 +10:00
Josephine Lim	9888a07d90	Merge pull request #975 from maskaravivek/locationUpdate ... Fix: Location update in nearby activity	2017-11-23 17:14:46 +10:00
Josephine Lim	a2f9ad94e7	Merge branch 'master' into locationUpdate	2017-11-23 17:12:37 +10:00
Josephine Lim	8327aedaf1	Merge branch 'master' into locationUpdate	2017-11-23 17:11:37 +10:00
translatewiki.net	2af7e7fe95	Localisation updates from https://translatewiki.net.	2017-11-23 07:31:45 +01:00
Vivek Maskara	f0d11a6074	Merge pull request #949 from ramarajesh2112/issue-944 ... Issue-944: Fix for same activity getting instantiated multiple times	2017-11-23 02:50:04 +05:30
maskara	b6441ef89f	Lock location after the list is loaded once	2017-11-23 02:38:24 +05:30
maskara	6d718c0028	Upload tests	2017-11-22 02:38:06 +05:30
maskara	a61124a580	Fix: Location update in nearby activity	2017-11-22 01:11:02 +05:30
Vivek Maskara	21f08ae986	Merge pull request #974 from misaochan/fix-log-file-send ... Send log file to private Google group forum instead	2017-11-21 22:03:07 +05:30
Josephine Lim	243170768f	Merge pull request #967 from maskaravivek/nullFix ... Fix: Crash because of no file found error while uploading	2017-11-22 02:17:16 +10:00
misaochan	785bed90ba	Send log file to private Google group forum instead	2017-11-22 01:16:36 +10:00
Josephine Lim	591575faaf	Merge pull request #952 from JohnKal/master ... Fixed issue #894	2017-11-21 15:45:45 +10:00
Ram Gudivada	3c9b325e58	Changed activity creation logic ... - for home activity it will reuse existing activity from back stack and also clears all current activities - for nearby, about and settings, it will use the existing activity from back stack	2017-11-20 21:37:10 -08:00
maskara	7632fffb85	Use different package name for debug and release variants	2017-11-21 10:52:32 +05:30
translatewiki.net	6e2bb3047c	Localisation updates from https://translatewiki.net.	2017-11-20 09:04:53 +01:00
maskara	16ee2b87ec	Fix: Crash because of no file found error while uploading	2017-11-18 01:28:12 +05:30
neslihanturan	461ca3add6	Merge pull request #955 from maskaravivek/fixNpe ... Fixes NPE in Util function	2017-11-17 15:02:39 +03:00
gokberk	ff5e141c22	added the line deleted by mistake	2017-11-16 19:40:40 +03:00