HomePhabricator

Merge remote-tracking branch 'origin/develop' into feature/places-search-type…

Authored by AMroczkowski on Apr 20 2017, 7:40 PM.

Description

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

Merged Changes

CommitAuthorDetailsCommitted
22b607e32bd5JoeWalsh
Merge branch '5.4.1' of github.com:wikimedia/wikipedia-ios into develop 
Apr 20 2017
829831b2fbd6JoeWalsh/GitHub
Merge pull request #1356 from wikimedia/bug/background_fetch 
Apr 20 2017
1daeda41361eJoeWalsh
Merge branch '5.4.1' into bug/background_fetch 
Apr 20 2017
26c0284630b1JoeWalsh
Merge branch '5.4.1' of github.com:wikimedia/wikipedia-ios into 5.4.1 
Apr 20 2017
ef3f27c4f714JoeWalsh/GitHub
Merge pull request #1350 from wikimedia/twn 
Apr 20 2017
f2012a814fa5JoeWalsh
Merge branch 'bug/duplicate_cards' into 5.4.1 
Apr 20 2017
8205ce65dfc3JoeWalsh
Merge branch 'bug/html' into 5.4.1 
Apr 20 2017
93ec92b25008JoeWalsh
Merge branch 'enhancement/cache' into 5.4.1 
Apr 20 2017
affb2a2c9bbcJoeWalsh
Merge branch '5.4.1' into bug/background_fetch 
Apr 20 2017
b82a12bb816cJoeWalsh
Merge branch 'bug/announcements' into 5.4.1 
Apr 20 2017
a25bd7e10610JoeWalsh/GitHub
Merge pull request #1355 from wikimedia/bug/notification_header 
Apr 20 2017
e0c10a3f9b1bJoeWalsh
Merge branch 'bug/notification_header' into bug/background_fetch 
Apr 20 2017
08f60a2e9ce4JoeWalsh
refactor isScrolledToTop 
Apr 20 2017
1390c1e5a882JoeWalsh
ensure refresh control is always setup 
Apr 20 2017
6067817fb43dJoeWalsh
fix initial feed update condition 
Apr 20 2017
d272a8aa5567Andrew Mroczkowski/GitHub
Merge pull request #1352 from wikimedia/bug/html 
Apr 20 2017
98de01fed747JoeWalsh
move reachability updates and offline empty view updates back to the feed… 
Apr 20 2017
0992ff8b89a0Andrew Mroczkowski/GitHub
Merge pull request #1354 from wikimedia/bug/announcements 
Apr 20 2017
4717b493d5c1Andrew Mroczkowski/GitHub
Merge pull request #1353 from wikimedia/enhancement/cache 
Apr 20 2017
b0c66383f756Andrew Mroczkowski/GitHub
Merge pull request #1351 from wikimedia/bug/duplicate_cards 
Apr 20 2017
a3a4f7a31ad7JoeWalsh/GitHub
use getter 
Apr 20 2017
4124d1ff9db7JoeWalsh
ensure other app launch activities aren't performed when the app is launched… 
Apr 20 2017
3c6624da2197JoeWalsh
Revert "fix background fetch - it shouldn't rely on the app view controller… 
Apr 20 2017
13c1c22af3b8JoeWalsh
fix background fetch - it shouldn't rely on the app view controller being… 
Apr 20 2017
0235f8569c02JoeWalsh
save moc after background updates 
Apr 20 2017
c8ffc041243bJoeWalsh
trigger refresh control on automatic updates 
Apr 20 2017
8e604edb61c1JoeWalsh
ensure notification header is shown 
Apr 20 2017
b3f64abd4bd5JoeWalsh
always update announcement visibility 
Apr 20 2017
a1a18c2113dfJoeWalsh
NSCache is thread safe 
Apr 20 2017
06299a1047e2JoeWalsh
use private queue for memory queue access control 
Apr 20 2017
c0d7a4340fa4JoeWalsh
remove HTML from title in more views 
Apr 20 2017
ebdf1bb4ca8aJoeWalsh
parent context setup 
Apr 20 2017
aecf7589ca75translatewiki.net
Localisation updates from https://translatewiki.net. 
Apr 20 2017