HomePhabricator

Merge branch 'develop' into bug/T161271

Authored by julbod on Apr 25 2017, 3:10 AM.

Description

Merge branch 'develop' into bug/T161271

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
7c9865c09eebJoeWalsh
Merge branch '5.4.1' into develop 
Apr 24 2017
ae776e0fab18JoeWalsh/GitHub
Merge pull request #1364 from wikimedia/bug/disambiguation_save 
Apr 24 2017
0dc579996e07JoeWalsh/GitHub
Merge pull request #1365 from wikimedia/bug/user_testing_target 
Apr 24 2017
a46c5c07e111JoeWalsh
add missing files to user testing target 
Apr 24 2017
ee51fe02a0bdJoeWalsh
remove MWKArticleSavedNotification 
Apr 24 2017
981a1f01e008JoeWalsh
fix missing clear on disambiguation page after article save 
Apr 24 2017
0f8306d1f790Andrew Mroczkowski/GitHub
Merge pull request #1362 from wikimedia/feature/fix-places-iPad 
Apr 24 2017
115cdec3b585Andrew Mroczkowski/GitHub
Merge branch 'develop' into feature/fix-places-iPad 
Apr 24 2017
571c2046fd39Andrew Mroczkowski/GitHub
Merge pull request #1361 from wikimedia/feature/nearby-cell-right-padding 
Apr 24 2017
81c0128c8f7c AMroczkowski
Fixing search box placement on iPad 
Apr 24 2017
dfb62289a619Andrew Mroczkowski/GitHub
Merge branch 'develop' into feature/nearby-cell-right-padding 
Apr 24 2017
bed97fb9a8be AMroczkowski
Increasing right padding 8 -> 20 to visually match icon on left 
Apr 24 2017
61b0e97d49deJoeWalsh
Merge branch '5.4.1' of github.com:wikimedia/wikipedia-ios into develop 
Apr 24 2017
e1e778d3a3deJoeWalsh
Merge branch '5.4.1' into develop 
Apr 24 2017
2af818945f95Andrew Mroczkowski/GitHub
Merge pull request #1360 from wikimedia/bug/save_unsave 
Apr 24 2017
598f5742e767JoeWalsh
properly report background fetch result 
Apr 22 2017
340c4a62be8eJoeWalsh
add merge policies, ensure background import causes save on main context 
Apr 22 2017
16924bec7522JoeWalsh
Revert "mergeChangesFromContextDidSaveNotification is unnecessary for merging… 
Apr 22 2017
f00fad6b339bJoeWalsh
mergeChangesFromContextDidSaveNotification is unnecessary for merging changes… 
Apr 22 2017
8d22180dc7a2JoeWalsh
ensure finishResumingApp is called on the main thread 
Apr 22 2017
cada26603f93JoeWalsh
Merge branch '5.4.1' into bug/save_unsave 
Apr 22 2017
99e3ffbc7800JoeWalsh
skip submission 
Apr 21 2017
59f8c787c277JoeWalsh
Update fastlane 
Apr 21 2017
b87662bc0324Andrew Mroczkowski/GitHub
Merge pull request #1359 from wikimedia/bug/save_unsave 
Apr 21 2017
355356d30f71JoeWalsh
keep async 
Apr 21 2017
7b514fc7d151JoeWalsh
fix articles not being re-saved after un-save 
Apr 21 2017
90cab0019b02JoeWalsh
add missing completion 
Apr 21 2017
85098e40fcb4JoeWalsh
Merge branch '5.4.1' into develop 
Apr 21 2017
1210b10630feAndrew Mroczkowski/GitHub
Merge pull request #1358 from wikimedia/bug/summary_5.4.1 
Apr 21 2017
04bcbf7fd2ffAndrew Mroczkowski/GitHub
Merge pull request #1304 from wikimedia/feature/places-search-type-refactor 
Apr 21 2017
220623ae83bd AMroczkowski
Using searchBarHeight variable instead of literal 
Apr 21 2017
305414989de2 AMroczkowski
removing accidently commited build number 
Apr 21 2017
d6a7703cb078 AMroczkowski
Removing commented out code 
Apr 21 2017
4096147f9e00 AMroczkowski
Removing commented out code 
Apr 21 2017
78e2f574a681JoeWalsh
remove empty changelog to fix fastlane crash 
Apr 21 2017
7f69eb83fa2a AMroczkowski
wiring up article count for top filter when it's also selected 
Apr 21 2017
4bb2f1285751 AMroczkowski
Navigation bar underlining fixes 
Apr 21 2017
400b547600c2 AMroczkowski
more cleanups 
Apr 21 2017
d3381b6dc195 AMroczkowski
Code cleanup and reorg 
Apr 21 2017
83fb86928d0d AMroczkowski
storyboard wanted to update itself 
Apr 21 2017
f4ab88a325deJoeWalsh
Merge branch 'develop' into feature/places-search-type-refactor 
Apr 21 2017
2fa3c306edadJoeWalsh
fix missing return 
Apr 21 2017
265d09ac5944JoeWalsh
remove properties to fetch - causing fetch errors 
Apr 21 2017
a661a802a221JoeWalsh
fix article migration fetch 
Apr 21 2017
74c098a95540JoeWalsh
use summary response for updating WMFArticle instead of the MWKArticle object 
Apr 21 2017
6bb22c20e483JoeWalsh
centralized summary fetching & updating logic 
Apr 21 2017
c067d6453c5eJoeWalsh
add summary extensions 
Apr 21 2017
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