Commit graph

2574 commits

Author SHA1 Message Date
Paul Hawke
22772c851e Moved tests over to Kotlin. (#1428) 2018-04-08 17:59:20 +10:00
Yiran Cao
3949dbca5c Fixed issue #1395 (#1423)
* fixed issue #1395

* moved the compass icon to bottom-left corner
2018-04-05 20:27:10 +03:00
misaochan
912dfb05ec Merge branch 'master' of https://github.com/commons-app/apps-android-commons 2018-04-06 00:15:45 +10:00
misaochan
a095a4e25b Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release' 2018-04-06 00:15:40 +10:00
Josephine Lim
adff92042e Fix blank categories in direct Nearby uploads (#1426) 2018-04-05 16:53:08 +03:00
Josephine Lim
f4166899ca Fix issue with onRequestPermissionsResult not being called in Nearby map and list (#1424)
* Update changelog.md

* Versioning for v2.7.0

* Call fragment method, not activity's

* Initialize directUpload and controller in onCreate

* Add logs

* Change requestcodes in DirectUpload and NearbyMapFragment

* Chain to super in default case (where request codes don't match activity's)

* Controller must be initialized before directUpload

* Fix whitespace, add comments

* Alter request codes for Nearby List as well

* Make permission rationales more specific

* Add comments
2018-04-05 16:31:18 +03:00
translatewiki.net
74dc2fd0fd Localisation updates from https://translatewiki.net. 2018-04-05 09:15:25 +02:00
misaochan
23b2f3ce1d Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release' 2018-04-04 22:32:17 +10:00
Jatin0312
2150d7f244 Fixed bug #1399 Overlapping problem (#1405)
* Fixed bug #1399

* Changed visibility from visible to gone

* Changed behaviour according to review

* Changed bottom sheet visibility from visible to gone
2018-04-04 11:36:34 +03:00
Tanvi Dadu
0205274dd5 Fix Acra (#1414)
*  update Acra

*  Update to latest version
2018-04-03 02:15:28 +10:00
Tanvi Dadu
6eebfbb4f6 Links added to TextView about_upload_to in aboutActivity (#1326)
*  Added the link in about_upload_to textfield

*  Merge conflicts resolved

*  Removed the extra textView
2018-04-02 22:42:06 +10:00
Josephine Lim
a5060053fa Change email address for logs to private mailing list (#1404)
* Change email address for logs to private mailing list

* Include version placeholder

* Add comments
2018-04-02 13:17:59 +03:00
Jatin0312
e23f7522f9 Fix for issue #1380 Improved Notification UI (#1387) 2018-03-31 17:11:30 +10:00
misaochan
ba9287fa8b Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release' 2018-03-31 04:06:10 +10:00
Josephine Lim
c6f728a6ed
Versioning and changelog for v2.7.0 (#1392)
* Update changelog.md

* Versioning for v2.7.0
2018-03-31 03:57:15 +10:00
neslihanturan
09763f942f
Merge pull request #1390 from commons-app/fixNearbyLeaks
Fix nearby leaks, at least some ot them
2018-03-30 12:36:41 +03:00
neslihanturan
499d64bb26 Fix NPE 2018-03-30 11:55:15 +03:00
neslihanturan
7b5c5ce497 Fix nearby leaks D 2018-03-29 23:15:21 +03:00
neslihanturan
ea57855dcc Fix memory leak C, I hope 2018-03-29 19:48:01 +03:00
neslihanturan
59a7428048 Fix neraby leak B, leak caused map marker's have reference to activity stays remain on destroy fragment 2018-03-29 16:11:30 +03:00
translatewiki.net
165850bf62 Localisation updates from https://translatewiki.net. 2018-03-29 09:04:37 +02:00
Vivek Maskara
e122bf3a54 Use custom tabs for nearby web views (#1347) 2018-03-29 16:56:34 +10:00
Mansi Agarwal
120130bfc7 Share feature (#1338)
* added share app feature in About

* added share app feature in About

* a small fix
2018-03-29 00:52:53 +05:30
Ujjwal Agrawal
c6679edbda Improvements in Notification Activity (#1374)
* Improvements in Notification Activity

* Update NotificationActivity.java
2018-03-29 00:49:35 +05:30
Josephine Lim
6fc294ab3f
Merge pull request #1381 from commons-app/fixNearbyCurLoctionMarker
Fix nearby current location marker
2018-03-29 00:29:31 +10:00
misaochan
a927a80265 Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release' 2018-03-28 22:25:57 +10:00
misaochan
0ec77b31f8 Add check for size of places array 2018-03-28 20:45:08 +10:00
Josephine Lim
ad0ba3edff
Merge pull request #1377 from Mansi449/UsingHTML
Solved underline issue in About page
2018-03-28 19:58:35 +10:00
neslihanturan
469190cacb
Merge pull request #1383 from ujjwalagrawal17/travis_fix
Removed nearby Test temporarily
2018-03-28 08:54:38 +03:00
Ujjwal Agrawal
d674e81ed7 Removed nearby Test 2018-03-28 02:39:51 +05:30
neslihanturan
ba73dbbd50 Fix zoom and target according to bottom sheet position 2018-03-27 22:24:14 +03:00
neslihanturan
ae0bfae275 Fix bottom sheet and current location marker visibilities 2018-03-27 20:39:38 +03:00
neslihanturan
558b8a625f Fix transparent view allign 2018-03-27 19:34:08 +03:00
Maanu449
1e80f68136 used CDATA 2018-03-27 18:10:39 +05:30
neslihanturan
1bede8f729
Merge pull request #1337 from diddypod/delete-request
Improve nominate for deletion feature
2018-03-26 23:30:42 +03:00
neslihanturan
418b118019
Merge pull request #1370 from misaochan/about-fixes
Fix strings in About
2018-03-26 23:25:26 +03:00
misaochan
93dccd4d25 Restore "Rate us" string 2018-03-26 20:36:36 +10:00
misaochan
e3bd13627b Fix translate message string 2018-03-26 20:36:12 +10:00
misaochan
68f2330301 Modified strings in About to look more streamlined 2018-03-26 20:34:06 +10:00
misaochan
f23cd8214d Add comments 2018-03-26 18:48:09 +10:00
misaochan
f08641b66f Add getLineCount() == 0 check for button text to prevent wrapping lines 2018-03-26 18:43:19 +10:00
misaochan
0861533d29 Fix logging 2018-03-26 18:29:30 +10:00
Suchit Kar
0857dc890d Merge branch 'master' of https://github.com/commons-app/apps-android-commons into delete-request 2018-03-26 12:47:02 +05:30
neslihanturan
e5c8591fa7 Solve conflicts 2018-03-25 20:24:46 +03:00
Josephine Lim
2ad9cedc86
Merge pull request #1348 from Jatin0312/master
Fix for issue #1317 Dividing nav bar into sections
2018-03-26 00:17:02 +10:00
Josephine Lim
361eff6f02
Merge pull request #1357 from wailbabou/master
Fix whole page map issue
2018-03-26 00:01:52 +10:00
Vivek Maskara
463673f942
Merge branch 'master' into featuredImages 2018-03-24 12:46:38 +05:30
Vivek Maskara
6eaac1de40
Merge branch 'master' into notificationFixes 2018-03-24 12:44:09 +05:30
Suchit Kar
7f848eb432 Merge branch 'master' of https://github.com/commons-app/apps-android-commons into delete-request 2018-03-23 11:41:18 +05:30
mac
46a6481ee8 Fix whole page map issue 2018-03-22 22:08:48 +01:00