Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge latest master #6

Merged
merged 173 commits into from
Apr 20, 2020
Merged

Merge latest master #6

merged 173 commits into from
Apr 20, 2020

Conversation

maskaravivek
Copy link
Owner

No description provided.

misaochan and others added 30 commits December 2, 2019 02:46
@misaochan
Versioning
f51957f
@misaochan
Update changelog.md
a7402f2
@misaochan
Merge branch 'master' into 2.12-release
bf4b731
@alcarazzam @nicolas-raoul
Optimize imports (#3272)
f7cca31
@misaochan
Merge branch '2.12-release'
d0f9739
@maskaravivek @misaochan
Convert few model classes to kotlin (#3270)
b0be497
@translatewiki
Localisation updates from https://translatewiki.net.
3d923af
@neslihanturan @misaochan
Fixes #3231 "Nearby" always first puts me in Punta Arenas (#3271)
959b3af 
* Update tables from 10 to 11

* Remove unneeded changes
@misaochan
Merge branch '2.12-release'
e23b80d
@kizule @misaochan
Update strings.xml (#3285)
b4c4691 
Improve share_text string for #3192.
@translatewiki
Localisation updates from https://translatewiki.net.
28e96eb
@ankit1414 @maskaravivek
color accent changed tto blue in dark theme (#3234)
ecf6bd9
@translatewiki
Localisation updates from https://translatewiki.net.
458b497
@maskaravivek @neslihanturan
Fix UI tests (#3297)
a8ee5bd
@translatewiki
Localisation updates from https://translatewiki.net.
8fc8113
@translatewiki
Localisation updates from https://translatewiki.net.
846e04f
@ashishkumar468 @maskaravivek
Bugfix/null revision in review (#3309)
824d6ac 
* Fixes #3305
 * Handle null firstRevision

* initialise explanation
@ashishkumar468 @misaochan
Fixes #3307 (#3308)
349e51f 
* Fixed positional argument format for string in "image_uploaded_by"
@translatewiki
Localisation updates from https://translatewiki.net.
b591fdd
@translatewiki
Localisation updates from https://translatewiki.net.
e56adc6
@translatewiki
Localisation updates from https://translatewiki.net.
85366aa
@translatewiki
Localisation updates from https://translatewiki.net.
173dcd2
@translatewiki
Localisation updates from https://translatewiki.net.
56c4018
@amire80 @neslihanturan
More natural language instead of a slash (#3318)
b55e683
@amire80 @neslihanturan
Remove unnecessary space before colon (#3317)
d26b436
@translatewiki
Localisation updates from https://translatewiki.net.
8824076
@translatewiki
Localisation updates from https://translatewiki.net.
59cb157
@misaochan
Versioning for v2.12.1
9c6e339
@misaochan
Update changelog.md
53d3c37
@misaochan
Versioning and changelog for v2.12.1
ef9e298
isnirp and others added 29 commits March 31, 2020 01:56
@isnirp
issue-#3606: cancel in translate goes back to about screen (#3610)
f0a37d3
@translatewiki
Localisation updates from https://translatewiki.net.
eb88e58
@isnirp
Fixed issue #3195 ordering contribution list (#3589)
8053066 
* issue-#3195: order contribution list refactored

* issue-#3195: ordered contribution list
@318anushka
exit app on back pressed in tutorial (#3597)
577fb02 
* exit app on back pressed in tutorial

* exit app from ongoing tutorial

* exit app on back press in tutorial
@neslihanturan
Fixes #3466 No crash information in crash email (Gmail) (#3605)
b6df5f2 
* Send ACRA logs as file instead

* no need to set it true, default is true
@isnirp @misaochan
Fixed issue #3195 ordering contribution list (#3589)
bc8ce94 
* issue-#3195: order contribution list refactored

* issue-#3195: ordered contribution list
@sivaraam
Update wiki page links (#3608)
93d6c52 
We've moved the documentation to a separate repo.

So, change the old links to point to the corresponding
places in the documentation repo.
@misaochan
Merge branch '2.13-release'
b028d14
@misaochan
Merge branch '2.13-release'
c53fcb5
@kbhardwaj123
Fixes #3506: Image height remains zero for some time on bad network (#…
c82283a 
…3513)

* optimise width loading

* amending as per the reviews

* aspect ratio updates after layout completion

* MediaDetailFragment: update aspect ratio using onGlobalLayoutListener

* remove unnecessary imports
@macgills
#3492 Add inspections to git - add inspection profile (#3631)
df16f98
@macgills
#3628 Update Gradle Plugin - bump version (#3629)
6b075d9
@macgills
#3624 DateTimeFormat wrong - match pattern returned from servers (#3625)
d7a42b2
@translatewiki
Localisation updates from https://translatewiki.net.
241b54d
@translatewiki
Localisation updates from https://translatewiki.net.
e859c71
@gupta-anmol
Copy place name on long click (#3609)
a0f8790 
* Copy place name on long click

* Remove hard coded string
@gouri-panda
Fixed logout problem #3547 (#3649)
5308c29 
* fixed logout problem

fixed logout problem

fixed logout problem

fixed logout problem

fixed logout problem

* added error handling on logout
@318anushka
Fast scroll issue fixed (#3593)
75fe4ae 
* fast scroll fixed in explore activity

* fast scroll fixed in explore activity

* fast scroll issue in explore

* fastscroll removed from explore
@madhurgupta10
Converted DialogUtil to Kotlin (#3621)
e341e77 
* Converted DialogUtil to Kotlin

* Kotlin syntax and standard changes

* Removed ;

* Added missing null

* Added missing null

* Removed unnecessary code

* Reduced functions

* added let to customView

* reverted "let" changes

* reverted "let" changes

* removed if-statements

* replaced with "it"

* fixed overflow error

* Function rename

* Used named arguments

* Fix Typo

* single lined

* Update DialogUtil.kt

* changed default value
@kbhardwaj123
ReviewController: remove call to review category notif builder while …
9ee04f3 
…sending thanks (#3655)
@maskaravivek
With data-client added as library module (#3656)
32ee0b4 
* With data-client added as library module

* Fix build
@madhurgupta10
Fixed username visible after logout bug (#3648)
743e24c
@translatewiki
Localisation updates from https://translatewiki.net.
773412f
@macgills
#3630 [Library Discussion] Core-ktx (#3660)
0d6a79e
@maskaravivek
Convert download code to kotlin (#3665)
55c5b1a
@maskaravivek
Remove unused constructor (#3668)
07f19c4
@macgills
#3658 Throw exception instead of allowing nullable network models onE…
ff310e4 
…rror - peek response body and throw error (#3659)

* #3658 Throw exception instead of allowing nullable network models onError - peek response body and throw error

* #3658 Throw exception instead of allowing nullable network models onError - allow for more general error response catching
@maskaravivek
Address code review comments (#3669)
fcd2867
@kbhardwaj123
Fixes #3436 and #2881: Media Detail design Overhaul (#3505)
81e12a9 
* ic_map_dark_24dp: map icon for white background

* ic_info_outline_dark_24dp: info icon for dark background

* MediaDetailFragment: update the spacer as per image aspect ratio

* fragment_media_detail: design overhaul

* fragment_media_detail: remove redundant background color statements

* make requested changes

* add dark mode support

* minor ui tweak

* white map icon in dark mode

* make rquested changes

* make requested changes to layout

* fix misalignment of category list

* subtle amendments

* convert comments to javadocs

* minor amendments

* minor changes

* add styles for media detail

* Media detail fragment refactored

* make suggested changes

* minor name fix

* fix the delete button border
@maskaravivek maskaravivek merged commit 1621648 into maskaravivek:master Apr 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.