Commit Graph

179 Commits

Author SHA1 Message Date
Krunoslav Zaher d19cab3c78 Merge branch 'feature/delay-operator' of github.com:tarunon/RxSwift into delay_operator 2016-08-28 20:00:25 +02:00
Krunoslav Zaher 1998e54085 Fixes RxCocoa compilation issues. 2016-08-19 01:59:06 +02:00
Krunoslav Zaher 94d6c01e3b Enables testability. 2016-08-19 01:49:57 +02:00
Krunoslav Zaher 9ce054936d Merge branch 'swift-3.0-removing-rx_-prefix' of https://github.com/JegnuX/RxSwift into JegnuX-swift-3.0-removing-rx_-prefix 2016-08-19 00:45:51 +02:00
Krunoslav Zaher 6763f1a4b7 Replaces `open` with `public`. 2016-08-16 22:10:41 +02:00
Jérôme Alves e59adc3ae9 Updates Unit Tests and makes them succeed. 2016-08-15 17:46:13 +02:00
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
Mo Ramezanpoor dbc635d6e7 Create Disposables type. 2016-08-09 09:55:11 +01:00
Mo Ramezanpoor cb5d23c757 Removes defunct NAryDisposable.(swift|tt) files. 2016-08-09 09:54:39 +01:00
Krunoslav Zaher aef4e69339 Modernizes APIs. 2016-08-07 20:14:19 +02:00
Krunoslav Zaher a2ee04e721 Fixes unit tests. 2016-08-04 11:12:53 +02:00
Krunoslav Zaher c844b6bdb3 Merge branch 'develop' into swift-3.0 2016-08-01 10:46:20 +02:00
Krunoslav Zaher dffd6f0e1c Moves playgrounds from workspace to project. #806 2016-08-01 10:27:18 +02:00
Krunoslav Zaher 0c8d28b1b6 Fixes disposing for debug operator in case of termination event. 2016-07-23 16:20:10 +02:00
Krunoslav Zaher 070907471c Fixes problem with schedulers introduced with Swift 3.0 and changes in libdispatch. #799 2016-07-23 14:14:08 +02:00
Krunoslav Zaher e79457dcd3 Fixes for Xcode beta 3. 2016-07-20 22:14:59 +02:00
Cameron Pulsford 5c908f18b8 Adds further Xcode 8 beta 3 fixes. 2016-07-19 18:42:18 -04:00
Cameron Pulsford 7c2f20cf36 Updates project with Xcode 8 beta 3. 2016-07-19 11:33:06 -04:00
Krunoslav Zaher 125deae0c8 Fixes tvOS compilation. 2016-07-10 12:23:50 +02:00
Krunoslav Zaher e2edffc39d Fixes `@warn_unused_result(message: "http://git.io/rxs.ud")` warnings. 2016-07-08 00:04:44 +02:00
sergdort cfb8b1558a Merge branch 'master' into swift-3.0
Conflicts:
	RxExample/RxDataSources/DataSources/CollectionViewSectionedDataSource.swift
	RxExample/RxDataSources/DataSources/Differentiator.swift
	RxExample/RxDataSources/DataSources/TableViewSectionedDataSource.swift
	RxExample/RxExample.xcodeproj/project.pbxproj
	RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS-no-module.xcscheme
	RxExample/RxExample/Examples/TableViewPartialUpdates/PartialUpdatesViewController.swift
	RxExample/RxExample/Examples/TableViewWithEditingCommands/TableViewWithEditingCommandsViewController.swift
	RxExample/RxExample/Services/HtmlParsing.swift
	Tests/RxCocoaTests/CLLocationManager+RxTests.swift
	Tests/RxCocoaTests/UICollectionView+RxTests.swift
