-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- [ReactNative] Clean up no longer needed reference to NavigationBarClass | Philipp von Weitershausen - [TextInput] returnKeyType, enablesReturnKeyAutomatically, secureTextEntry, more keyboardTypes | Tadeu Zagallo - [ReactNative] PropTypes for NavigationBars | Philipp von Weitershausen - Changed LayoutAnimation to use ms instead of seconds for consistency | Nick Lockwood - Better date support | Nick Lockwood - Renamed throttleScrollCallbackMS to scrollEventThrottle | Nick Lockwood - Fixed threading issues in RCTImageDownloader | Nick Lockwood - [iOS][Assets]: Cleaning up more 1x png from Libraries | Radu Marin - [ReactNative][docs] LinkingIOS | Tadeu Zagallo - Fixing TouchableOpacity and TouchableHighlight documentation | Ben Alpert - [react-native] Add React.addons.createFragment | Ben Alpert
- Loading branch information
Showing
49 changed files
with
906 additions
and
290 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
// Offline JS | ||
// To re-generate the offline bundle, run this from root of your project | ||
// $ curl 'http://localhost:8081/Examples/SampleApp/index.ios.bundle?dev=false&minify=true' -o iOS/main.jsbundle | ||
|
||
throw new Error('Offline JS file is empty. See iOS/main.jsbundle for instructions'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj.rej
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
diff a/Libraries/FBReactKit/js/react-native-github/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Libraries/FBReactKit/js/react-native-github/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj (rejected hunks) | ||
@@ -19,6 +19,7 @@ | ||
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; | ||
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; | ||
147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 147CED4B1AB34F8C00DA3E4C /* libRCTActionSheet.a */; }; | ||
+ D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; }; | ||
/* End PBXBuildFile section */ | ||
|
||
/* Begin PBXContainerItemProxy section */ | ||
@@ -78,6 +79,13 @@ | ||
remoteGlobalIDString = 134814201AA4EA6300B7C361; | ||
remoteInfo = RCTActionSheet; | ||
}; | ||
+ D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */ = { | ||
+ isa = PBXContainerItemProxy; | ||
+ containerPortal = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */; | ||
+ proxyType = 2; | ||
+ remoteGlobalIDString = 832C81801AAF6DEF007FA2F7; | ||
+ remoteInfo = RCTVibration; | ||
+ }; | ||
/* End PBXContainerItemProxy section */ | ||
|
||
/* Begin PBXFileReference section */ | ||
@@ -98,6 +106,7 @@ | ||
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; | ||
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; | ||
14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; }; | ||
+ D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; }; | ||
/* End PBXFileReference section */ | ||
|
||
/* Begin PBXFrameworksBuildPhase section */ | ||
@@ -112,6 +121,7 @@ | ||
isa = PBXFrameworksBuildPhase; | ||
buildActionMask = 2147483647; | ||
files = ( | ||
+ D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */, | ||
147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */, | ||
134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */, | ||
134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */, | ||
@@ -145,6 +155,7 @@ | ||
1316A21D1AA397F400C0188E /* Libraries */ = { | ||
isa = PBXGroup; | ||
children = ( | ||
+ D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */, | ||
14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */, | ||
13417FFA1AA91531003F314A /* ReactKit.xcodeproj */, | ||
134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */, | ||
@@ -334,6 +353,10 @@ | ||
ProjectRef = 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */; | ||
}, | ||
{ | ||
+ ProductGroup = D85B82921AB6D5CE003F4FE2 /* Products */; | ||
+ ProjectRef = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */; | ||
+ }, | ||
+ { | ||
ProductGroup = 13417FFB1AA91531003F314A /* Products */; | ||
ProjectRef = 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */; | ||
}, | ||
@@ -396,6 +419,13 @@ | ||
remoteRef = 147CED4A1AB34F8C00DA3E4C /* PBXContainerItemProxy */; | ||
sourceTree = BUILT_PRODUCTS_DIR; | ||
}; | ||
+ D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */ = { | ||
+ isa = PBXReferenceProxy; | ||
+ fileType = archive.ar; | ||
+ path = libRCTVibration.a; | ||
+ remoteRef = D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */; | ||
+ sourceTree = BUILT_PRODUCTS_DIR; | ||
+ }; | ||
/* End PBXReferenceProxy section */ | ||
|
||
/* Begin PBXResourcesBuildPhase section */ |
7 changes: 7 additions & 0 deletions
7
Examples/UIExplorer/UIExplorer.xcodeproj/project.xcworkspace/contents.xcworkspacedata
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
Examples/UIExplorer/UIExplorer/Images.xcassets/story-background.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-336 Bytes
...lorer/UIExplorer/Images.xcassets/story-background.imageset/story-background.png
Binary file not shown.
Binary file modified
BIN
+7.04 KB
(100%)
...erenceImages/Examples-UIExplorer-UIExplorerApp/testTextExampleSnapshot_1@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.