Commit Graph

106 Commits

Author SHA1 Message Date
Yuki Nagai 7f84ec604e WIP. Update for Xcode 8 beta 4. 2016-08-02 15:46:11 +09:00
Krunoslav Zaher 9cac0cc234 Adaptations for Swift 3.0. 2016-07-10 14:55:18 +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 ad96d6b0e1 Merge pull request #777 from baek-jinoo/minor-typo-fix
Minor typo fix
2016-07-01 10:42:21 +02:00
Krunoslav Zaher 37560a734e Moves issue template to root. 2016-06-26 14:53:12 +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
baek-jinoo 8ce99d1219 Minor typo fix 2016-06-20 17:45:37 -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 390e0d79e5 Merge pull request #742 from mattfenwick/patch-1
copy edit Schedulers.md
2016-06-14 23:58:53 +02:00
Matt Fenwick c038e7bb84 fix sentence structure 2016-06-14 10:35:36 -05:00
Matt Fenwick 9fed8676aa copy edit Schedulers.md 2016-06-14 10:14:43 -05:00
Krunoslav Zaher 58a66df1d9 Merge pull request #740 from ReactiveX/update-units-documentation
Remove Variable from Units documentation
2016-06-13 14:04:38 +02:00
Scott Gardner e1040cfcf8 Remove Variable from Units documentation 2016-06-10 12:01:05 -05:00
Jesse Farless 34d35c1560 Update method signatures in API documentation 2016-06-10 10:36:11 +02:00
Jesse Farless 75d1983afc Add RxTabBarDelegateProxy and UITabBar+Rx with delegate methods 2016-05-28 14:27:19 +02:00
Jeon Suyeol d1713a8ac5 Fix typo in Documentation/Units.md 2016-05-26 04:17:52 +09:00
Jesse Farless 64e40ef604 Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00
kumapo 1252338905 Add documentation for UINavigationItem+Rx 2016-05-12 01:28:12 +09:00
Krunoslav Zaher 92b8a51891 Orta's improvements. 2016-05-09 00:05:04 +02:00
Krunoslav Zaher ce5fcd1f4f Improves documentation. 2016-05-08 23:52:26 +02:00
Royce Dy 0dec95efcb fixed typos 2016-05-06 10:49:51 +08:00
Krunoslav Zaher c4ca775bdc Changes for Swift 3.0. 2016-04-22 13:14:41 +02:00
Krunoslav Zaher 26032f7ce1 Merge pull request #607 from shingt/replace-remaining-failWith
Replace failWith with error in examples
2016-04-07 12:39:35 +02:00
Krunoslav Zaher 8bf939d17d Merge pull request #601 from monotonique/fix_link
Fixed Link to Dicision Tree
2016-04-07 12:39:05 +02:00
shingt 5b7dff230f Replace failWith with error in examples 2016-04-06 09:48:30 +09:00
Krunoslav Zaher 5c1adf29df Small fix for Tips.md 2016-04-05 21:53:11 +02:00
Nagasawa Hiroki 8a1e87e6b8 Use 'Completed' instead of 'Complete' 2016-03-29 18:56:11 +09:00
Vivien Leroy e0e113f969 Markdown typo on Why.md
Sentence was not bold because of space after the two stars
2016-03-25 15:24:42 +01:00
George Lin 4a37077db1 Fixed Link to Dicision Tree
- removed a redundant parenthesis
2016-03-23 10:48:12 +08:00
Jorge Bernal eddbd23aa5 Use new associatedtype syntax 2016-03-22 11:09:16 +01:00
Krunoslav Zaher 70bdd79d68 Merge branch 'issue-553' of https://github.com/dakeshi/RxSwift into dakeshi-issue-553 2016-03-18 22:40:44 +01:00
dakeshi 9e8af26719 Update syntax for RxSwift2.x, Swift2.x 2016-03-17 18:02:07 +09:00
Krunoslav Zaher 4754216ffd Fixes broken link in `GettingStarted.md`. 2016-03-13 19:53:33 +01:00
Krunoslav Zaher 09eb8803d4 Fixes data source link in `GerringStarted.md`. 2016-03-13 18:08:36 +01:00
Maciej Konieczny c3a4a4cf92 Fixes typo in Units.md 2016-03-13 16:01:04 +01:00
Krunoslav Zaher c6a1f799b0 Improves `Tips.md`. 2016-03-12 20:30:09 +01:00
Krunoslav Zaher c3707616c0 Adds testing and tips documentation. 2016-03-12 20:13:22 +01:00
Afonso dbb2261f67 Fixed Grammar mistake then/than
"Then" was being used as the comparison connector of some sentences. The correct word usage is "than"
2016-03-05 21:44:49 +00:00
Krunoslav Zaher c36e93b991 Merge branch 'develop' of github.com:kzaher/RxSwift into develop 2016-03-05 20:51:17 +01:00
Krunoslav Zaher a7508fb3a7 Fixes `README.md` examples. 2016-03-05 19:37:57 +01:00
Mateusz Derks 8b9bbff4ee Adds 'rx_badgeValue' to UITabBarItem 2016-03-04 14:14:38 +01:00
Krunoslav Zaher e05e527111 Adds another useful link to understand reactive programming. 2016-02-20 11:34:35 +01:00
Matthew Healy e60af252e1 Minor rewrite of Math Behind Rx file 2016-02-18 21:19:24 +00:00
Krunoslav Zaher 29c9d9df14 Adds groups to links in README.md 2016-02-14 15:29:12 +01:00
Krunoslav Zaher dc9a0f5505 Updates documentation. 2016-02-14 15:10:14 +01:00
Adam Speakman 2aef2cc39d Clarify examples in Warnings.md
There were a few minor spelling mistakes, and I cleaned up some of the examples to be a little clearer.
2016-02-09 16:38:16 -05:00
Andrew Feng 29583c12a1 Update rxmarbles.com so it can be opened directly. 2016-02-03 09:33:58 +11:00
Krunoslav Zaher af6772d7eb Fixes typo. 2016-01-25 20:51:24 +01:00
Krunoslav Zaher f9f30229a0 Merge remote-tracking branch 'dpyro/documentation-grammar' into develop 2016-01-25 20:50:44 +01:00
Sumant Manne 8b8a98521b Partial doc grammar edit.
Edited for grammar but not meaning.
2016-01-24 13:15:12 -06:00