HomePhabricator

Merge branch 'develop' into feature/auth-styling/T158142

Authored by JoeWalsh on Mar 2 2017, 7:03 PM.

Description

Merge branch 'develop' into feature/auth-styling/T158142

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
430f20147845JoeWalsh/GitHub
Merge pull request #1227 from wikimedia/framework_removal 
Mar 2 2017
4a9cb9f84507JoeWalsh/GitHub
Merge branch 'develop' into framework_removal 
Mar 2 2017
9034f949b8feJoeWalsh/GitHub
Merge pull request #1206 from julienbodet/bug/T153905 
Mar 2 2017
d0c39630b0cbJoeWalsh
use SDWebImage version that links FLAnimatedImage as an external dependency 
Mar 2 2017
21b3f1648f64Andrew Mroczkowski/GitHub
Merge branch 'develop' into framework_removal 
Mar 2 2017
7294d238ff01Andrew Mroczkowski/GitHub
Merge pull request #1225 from wikimedia/bundle_update 
Mar 2 2017
c7b4b7ceb82aJoeWalsh/GitHub
Merge branch 'develop' into bug/T153905 
Mar 2 2017
ce50537a99cfJoeWalsh/GitHub
Merge branch 'develop' into bundle_update 
Mar 2 2017
0dd395d1b122JoeWalsh
Revert "add carthage/checkouts to header search paths" 
Mar 2 2017
981187cead61JoeWalsh
Revert "fix header search paths" 
Mar 2 2017
32c4ff80d87fJoeWalsh
fix header search paths 
Mar 2 2017
b84bb5e100fbJoeWalsh
add carthage/checkouts to header search paths 
Mar 2 2017
14b16dbda593JoeWalsh
Merge branch 'develop' into framework_removal 
Mar 2 2017
591cfc788199Andrew Mroczkowski/GitHub
Merge pull request #1222 from wikimedia/bug/T159350 
Mar 2 2017
e5549e42b506JoeWalsh
Merge branch 'develop' into framework_removal 
Mar 2 2017
f3c8229ccae9JoeWalsh
remove kvo controller, convert to vanilla KVO 
Mar 2 2017
322593e368a6Andrew Mroczkowski/GitHub
Merge branch 'develop' into bug/T159350 
Mar 2 2017
7969c371af5fAndrew Mroczkowski/GitHub
Merge pull request #1221 from wikimedia/bug/T159353 
Mar 2 2017
27debafd6bd0Andrew Mroczkowski/GitHub
Merge branch 'develop' into bug/T159353 
Mar 2 2017
e03640666858Andrew Mroczkowski/GitHub
Merge pull request #1226 from wikimedia/bug/T159347 
Mar 2 2017
ef67209ce249Andrew Mroczkowski/GitHub
Merge branch 'develop' into bug/T159353 
Mar 2 2017
bc2310aac847JoeWalsh
incorporate VTAcknowledgementsViewController directly 
Mar 2 2017
c0e53abc7deaJoeWalsh
remove frameworks required by appsee 
Mar 2 2017
0fc6ecd4fe56JoeWalsh
incorporate SSDataSources directly 
Mar 2 2017
b2022e61d5e7Andrew Mroczkowski/GitHub
Merge branch 'develop' into bundle_update 
Mar 2 2017
b5479ab145ddAndrew Mroczkowski/GitHub
Merge branch 'develop' into bug/T159347 
Mar 2 2017
d93831d818cdAndrew Mroczkowski/GitHub
Merge pull request #1217 from wikimedia/bug/T159323 
Mar 2 2017
7dbb76613b75JoeWalsh
fix TUSafariActivity import 
Mar 2 2017
6ea2f97f2a1dJoeWalsh
remove unused layout direction utilities 
Mar 2 2017
8f035829bb70JoeWalsh
incorporate TUSafariActivity directly rather than via a framework 
Mar 2 2017
91159fbf7ee7JoeWalsh
remove appsee 
Mar 2 2017
049344fb6e54JoeWalsh
move AFHTTPSessionManager+WMFCancelAll into WMF framework since it is used by… 
Mar 2 2017
13e613015dd6JoeWalsh
use WMFAlertManager 
Mar 2 2017
978c9e3d2f79JoeWalsh
allow NSURLErrorDomain errors to pass through 
Mar 2 2017
03bd88d45e55ciapps
bundle update 
Mar 2 2017
696cc11d2978JoeWalsh
Revert "separate update & pr scripts" 
Mar 2 2017
e369d7113ad5JoeWalsh
separate update & pr scripts 
Mar 2 2017
0ee882a9657fJoeWalsh
separate homebrew script 
Mar 2 2017
9eefc48502e4JoeWalsh
Revert "bundle update" 
Mar 2 2017
42768ee5100aJoeWalsh
bundle update 
Mar 2 2017
ae587f124e14JoeWalsh
bundle update 
Mar 2 2017
cfc82380717bJoeWalsh
flip condition 
Mar 2 2017
f0eac76ae53eJoeWalsh
fix pr.rb paths 
Mar 2 2017
b85d1686a797JoeWalsh
add bundle update script 
Mar 2 2017
8a758c0cee73JoeWalsh/GitHub
Merge branch 'develop' into bug/T159323 
Mar 2 2017
46f7eea9fa1eJoeWalsh/GitHub
Merge branch 'develop' into bug/T159353 
Mar 2 2017
0b1dfc9e190bJoeWalsh/GitHub
Merge branch 'develop' into bug/T159350 
Mar 2 2017
c67321a0d773JoeWalsh
Merge branch 'develop' into bug/T159350 
Mar 1 2017
d97c8a6082d0JoeWalsh
fix places popover action buttons image & text alignment 
Mar 1 2017
f47c2342af26JoeWalsh/GitHub
Merge branch 'develop' into bug/T159323 
Mar 1 2017