Skip to content

Merge 2.9 release with master #2174

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.

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

Merged
merged 7 commits into from
Dec 19, 2018
Merged

Merge 2.9 release with master #2174

merged 7 commits into from
Dec 19, 2018

Conversation

maskaravivek
Copy link
Member

No description provided.

maskaravivek and others added 7 commits November 30, 2018 17:19
* Fix bookmark crash fix

* Fix check for bookmark creator
* Bug fix #2042
* Added a snack with retry when api in AA fails
* Increased connection timeouts in okhttpclient builder

* added missing string resource
* Increased timeout to 60 seconds

* Bug fix #1550
* filter duplicate categories
* Fix crash because of inactive fragment UI

* Add java docs
…y doesn't do anything (#2057)

* Localisation updates from https://translatewiki.net.

* Remove unused mediawiki api dependency (#1991)

* Categories with pipe suffix (#1873)

* Bug fix issue #1826
Changes made :
-Certain category names used to show suffixed with strings prefixed with pipe '|'. Removed everything after the pipe. As per the discussion on the thread, its safe to remove everything after the pipe, including the pipe

* review suggested changes
*Code formatting
*Extracted out the index of pipe in a variable
*Added issue link in comments

* Remove libraries section from README (#1988)

* Remove libraries section from README

* Add wiki link to "libraries used" to README

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Use alert dialog instead of popup window, for nearby information

* Revert irrelevant changes, sorry
@maskaravivek
Copy link
Member Author

@misaochan @neslihanturan This PR can be merged with master once the build succeeds.

@codecov-io
Copy link

Codecov Report

Merging #2174 into master will increase coverage by <.01%.
The diff coverage is 8.77%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #2174      +/-   ##
=========================================
+ Coverage    5.69%   5.69%   +<.01%     
=========================================
  Files         233     233              
  Lines       11595   11621      +26     
  Branches     1077    1081       +4     
=========================================
+ Hits          660     662       +2     
- Misses      10880   10904      +24     
  Partials       55      55
Impacted Files Coverage Δ
...w/commons/category/CategoryImagesListFragment.java 0% <0%> (ø) ⬆️
...ava/fr/free/nrw/commons/nearby/NearbyFragment.java 0% <0%> (ø) ⬆️
...n/java/fr/free/nrw/commons/utils/NetworkUtils.java 0% <0%> (ø) ⬆️
...ons/explore/categories/SearchCategoryFragment.java 0% <0%> (ø) ⬆️
...r/free/nrw/commons/contributions/MainActivity.java 0% <0%> (ø) ⬆️
.../main/java/fr/free/nrw/commons/utils/ViewUtil.java 0% <0%> (ø) ⬆️
...r/free/nrw/commons/auth/AuthenticatedActivity.java 0% <0%> (ø) ⬆️
...rw/commons/explore/images/SearchImageFragment.java 0% <0%> (ø) ⬆️
...nrw/commons/notification/NotificationActivity.java 0% <0%> (ø) ⬆️
...bookmarks/pictures/BookmarkPicturesController.java 0% <0%> (ø) ⬆️
... and 7 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d960c14...189898b. Read the comment docs.

@neslihanturan neslihanturan merged commit f3b450e into master Dec 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants