HomePhabricator

Merge branch 'develop' into bug/T161271

Authored by julbod on Apr 26 2017, 1:07 AM.

Description

Merge branch 'develop' into bug/T161271

Merged Changes

CommitAuthorDetailsCommitted
d50766e67bf5JoeWalsh/GitHub
Merge pull request #1367 from wikimedia/feature/places-no-saved-tweaks 
Apr 25 2017
73e8044a427cAndrew Mroczkowski/GitHub
Merge branch 'develop' into feature/places-no-saved-tweaks 
Apr 25 2017
14138b0d22f5JoeWalsh
Merge branch 'develop' of github.com:wikimedia/wikipedia-ios into develop 
Apr 25 2017
cb7d56b9f3eeJoeWalsh
Merge branch '5.4.1' of github.com:wikimedia/wikipedia-ios into develop 
Apr 25 2017
945a378d1963Andrew Mroczkowski/GitHub
Merge pull request #1366 from wikimedia/bug/crashes 
Apr 25 2017
1987b8b0242a AMroczkowski
Tweaks for places filters 
Apr 25 2017
f655d2d560baJoeWalsh
remove unused MWKArticleKey, MWKSetupDataSourcesNotification… 
Apr 25 2017
90e167236dbbJoeWalsh
save main context after background context save 
Apr 25 2017
d12dbcebf161JoeWalsh
more chaos 
Apr 25 2017
f13f0c1fc275JoeWalsh
better explore feed debug chaos 
Apr 25 2017
7fdefa8c92cfJoeWalsh
set content at creation time 
Apr 25 2017
f96358766bf6JoeWalsh
safer location result iteration 
Apr 25 2017
ca97c49cac3eJoeWalsh
Drop log level to debug on location updates 
Apr 25 2017
0cd0dceb9a65JoeWalsh
remove extraneous error log 
Apr 25 2017
2f7a3cb05547JoeWalsh
add random deletion debugging 
Apr 25 2017
61019ff93595JoeWalsh
this can deadlock when the child context saves 
Apr 25 2017
0786a80dedb3JoeWalsh
comment out assertion not supported on iOS 9 
Apr 25 2017
610674efcd84JoeWalsh
ensure even main context imports are saved 
Apr 25 2017
20623c75fd48JoeWalsh
fix iOS 9 crash 
Apr 25 2017