Merge branch 'develop' into twn

Authored by JoeWalsh on Sep 11 2017, 10:50 AM.

Description

Merge branch 'develop' into twn

  1. Conflicts:
  2. Wikipedia/iOS Native Localizations/as.lproj/Localizable.strings
  3. Wikipedia/iOS Native Localizations/br.lproj/Localizable.strings
  4. Wikipedia/iOS Native Localizations/ca.lproj/Localizable.strings
  5. Wikipedia/iOS Native Localizations/de.lproj/Localizable.strings
  6. Wikipedia/iOS Native Localizations/es.lproj/Localizable.strings
  7. Wikipedia/iOS Native Localizations/fa.lproj/Localizable.strings
  8. Wikipedia/iOS Native Localizations/fr.lproj/Localizable.strings
  9. Wikipedia/iOS Native Localizations/hu.lproj/Localizable.strings
  10. Wikipedia/iOS Native Localizations/id.lproj/Localizable.strings
  11. Wikipedia/iOS Native Localizations/ko.lproj/Localizable.strings
  12. Wikipedia/iOS Native Localizations/lb.lproj/Localizable.strings
  13. Wikipedia/iOS Native Localizations/lt.lproj/Localizable.strings
  14. Wikipedia/iOS Native Localizations/lv.lproj/Localizable.strings
  15. Wikipedia/iOS Native Localizations/mk.lproj/Localizable.strings
  16. Wikipedia/iOS Native Localizations/ms.lproj/Localizable.strings
  17. Wikipedia/iOS Native Localizations/ne.lproj/Localizable.strings
  18. Wikipedia/iOS Native Localizations/nl.lproj/Localizable.strings
  19. Wikipedia/iOS Native Localizations/sv.lproj/Localizable.strings
  20. Wikipedia/iOS Native Localizations/zh-hans.lproj/Localizable.strings
  21. Wikipedia/iOS Native Localizations/zh-hant.lproj/Localizable.strings

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
bac3f26091f0montehurd/GitHub
Merge pull request #1787 from wikimedia/bug/smart_invert 
Sep 8 2017
7797f7d91262JoeWalsh/GitHub
Merge branch 'develop' into bug/smart_invert 
Sep 8 2017
f7ceb8b40084JoeWalsh/GitHub
Merge pull request #1785 from wikimedia/feature/share_T174212 
Sep 8 2017
fced9ba850bfJoeWalsh
remove accessibilityIgnoresInvertColors for dark themes 
Sep 8 2017
384595b464bfJoeWalsh
update readme 
Sep 8 2017
354ce5376e1aJoeWalsh
remove unused script 
Sep 8 2017
c3c5a5962b35JoeWalsh
update strings 
Sep 8 2017
874610108dbbJoeWalsh
add wprov to sharing links, consolidate logic, update strings and variable names 
Sep 8 2017
935ea70b552aJoeWalsh
update share a fact card sizing 
Sep 8 2017
c828568859b9JoeWalsh
fix masonry imports 
Sep 7 2017
4bf69dcb053bJoeWalsh
re-incorporate masonry 
Sep 7 2017
0d1ce064d988JoeWalsh
Revert "incorporate masonry directly" 
Sep 7 2017
9666bc5990ecJoeWalsh
Revert "fix import" 
Sep 7 2017
7537663dab2aJoeWalsh
Revert "remove masonry imports" 
Sep 7 2017
10c86e6b51c5JoeWalsh
remove masonry imports 
Sep 7 2017
690b4daf9490JoeWalsh
add output paths to all targets 
Sep 7 2017
ac5151f34947JoeWalsh
add output paths 
Sep 7 2017
dab40b5bfbf9JoeWalsh
update cartfile 
Sep 7 2017
9d47160da631JoeWalsh
fix localization script 
Sep 7 2017
ca7c71d1fe38JoeWalsh
Merge branch 'develop' into feature/share_T174212 
Sep 7 2017
f79fb02bbad7JoeWalsh
remove objc_inference 
Sep 7 2017
51cf8b979903JoeWalsh
update localization to swift 4 
Sep 7 2017
4a75d8768d51montehurd/GitHub
Merge pull request #1762 from wikimedia/bug/T172565 
Sep 7 2017
22e5056721b2JoeWalsh
fix import 
Sep 7 2017
b1e2b483a53eJoeWalsh
incorporate masonry directly 
Sep 7 2017
001e99c65f13JoeWalsh
add mention representation 
Sep 7 2017
76c1fbf8b885montehurd/GitHub
Merge branch 'develop' into bug/T172565 
Sep 7 2017
d68ae944b176JoeWalsh
switch to masonry fork 
Sep 7 2017
c2f1b3abe705JoeWalsh
only use wikidata description 
Sep 7 2017
1c5cbb25ed2eJoeWalsh
update ipad constraints 
Sep 7 2017
687a6c046751JoeWalsh
fix iPad presentation 
Sep 7 2017
1e2cd8df55d6JoeWalsh
keep share-a-fact on older versions 
Sep 7 2017
f7141a84b3baJoeWalsh
Merge branch 'develop' into feature/share_T174212 
Sep 7 2017
66322f3ae5b0JoeWalsh
update share strings 
Sep 7 2017
2bc477debe06JoeWalsh
remove commas 
Sep 7 2017
ab5318889939JoeWalsh
disable code coverage support 
Sep 7 2017
6364ee787ef3JoeWalsh/GitHub
Merge pull request #1784 from wikimedia/twn 
Sep 7 2017
1b6cbb84b698JoeWalsh
add 1024 assets 
Sep 7 2017
addf511ec85fJoeWalsh
add public 
Sep 7 2017
17f2d49fea49JoeWalsh
undo separator removal 
Sep 7 2017
cb15edc7ab7eJoeWalsh
fix search field appearance 
Sep 7 2017
4b616533948fJoeWalsh
fix view ordering 
Sep 7 2017
1620ce796a81JoeWalsh
5.7.0 
Sep 7 2017
f4026e99c503JoeWalsh
update fastlane 
Sep 7 2017
a1f8de074a52JoeWalsh
commas 
Sep 7 2017
008e9429e998JoeWalsh
fix beta target build 
Sep 7 2017
8132c8e34955JoeWalsh
update all targets to Swift 4.0 
Sep 7 2017
43aefd30ae69JoeWalsh
customized activity items for each activity type 
Sep 7 2017
8bc2664fa2daJoeWalsh
add image loading & share-a-fact card building 
Sep 7 2017
c49df42fd493JoeWalsh
new share view controller 
Sep 7 2017