2016-07-05 18:00:36 +03:00
Krunoslav Zaher 1633a4192e Disables bitcode for RxTests/tvOS because Carthage with Swift 2.3 and Xcode 8.0 fails to compile it. 2016-07-04 06:13:58 +02:00
Krunoslav Zaher 17f8aac437 Removes unit tests failing because of accidentally included plist. 2016-07-04 01:03:13 +02:00
Douglas Heriot d48dff3a4f Update for Xcode 8, Swift 2.3.
Bump OSX Deployment Target to 10.10 to avoid libarclite duplicate linking error?
2016-06-29 01:54:19 +10:00
Krunoslav Zaher 7a15347943 Adds UIButton.setTitle(:forState:) extensions. 2016-06-24 23:11:08 +02:00
Jamie Pinkham 5a9f47262a Merge branch 'upstream-develop' into swift-3.0
# Conflicts:
#	RxCocoa/Common/CocoaUnits/Driver/Driver+Subscription.swift
#	RxCocoa/Common/CocoaUnits/UIBindingObserver.swift
#	RxSwift/Schedulers/MainScheduler.swift
2016-06-22 09:54:44 -04:00
Jamie Pinkham c35136fe0b get example projects working.. woo! 2016-06-18 15:21:44 -07:00
Jamie Pinkham c4cf2e0d12 builds ios, ios rx cocoa and ios rx blocking 2016-06-17 23:19:16 -07:00
Krunoslav Zaher 49ccdac810 Merge pull request #717 from solidcell/tab-bar-delegate-proxy
UITabBar delegate proxy
2016-06-10 11:34:40 +02:00
Suyeol Jeon 0686b9a045 Add unit test for UIScrollView.rx_scrollEnabled 2016-06-08 18:31:27 +09:00
Kyle Fuller aba717b642 Add rx_title to UIViewController 2016-05-30 09:19:26 -07:00
Krunoslav Zaher bdb09885c2 Merge branch 'develop2' of git://github.com/pRizz/RxSwift into pRizz-develop2 2016-05-28 14:52:31 +02:00
Jesse Farless 75d1983afc Add RxTabBarDelegateProxy and UITabBar+Rx with delegate methods 2016-05-28 14:27:19 +02:00
Krunoslav Zaher a5f1d1eef7 Merge branch 'feature/uialert-action' of git://github.com/AndrewSB/RxSwift into AndrewSB-feature/uialert-action 2016-05-27 23:24:50 +02:00
Krunoslav Zaher 38f5eb210f Merge branch 'uipagecontrol-add-rx' of git://github.com/punty/RxSwift into punty-uipagecontrol-add-rx 2016-05-27 22:34:01 +02:00
Peter Ryszkiewicz 185f66af90 Merge branch 'develop' into develop2
# Conflicts:
#	Rx.xcodeproj/project.pbxproj
2016-05-18 20:48:58 -05:00
Peter Ryszkiewicz 45042307ac Added unit tests for the hasObservers var. 2016-05-18 19:47:01 -05:00
Krunoslav Zaher b1dd82e831 Merge branch 'UIPickerView+Rx' of git://github.com/sergdort/RxSwift into sergdort-UIPickerView+Rx 2016-05-18 22:14:45 +02:00
Krunoslav Zaher 3fa44935a1 Adds unit test for only setting different text values. 2016-05-14 01:20:54 +02:00
sergdort 43269fa279 Added `rx_itemSelected` for UIPickerView 2016-05-13 10:55:21 +03:00
Krunoslav Zaher 1aa1b570b0 Fixes problems with two way binding that was caused by `rx_text` and always setting the text value even when the value was equal, and thus clearing the marked text state. #649 2016-05-13 00:38:26 +02:00
kumapo 02d30f846c Add unit tests for UINavigationItem+Rx 2016-05-12 00:24:06 +09:00
kumapo cbe17b7c1c Add rx_title property to UINavigationItem 2016-05-09 18:20:53 +09:00
Andrew Breckenridge 0188dccd4f create UIAlertAction+Rx.swift 2016-05-07 12:23:50 -07:00
Yury Korolev c5a21681a8 Rename Rx to Reactive protocol 2016-05-02 20:05:38 +03:00
Francesco Puntillo b384c3e982 Adding Unit testing for UIPageControl+Rx 2016-04-25 10:50:34 +08:00
Francesco Puntillo 8b4642a1c0 add UIPageControl to RxCocoa 2016-04-14 15:45:35 +08:00
Krunoslav Zaher 7b6a6b5f27 Enables Bitcode for tvOS. 2016-04-11 09:51:06 +02:00
Krunoslav Zaher 18cf20820f Merge pull request #550 from stack/uisearchbar-cancel
UISearchBar Cancel Event
2016-04-10 12:57:13 +02:00
Krunoslav Zaher 45540eb574 Improves UITableView and UICollectionView tests. 2016-04-10 00:06:28 +02:00