Diffusion The official Wikipedia iOS application 438887660bf0

Merge branch 'develop' into about_this_article/T124847
438887660bf0
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'develop' into about_this_article/T124847

Conflicts:
Wikipedia.xcodeproj/project.pbxproj

Details

Provenance

Authored on Jun 20 2016, 6:47 PM

Parents

rAPIOSa48f3dd0cdc9: Merge pull request #726 from wikimedia/twn/06-20-2016
rAPIOSfc7ef1753926: include about this article in table of contents if it's present

Branches

Unknown

Tags

Unknown

ChangeId

None

Event Timeline

JoeWalsh committed rAPIOS438887660bf0: Merge branch 'develop' into about_this_article/T124847 (authored by JoeWalsh).Jun 20 2016, 6:47 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

a48f3dd0cdc9 Merge pull request #726 from wikimedia/twn/06-20-2016
Author
montehurd <montehurd@users.noreply.github.com>
Browse Repository
No Builds
No Audits
53492223ab12 Localisation updates from https://translatewiki.net.
Author
Niedzielski
Browse Repository
No Builds
No Audits
747d547cc43a Merge pull request #725 from wikimedia/5.0.5
Author
JoeWalsh
Browse Repository
No Builds
No Audits
5d33a35cf08c Merge branch 'develop' into 5.0.5
Author
JoeWalsh
Browse Repository
No Builds
No Audits
d2613a7ac773 Version bump
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
6c168060f3a9 version bump
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
8a212791fadf Merge branch 'master' into 5.0.5
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
00d3e9d450b1 Add new lane for hotfix
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
ab4f2509dd8b Increment build number
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
65f0b30ed758 add generic header for when language is missing
Author
JoeWalsh
Browse Repository
No Builds
No Audits
214e8784b4aa add crash protection for nil language
Author
JoeWalsh
Browse Repository
No Builds
No Audits
3e404aba8099 Merge pull request #724 from wikimedia/hotfix/proxy
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
c8c8aac1059c update image proxy parsing tests to use new proxy server methods
Author
JoeWalsh
Browse Repository
No Builds
No Audits
e3d659f1d3ee use https when appending a prefix
Author
JoeWalsh
Browse Repository
No Builds
No Audits
3ff55216dd20 early returns to reduce nesting
Author
JoeWalsh
Browse Repository
No Builds
No Audits
9e0de973d92d fix notes
Author
JoeWalsh
Browse Repository
No Builds
No Audits
bac6cbac94c3 secure proxy by only accepting localhost requests, using a shared secret path
Author
JoeWalsh
Browse Repository
No Builds
No Audits
824cfb782569 use path-specific API
Author
JoeWalsh
Browse Repository
No Builds
No Audits
4bb525cb6396 Fix article not scrolled to top bug.
Author
Mhurd
Browse Repository
No Builds
No Audits
7cb2762229d5 push all HTML and image loading through our proxy server
Author
JoeWalsh
Browse Repository
No Builds
No Audits
4f2ae304e1c0 Merge pull request #722 from wikimedia/WMFMostReadSectionControllerCrash/T135243
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
98ddc34922a2 add generic header for when language is missing
Author
JoeWalsh
Browse Repository
No Builds
No Audits
9b6aafe53a30 add crash protection for nil language
Author
JoeWalsh
Browse Repository
No Builds
No Audits
359560e5e1d6 Merge pull request #716 from wikimedia/memory_optimization/T125156
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
19b3344870c2 Merge pull request #714 from wikimedia/T135455
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
e2b32d18b916 Merge pull request #720 from wikimedia/free_nslog
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
b9453ef4dd5d Merge pull request #706 from wikimedia/spike/nsurlcomponentscategories/T133933
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
90461093aa33 only redefine NSLog on non debug builds
Author
JoeWalsh
Browse Repository
No Builds
No Audits
16e29149946b merge
Author
JoeWalsh
Browse Repository
No Builds
No Audits
118f6f2df8a3 Merge pull request #717 from wikimedia/Contribution-readme-updates
Author
montehurd <montehurd@users.noreply.github.com>
Browse Repository
No Builds
No Audits
076031afb234 Merge pull request #715 from huayu0723/T135960
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
82c21b8f2449 Merge branch 'develop' into T135960
Author
huayu0723
Browse Repository
No Builds
No Audits
0af62fa5577a do not unescape a already unescaped string, which returns nil as title
Author
huayu0723
Browse Repository
No Builds
No Audits
8b15651a73ce Revert "do not unescape a already unescaped string, which returns nil as title"
Author
huayu0723
Browse Repository
No Builds
No Audits
0a07318f97d0 add handling for unescaped/normalized titles
Author
JoeWalsh
Browse Repository
No Builds
No Audits
50bf743d0d49 add assertion for invalid percent escapes
Author
JoeWalsh
Browse Repository
No Builds
No Audits
d274e40f5962 paths no longer need to be unescaped
Author
JoeWalsh
Browse Repository
No Builds
No Audits
6a146ebc2c64 use the built in escaping on NSURLComponents rather than manually escaping
Author
JoeWalsh
Browse Repository
No Builds
No Audits
2ac8be51c305 fix tests
Author
JoeWalsh
Browse Repository
No Builds
No Audits
344cb0d91430 rename methods that take escaped denormalized titles to enhance clarity
Author
JoeWalsh
Browse Repository
No Builds
No Audits
d58964cb9732 exclude pathForSites from iCloud backup
Author
JoeWalsh
Browse Repository
No Builds
No Audits
37ed8a57a454 Revert "only exclude articles from iCloud backup instead of all of MWKDataStore"
Author
JoeWalsh
Browse Repository
No Builds
No Audits
ee08cb2bdf9f Merge branch 'develop' into spike/nsurlcomponentscategories/T133933
Author
JoeWalsh
Browse Repository
No Builds
No Audits
5ce0a401d742 Update contribution instructions
Author
• Fjalapeno
Browse Repository
No Builds
No Audits
ea9cf681b492 only exclude articles from iCloud backup instead of all of MWKDataStore
Author
JoeWalsh
Browse Repository
No Builds
No Audits
92f4e1d5187b Version Bump to 876
Author
ciapps <ci-apps@wikimedia.org>
Browse Repository
No Builds
No Audits
c3c78a15d0e4 Merge branch 'develop' into beta
Author
ciapps <ci-apps@wikimedia.org>
Browse Repository
No Builds
No Audits
0aff20f6ab43 Revert "exclude MWKDataStore from cache"
Author
JoeWalsh
Browse Repository
No Builds
No Audits
ce9d800d1bde exclude MWKDataStore from cache
Author
JoeWalsh
Browse Repository
No Builds
No Audits
d870bc48b3ab fix typo
Author
JoeWalsh
Browse Repository
No Builds
No Audits

