Diffusion The official Wikipedia iOS application 85b7681fea96

T158142
85b7681fea96
Actions

Description

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

Details

Provenance

montehurd <montehurd@users.noreply.github.com>	Authored on Mar 2 2017, 5:47 AM
GitHub <noreply@github.com>	Committed on Mar 2 2017, 5:47 AM

Parents

rAPIOS37c7d68c7bd7: Add reminder assert.
rAPIOSa0d3982fb6ba: Merge pull request #1219 from wikimedia/T157726

Branches

Unknown

Tags

Unknown

ChangeId

None

Event Timeline

GitHub <noreply@github.com> committed rAPIOS85b7681fea96: Merge branch 'develop' into feature/auth-styling/T158142 (authored by montehurd <montehurd@users.noreply.github.com>).Mar 2 2017, 5:47 AM

Diffusion mentioned this in rAPIOSc8ec78ca0ca7: Merge 85b7681fea9601ee9cab067214fe8d608244fe62 into….

Diffusion mentioned this in rAPIOSad03afd8be50: Merge 85b7681fea9601ee9cab067214fe8d608244fe62 into….Mar 2 2017, 11:06 AM

Merged Changes

a0d3982fb6ba Merge pull request #1219 from wikimedia/T157726
Author
JoeWalsh
Browse Repository
No Builds
No Audits
0d94e6e2cb94 add finishResumingApp as a separate method
Author
JoeWalsh
Browse Repository
No Builds
No Audits
f1448be864df Merge branch 'develop' into T157726
Author
Andrew Mroczkowski <amrox@users.noreply.github.com>
Browse Repository
No Builds
No Audits
24a26b6d4636 resume if necessary after completion
Author
JoeWalsh
Browse Repository
No Builds
No Audits
83c2766e8dc0 add article load completion for delaying feed load until after article load
Author
JoeWalsh
Browse Repository
No Builds
No Audits
d9d2531fdbaf Merge branch 'develop' into T157726
Author
JoeWalsh
Browse Repository
No Builds
No Audits
4a0daf378e6e delay app resume until after user activity processing if the app launches via…
Author
JoeWalsh
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

Wikipedia/

Code/

AppDelegate.m

UIViewController+WMFArticlePresentation.h

UIViewController+WMFArticlePresentation.m

WMFAppViewController.h

WMFAppViewController.m

WMFArticleViewController.h

WMFArticleViewController.m

rAPIOS85b7681fea96

View Options

Wikipedia/Code/AppDelegate.m

View Options

Wikipedia/Code/UIViewController+WMFArticlePresentation.h

View Options

Wikipedia/Code/UIViewController+WMFArticlePresentation.m

View Options

Wikipedia/Code/WMFAppViewController.h

View Options

Wikipedia/Code/WMFAppViewController.m

View Options

Wikipedia/Code/WMFArticleViewController.h

View Options

Wikipedia/Code/WMFArticleViewController.m

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

Description

Details

Event Timeline

Merged Changes

Changes (7)

rAPIOS85b7681fea96

Wikipedia/Code/AppDelegate.m

Wikipedia/Code/UIViewController+WMFArticlePresentation.h

Wikipedia/Code/UIViewController+WMFArticlePresentation.m

Wikipedia/Code/WMFAppViewController.h

Wikipedia/Code/WMFAppViewController.m

Wikipedia/Code/WMFArticleViewController.h

Wikipedia/Code/WMFArticleViewController.m

Merge branch 'develop' into feature/auth-styling/T158142
85b7681fea96
Actions