HomePhabricator

Merge branch 'develop' into feature/places-search-type-refactor

Authored by JoeWalsh on Apr 21 2017, 2:25 PM.

Description

Merge branch 'develop' into feature/places-search-type-refactor

Details

Committed
JoeWalshApr 21 2017, 2:25 PM
Parents
rAPIOS012a41ca8c43: Merge branch '5.4.1' into develop
rAPIOS70784a0f58ec: Disabling filter selector in search
Branches
Unknown
Tags
Unknown
ChangeId
None

Merged Changes

CommitAuthorDetailsCommitted
012a41ca8c43JoeWalsh
Merge branch '5.4.1' into develop 
Apr 21 2017
942376c72b74JoeWalsh/GitHub
Merge pull request #1357 from wikimedia/bug/regression_test_fixes 
Apr 21 2017
996c3d470598JoeWalsh
save main context after background context save 
Apr 20 2017
2dce0e346061JoeWalsh
update migration to also clean titles containing HTML 
Apr 20 2017
ffa94ffc1290JoeWalsh
update fastlane 
Apr 20 2017
d9f1d9a70671JoeWalsh
Revert "update fastlane" 
Apr 20 2017
576c2a31b63bJoeWalsh
update fastlane 
Apr 20 2017
24476beb2a77JoeWalsh
remove wmf_stringByRemovingHTML at display time 
Apr 20 2017
3659bec18059JoeWalsh
remove HTML from article displaytitle 
Apr 20 2017
594cefcebbe9JoeWalsh
fix other instances of displayTitle being used without html removed 
Apr 20 2017
7812a029a799JoeWalsh
Merge branch '5.4.1' into bug/regression_test_fixes 
Apr 20 2017
248f6fd1ae0dJoeWalsh
update fastlane 
Apr 20 2017
2c15981bc5dbJoeWalsh
don't show announcements on first load 
Apr 20 2017
1210f6290cf1JoeWalsh
complete fix for show nearby shortcut 
Apr 20 2017
f813f0cf606eJoeWalsh
fix show nearby 
Apr 20 2017