Changes (44)

Path

Size

Wikipedia.xcodeproj/

project.pbxproj

Wikipedia/

Code/

MWKImageInfoFetcher.m

MWKSiteDataObject.m

NSString+WMFImageProxy.h

NSString+WMFImageProxy.m

NSURL+WMFLinkParsing.h

NSURL+WMFLinkParsing.m

NSURLComponents+WMFLinkParsing.h

NSURLComponents+WMFLinkParsing.m

SDImageCache+WMFPersistentCache.m

WKWebView+LoadAssetsHtml.m

WMFAppViewController.m

WMFExploreSectionControllerCache.h

WMFExploreSectionControllerCache.m

WMFExploreViewController.m

WMFImageGalleryViewContoller.m

WMFMostReadSectionController.m

WMFProxyServer.h

WMFProxyServer.m

WMFSearchDataSource.m

WMFTableOfContentsHeader.xib

Wikipedia-Bridging-Header.h

Localizations/

en.lproj/

Localizable.strings

ko.lproj/

Localizable.strings

mr.lproj/

Localizable.strings

oc.lproj/

Localizable.strings

pt.lproj/

Localizable.strings

qqq.lproj/

Localizable.strings

sah.lproj/

Localizable.strings

Wikipedia-Info.plist

WikipediaUnitTests/

Code/

ImageProxyParsingTests.m

MWKTitleTests.m

WMFLinkParsingTests.m

fastlane/

rAPIOS438887660bf0

README.md

Loading...

Wikipedia.xcodeproj/project.pbxproj

Loading...

Wikipedia/Code/AppDelegate.m

Loading...

Wikipedia/Code/MWKDataStore.h

Loading...

Wikipedia/Code/MWKDataStore.m

Loading...

Wikipedia/Code/MWKImageInfoFetcher.m

Loading...

Wikipedia/Code/MWKSite.h

Loading...

Wikipedia/Code/MWKSite.m

Loading...

Wikipedia/Code/MWKSiteDataObject.m

Loading...

Wikipedia/Code/MWKTitle.h

Loading...

Wikipedia/Code/MWKTitle.m

Loading...

Wikipedia/Code/NSString+WMFImageProxy.h

Loading...

Wikipedia/Code/NSString+WMFImageProxy.m

Loading...

Wikipedia/Code/NSURL+WMFLinkParsing.h

Loading...

Wikipedia/Code/NSURL+WMFLinkParsing.m

Loading...

Wikipedia/Code/NSURLComponents+WMFLinkParsing.h

Loading...

Wikipedia/Code/NSURLComponents+WMFLinkParsing.m

Loading...

Wikipedia/Code/SDImageCache+WMFPersistentCache.m

Loading...

Wikipedia/Code/WKWebView+LoadAssetsHtml.m

Loading...

Wikipedia/Code/WMFAppViewController.m

Loading...

Wikipedia/Code/WMFExploreSectionControllerCache.h

Loading...

Wikipedia/Code/WMFExploreSectionControllerCache.m

Loading...

Wikipedia/Code/WMFExploreViewController.m

Loading...

Wikipedia/Code/WMFImageGalleryViewContoller.m

Loading...

Wikipedia/Code/WMFLogging.h

Loading...

Wikipedia/Code/WMFMostReadSectionController.m

Loading...

Wikipedia/Code/WMFProxyServer.h

Loading...

Wikipedia/Code/WMFProxyServer.m

Loading...

Wikipedia/Code/WMFSearchDataSource.m

Loading...

Wikipedia/Code/WMFTableOfContentsHeader.xib

Loading...

Wikipedia/Code/Wikipedia-Bridging-Header.h

Loading...

Wikipedia/Localizations/en.lproj/Localizable.strings

Loading...

Wikipedia/Localizations/ko.lproj/Localizable.strings

Loading...

Wikipedia/Localizations/mr.lproj/Localizable.strings

Loading...

Wikipedia/Localizations/oc.lproj/Localizable.strings

Loading...

Wikipedia/Localizations/pt.lproj/Localizable.strings

Loading...

Wikipedia/Localizations/qqq.lproj/Localizable.strings

Loading...

Wikipedia/Localizations/sah.lproj/Localizable.strings

Loading...

Wikipedia/Wikipedia-Info.plist

Loading...

WikipediaUnitTests/Code/ImageProxyParsingTests.m

Loading...

WikipediaUnitTests/Code/MWKTitleTests.m

Loading...

WikipediaUnitTests/Code/WMFLinkParsingTests.m

Loading...

WikipediaUnitTests/Info.plist

Loading...

fastlane/Fastfile

Loading...