Commit graph

2866 commits

Author SHA1 Message Date
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
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
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
maskara
8dd8e09f2a Fixes NPE in Util function 2017-11-16 17:32:45 +05:30
translatewiki.net
c0ff9ed09c Localisation updates from https://translatewiki.net. 2017-11-16 10:51:39 +01:00
Josephine Lim
030e296946
Update readme to add disclaimer suggested by WMF 2017-11-16 17:34:27 +10:00
Josephine Lim
7f9b7f7996
Update readme to remove IEG proposal link
Update readme to remove IEG proposal link because it has been approved
2017-11-16 17:33:00 +10:00
neslihanturan
955b3f17a4
Merge pull request #942 from maskaravivek/leaks
Fix Leaks in Nearby activity
2017-11-16 10:17:06 +03:00
Nicolas Raoul
9b5f69f736 Updated screenshots 2017-11-15 21:42:31 +09:00
Josephine Lim
b419140c66
Merge pull request #958 from whym/kotlin
Convert tests into Kotlin
2017-11-15 16:06:36 +10:00
Yusuke Matsubara
e9b4ec62a1 Convert tests into Kotlin 2017-11-15 09:31:31 +09:00
Josephine Lim
fb38c9033d
Merge pull request #933 from aumassart/master
fixing issue #520 : adding a privacy statement
2017-11-14 17:18:11 +10:00
maskara
c97f39fcdf Dispose observable for places 2017-11-13 23:16:27 +05:30
maskara
6a6ba7d542 Fix Leak canary test 2017-11-13 23:16:27 +05:30
maskara
0101dc4820 Cleanup 2017-11-13 23:15:53 +05:30
maskara
a59bf1bc4b make location manager singleton 2017-11-13 23:15:53 +05:30
maskara
d4bafd94e0 Fixes leaks in contribution and nearby activity 2017-11-13 23:15:53 +05:30
translatewiki.net
e429667f3a Localisation updates from https://translatewiki.net. 2017-11-13 09:04:47 +01:00
neslihanturan
c5f80d8eb4
Merge pull request #951 from maskaravivek/dagger
Introduce dagger
2017-11-13 10:43:18 +03:00