Commit Graph

1539 Commits

Author SHA1 Message Date
Jamie Pinkham ced6ce3a7e fixes the unit tests for the rx ios example 2016-06-20 14:04:42 -04:00
Jamie Pinkham ff0d588189 fix what tests i can 2016-06-18 15:43:27 -07:00
Jamie Pinkham c35136fe0b get example projects working.. woo! 2016-06-18 15:21:44 -07:00
Jamie Pinkham 39a20441e1 begin fixing up the examples 2016-06-18 01:24:07 -07:00
Jamie Pinkham c4cf2e0d12 builds ios, ios rx cocoa and ios rx blocking 2016-06-17 23:19:16 -07:00
Jamie Pinkham 0e38ecbc87 Merge branch 'develop' into swift-3.0
# Conflicts:
#	Documentation/DesignRationale.md
#	Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift
#	RxCocoa/Common/DelegateProxyType.swift
#	RxCocoa/iOS/UICollectionView+Rx.swift
#	RxCocoa/iOS/UIControl+Rx.swift
#	RxCocoa/iOS/UIScrollView+Rx.swift
#	RxCocoa/iOS/UITableView+Rx.swift
#	RxExample/RxDataSources/DataSources+Rx/ObservableConvertibleType+Differentiator.swift
#	RxSwift/Concurrency/Lock.swift
#	RxSwift/Disposables/CompositeDisposable.swift
#	RxSwift/Event.swift
#	RxSwift/Extensions/String+Rx.swift
#	RxSwift/Schedulers/OperationQueueScheduler.swift
2016-06-17 21:14:06 -07:00
Krunoslav Zaher dee4a93ccb Adds test to Linux tests. 2016-05-31 21:54:57 +02:00
Krunoslav Zaher 645b93c3e4 Fixes composite disposable. 2016-05-31 21:54:35 +02:00
Krunoslav Zaher 2fdb6a6d81 Merge pull request #720 from larryonoff/feature/extend-composite-disposable
Extend CompositeDisposable with variadic init
2016-05-31 21:39:43 +02:00
Krunoslav Zaher a9fafcee41 Merge pull request #721 from kylef/kylef/rx_title
Add rx_title to UIViewController
2016-05-31 21:35:48 +02:00
Krunoslav Zaher 52c6e6dc31 Improves version checking logic. #707 2016-05-31 21:33:38 +02:00
Kyle Fuller aba717b642 Add rx_title to UIViewController 2016-05-30 09:19:26 -07:00
Ilya Laryionau c6ae73f9ce extend CompositeDisposable with variadic init 2016-05-29 18:47:00 +03:00
Krunoslav Zaher bb4052fb1b Remove `hasObservers` from `SubjectType`. 2016-05-28 15:23:22 +02:00
Krunoslav Zaher bdb09885c2 Merge branch 'develop2' of git://github.com/pRizz/RxSwift into pRizz-develop2 2016-05-28 14:52:31 +02:00
Krunoslav Zaher d2eec7c478 Merge branch 'AndrewSB-feature/uialert-action' into develop 2016-05-27 23: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 6b038ad039 Merge pull request #701 from TheArtOfEngineering/swift-3.0
Add Swift 3 swift-DEVELOPMENT-SNAPSHOT-2016-05-09 compatibility.
2016-05-27 22:48:26 +02:00
Krunoslav Zaher 0e75ad3cf0 Improves CI by killing iOS simulator before each batch of tests to prevent deadlocks caused in Apple code. 2016-05-27 22:36:55 +02:00
Krunoslav Zaher e902c8b7f6 Merge remote-tracking branch 'origin/develop' into develop 2016-05-27 22:34:36 +02:00
Krunoslav Zaher c742831992 Merge branch 'punty-uipagecontrol-add-rx' into develop 2016-05-27 22:34:12 +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
Krunoslav Zaher eeabccf348 Merge pull request #711 from devxoul/fix-typo-docs-units
Fix typo in Documentation/Units.md
2016-05-26 14:10:50 +02:00
Jeon Suyeol d1713a8ac5 Fix typo in Documentation/Units.md 2016-05-26 04:17:52 +09:00
Krunoslav Zaher 31ebe46a16 Merge pull request #710 from larryonoff/bugfix/fix-typo
fix typo
2016-05-25 14:17:07 +02:00
Krunoslav Zaher d1393da8eb Merge pull request #703 from wddwycc/patch-2
Fix Blurred demonstration of 'concat demo'.
2016-05-24 11:42:17 +02:00
Tyler Cloutier 94833e438d Add Swift 3 swift-DEVELOPMENT-SNAPSHOT-2016-05-09 compatibility. 2016-05-22 14:43:47 -07:00
Ilya Laryionau 3693809b34 fix typo 2016-05-22 22:58:49 +02:00
Krunoslav Zaher e1bfa8c7ea Merge pull request #700 from carlosypunto/FixSpellingInGeolocationService
Fix spelling and reactivate access to preferences panel
2016-05-21 21:25:26 +02:00
Carlos García 5269932678 Fix spelling and reactivate access to preferences panel
Related to Pull Request:
https://github.com/ReactiveX/RxSwift/pull/623/files
2016-05-21 17:05:14 +02:00
Krunoslav Zaher cf2433e665 Fixes contact info. 2016-05-21 16:17:17 +02:00
Krunoslav Zaher a2b00547b8 Merge pull request #699 from solidcell/code-of-conduct
Add a code of conduct markdown
2016-05-21 16:09:34 +02:00
Jesse Farless 45133039c3 Add a code of conduct markdown
It still requires the email address to be updated
to whomever should be the point of contact
2016-05-21 12:20:53 +02:00
Krunoslav Zaher eda25e28ff Simplifies sectioned view extensions. 2016-05-20 22:34:13 +02:00
闻端Carl 607ebfbf3d Fix Demo
The output is of "concat example" is :  

