Commit Graph

14 Commits

Author SHA1 Message Date
Jérôme Alves e4e422c4f1 Merge branch 'swift-3.0' into swift-3.0-removing-rx_-prefix
Conflicts:
	RxCocoa/Common/Observables/NSNotificationCenter+Rx.swift
	RxCocoa/OSX/NSImageView+Rx.swift
	RxCocoa/iOS/UICollectionView+Rx.swift
	RxCocoa/iOS/UIControl+Rx.swift
	RxCocoa/iOS/UIImageView+Rx.swift
	RxCocoa/iOS/UILabel+Rx.swift
	RxCocoa/iOS/UITableView+Rx.swift
	RxExample/RxDataSources/DataSources+Rx/UISectionedViewType+RxAnimatedDataSource.swift
	RxExample/RxExample/Examples/APIWrappers/APIWrappersViewController.swift
	RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesViewController.swift
	RxExample/RxExample/Examples/GitHubSignup/UsingDriver/GitHubSignupViewController2.swift
	RxExample/RxExample/Examples/GitHubSignup/UsingVanillaObservables/GitHubSignupViewController1.swift
	RxExample/RxExample/Examples/ImagePicker/UIImagePickerController+RxCreate.swift
	RxExample/RxExample/Examples/OSX simple example/IntroductionExampleViewController.swift
	RxExample/RxExample/Examples/SimpleTableViewExample/SimpleTableViewExampleViewController.swift
	RxExample/RxExample/Examples/SimpleTableViewExampleSectioned/SimpleTableViewExampleSectionedViewController.swift
	RxExample/RxExample/Examples/SimpleValidation/SimpleValidationViewController.swift
	RxExample/RxExample/Examples/TableViewPartialUpdates/PartialUpdatesViewController.swift
	RxExample/RxExample/Examples/TableViewWithEditingCommands/TableViewWithEditingCommandsViewController.swift
	RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchCell.swift
	RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchViewController.swift
	Tests/RxCocoaTests/DelegateProxyTest.swift
	Tests/RxCocoaTests/KVOObservableTests.swift
	Tests/RxCocoaTests/RxTest+Controls.swift
	Tests/RxCocoaTests/UICollectionView+RxTests.swift
	Tests/RxCocoaTests/UIScrollView+RxTests.swift
	Tests/RxCocoaTests/UITableView+RxTests.swift
2016-08-15 12:17:26 +02:00
Jérôme Alves 10ff55cfba Moves RxCocoa extensions from `rx_` syntax to `rx.` syntax.
The main work is done in this commit but the feature it's still "work in progress"
2016-08-09 00:17:38 +02:00
Krunoslav Zaher d1cde77b18 Modernizes image view extensions. 2016-08-07 18:08:13 +02:00
Jamie Pinkham c4cf2e0d12 builds ios, ios rx cocoa and ios rx blocking 2016-06-17 23:19:16 -07:00
Krunoslav Zaher 4e6880d218 Fixes for RxSwift and Swift 3.0. 2016-04-22 20:49:18 +02:00
Krunoslav Zaher 2aebe1499f Adds `UIBindingObserver`. 2016-02-13 21:25:31 +01:00
Krunoslav Zaher 5d677eaf91 Standardizes header format. 2015-12-29 16:56:21 +01:00
Daniel Tartaglia e6f79b510f Update UIImageView+Rx.swift 2015-11-11 20:39:58 -05:00
Krunoslav Zaher 6dc7f2e4a6 Rename `ObserverOf` to `AnyObserver`. 2015-10-17 12:15:37 +02:00
Krunoslav Zaher 059e3ca3ab Adds watchOS targets and at least tests building targets. 2015-09-30 14:02:41 +02:00
Krunoslav Zaher 964d44d733 Documentation and interface cleanup. 2015-09-09 11:29:39 +02:00
Krunoslav Zaher a4219416cd Introduces new units `ControlProperty` and `ControlEvent`. 2015-08-31 22:01:07 +02:00
Syo Ikeda 77fc2b422d Remove Box references in enums
Those are not used/necessary any more in Swift 2.
2015-08-28 16:08:52 +09:00
Krunoslav Zaher 9c893e75f4 Merges `RxSwift.xcodeproj`, `RxCocoa.xcodeproj` and `RxBlocking.xcodeproj` to `Rx.xcodeproj`. 2015-08-24 00:06:52 +02:00