kylefang/ReactiveCocoa
1
0
Fork 0
mirror of https://github.com/zhigang1992/ReactiveCocoa.git synced 2026-06-16 05:17:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,401 Commits 34 Branches 103 Tags
optimise-map
Commit Graph

43 Commits

Author SHA1 Message Date
Rob Rix
ff6673f3c4 Bump specta. 2014-03-24 17:15:28 -04:00
Rob Rix
badba96994 Scheme version bump. 2014-03-24 12:42:48 -04:00
Alan Rogers
6443a08698 ++xcconfigs 2014-03-11 16:08:21 +11:00
Javier Soto
e3c38723f2 Updated xcconfigs submodule to fix clang error on Xcode 5.1 due to deprecated linker flag (Fixes #1050) 2014-02-01 10:13:32 -08:00
Justin Spahr-Summers
2f46ec2d28 ++expecta/specta to arm64 branches 
Conflicts:
	external/expecta
 2013-11-27 10:32:34 -08:00
Justin Spahr-Summers
3a279b4f44 ++xcconfigs for arm64 support 2013-11-15 14:10:12 -08:00
Justin Spahr-Summers
82680afced ++xcconfigs 2013-11-09 23:56:09 -08:00
Justin Spahr-Summers
c8ca6edbea ++xcconfigs for arm64 support 
Fixes #924.
 2013-11-08 09:57:36 -08:00
Justin Spahr-Summers
194c8dd0ee Revert "Merge pull request #709 from ReactiveCocoa/add-fishhook" 
This reverts commit 5043e26d31, reversing
changes made to f548b20f5e.

Conflicts:
	ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/project.pbxproj
 2013-08-02 10:14:47 -07:00
Justin Spahr-Summers
88a10f40f1 Merge branch 'master' into 2.0-development 2013-07-29 16:59:59 -07:00
Justin Spahr-Summers
e1218db63f ++specta and expecta 2013-07-29 16:59:37 -07:00
Justin Spahr-Summers
7d1bf4b8ca Merge branch 'master' into 2.0-development 
Conflicts:
	ReactiveCocoaFramework/ReactiveCocoa/libextobjc
 2013-07-29 16:56:42 -07:00
Dave Lee
ab166ea15e Prefix fishhook API with rac_ (subtree redux) 2013-07-24 13:39:45 -06:00
Dave Lee
a35416a47e Subtree fishhook 
https://github.com/facebook/fishhook becd6c43f4891011676fc283b8b4afaf767747a2
 2013-07-24 13:30:55 -06:00
Justin Spahr-Summers
c3259cb83f Merge remote-tracking branch 'origin/2.0-development' into signal-for-selector-from-protocol 
Conflicts:
	.gitmodules
	ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/project.pbxproj
	ReactiveCocoaFramework/ReactiveCocoa/RACEventTrampoline.h
	ReactiveCocoaFramework/ReactiveCocoa/RACObservablePropertySubject.m
	ReactiveCocoaFramework/ReactiveCocoa/ReactiveCocoa.h
 2013-06-24 21:04:23 -07:00
Justin Spahr-Summers
8427ad9850 ++xcconfigs 2013-06-23 21:13:32 -07:00
Justin Spahr-Summers
c85b0829f2 ++xcconfigs 2013-06-23 16:17:31 -07:00
Justin Spahr-Summers
975562ad46 ++xcconfigs to project-headers-first 2013-06-23 16:09:30 -07:00
Justin Spahr-Summers
70d1013fee Re-add jspahrsummers/xcconfigs into the external/ folder 2013-06-23 09:32:32 -07:00
Justin Spahr-Summers
4be18a9abe Remove now-unused JRSwizzle and RACSwizzling 2013-06-22 15:37:07 -07:00
joshaber
a97035c5f2 more bumps 2013-06-19 16:56:24 -04:00
joshaber
5d25d90c75 ++specta + expecta 2013-06-15 08:19:54 -07:00
Alan Rogers
a122345c01 ++specta 2013-04-27 23:03:46 +10:00
joshaber
74a36fe514 include a test configuration 2013-04-25 16:08:18 -04:00
Justin Spahr-Summers
79518a68fb ++expecta with changes from petejkim/master 2013-02-12 02:05:31 -08:00
Alan Rogers
7a9763d08a ++expecta and ++specta 2013-01-10 10:03:29 +11:00
joshaber
ee8f8b5fc3 ++specta 2012-11-20 16:52:12 -05:00
joshaber
0334b85dc2 ++specta 2012-11-20 16:44:25 -05:00
joshaber
671b6e97a2 ++specta 2012-11-20 16:38:04 -05:00
joshaber
24d0425dc3 ++specta 2012-11-20 16:31:51 -05:00
Justin Spahr-Summers
14f798f6b0 ++specta for shared example and teardown improvements 2012-11-20 13:22:50 -08:00
Justin Spahr-Summers
1331ea661c Moved libextobjc into ReactiveCocoa folder 
This way, it should be part of header search paths automatically.
 2012-09-04 13:46:57 -07:00
Justin Spahr-Summers
1621db5123 Remove xcconfigs submodule (use libextobjc's instead) 2012-09-04 13:12:31 -07:00
Justin Spahr-Summers
76cc48eda4 Adding jspahrsummers/libextobjc as a submodule 2012-09-04 13:10:53 -07:00
Justin Spahr-Summers
13b200e5c5 Go back to github/specta 
Requires a git submodule sync!

Turns out there's some stuff in the GitHub fork that doesn't exist on petejkim/specta (see petejkim/specta#10 and petejkim/specta#11).
 2012-08-08 13:28:31 -07:00
Justin Spahr-Summers
5a0616e8c7 ++xcconfigs 2012-08-02 15:07:54 -07:00
Justin Spahr-Summers
cbdc86b625 Adding jspahrsummers/xcconfigs as a submodule 2012-08-02 14:52:56 -07:00
Justin Spahr-Summers
6b6a51d65e Update expecta to latest master 2012-07-30 12:46:47 -07:00
Justin Spahr-Summers
9b19706f4e Re-pointed Specta submodule to the latest master of petejkim/specta 2012-07-30 12:41:11 -07:00
joshaber
8d39894d33 added JRSwizzle as a submodule 2012-07-14 14:32:00 -04:00
joshaber
09dfcd73cd create RACTuple to encapsulate the idea of a collection that could contain nils 2012-04-12 11:32:17 -04:00
joshaber
ed812feb3c added all the things 2012-03-08 23:34:52 -05:00
joshaber
fe2d7883fb more reorganizing 2012-03-05 16:45:19 -05:00