Next(🍎)
Next(🍐)
Next(🍊)
Next(🐱)
Next(🐭)

If people do not use 'concat()', the result is the same, the demo cannot show the effect of 'concat()', which is "waiting for each sequence to terminate successfully before emitting elements from the next sequence"

so I add one line code for better demonstration.
2016-05-19 23:24:35 +08:00
Krunoslav Zaher 4b3056b81f Improves unit tests. 2016-05-19 12:25:57 +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
Peter Ryszkiewicz 66230b7afe Fixed compilation of unit tests 2016-05-18 16:56:24 -05:00
Krunoslav Zaher e61b62d64f Merge branch 'sergdort-UIPickerView+Rx' into develop 2016-05-18 22:14:59 +02: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 49b1481dff Updates RxDataSources. 2016-05-15 20:44:41 +02:00
Krunoslav Zaher 8a3b47953d Changes 2.5 to 2.5.0. 2016-05-15 18:28:31 +02:00
Krunoslav Zaher 33f2487a41 Adds 2.5.0 changes to CHANGELOG. 2016-05-15 18:28:31 +02:00
Krunoslav Zaher 3aa3850a74 Makes `NSTextField` implement `RxTextInput`. 2016-05-15 18:28:31 +02:00
Krunoslav Zaher 69b45ed364 Fixes Wikipedia automation tests. 2016-05-15 18:28:31 +02:00
Krunoslav Zaher aed5ac864a Improves delegate proxy messaging. #675 2016-05-15 18:28:31 +02:00
Krunoslav Zaher 0c34e28d38 Turns off bitcode for RxTests. #584 2016-05-15 18:28:31 +02:00
Krunoslav Zaher 761e9fea8b Release 2.5 2016-05-15 18:28:31 +02:00
Krunoslav Zaher 6b8738752f Merge pull request #685 from carlosypunto/moreComprensibleActivityIndicator
More comprensible `ActivityIndicator`
2016-05-15 16:34:27 +02:00