kylefang/RxSwift
1
0
Fork 0
mirror of https://github.com/zhigang1992/RxSwift.git synced 2026-06-12 09:18:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,858 Commits 13 Branches 19 Tags
develop
Commit Graph

130 Commits

Author SHA1 Message Date
Krunoslav Zaher
4952adb27c Merge branch 'develop' of github.com:ReactiveX/RxSwift into develop 2016-09-18 22:13:50 +02:00
Stefan Scheidt
d4bed06d79 update getting started section on creating an observable that performs work to Swift 3 2016-09-16 23:46:07 +02:00
Krunoslav Zaher
d6d4e8754f Removes Installation.md 2016-09-15 21:57:01 +02:00
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
72122e3e43 Updates documentation for 3.0.0.alpha.1 2016-08-21 18:40:08 +02:00
Jérôme Alves
96ef70cc2f Update documentation (.md files) 2016-08-16 09:05:24 +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
f1b4e0f6b7 Merge with 'swift-3.0' 2016-08-10 15:24:27 +01:00
Mo Ramezanpoor
75971c61c6 Replaces all calls to AnonymousDisposable.init() with Disposables.create(). 2016-08-10 15:00:29 +01:00
Mo Ramezanpoor
1fe15bb9da Replaces all calls to NopDisposable.instance with Disposables.create(). 2016-08-10 14:47:53 +01:00
Mo Ramezanpoor
e530858bd0 Renames disposed to isDisposed in any place that it makes semantically. 2016-08-09 09:50:13 +01: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
aef4e69339 Modernizes APIs. 2016-08-07 20:14:19 +02:00
Krunoslav Zaher
091b12242a Merge branch 'master' into swift-3.0 2016-08-07 15:28:44 +02:00
Krunoslav Zaher
4b602fd88e Merge remote-tracking branch 'origin/master' into develop 2016-08-07 15:27:58 +02:00
Krunoslav Zaher
2f06600985 Merge pull request #823 from vburojevic/typos 
Typo in Getting Started
 2016-08-07 15:27:31 +02:00
Krunoslav Zaher
8e01b2ffe4 Merge pull request #820 from tqtifnypmb/master 
Typo
 2016-08-07 15:27:09 +02:00
Krunoslav Zaher
7b6a244f45 Fixes problem with data sources. 2016-08-07 15:23:17 +02:00
Vedran Burojević
0b1856d43e Fixes typo in Getting Started 2016-08-06 19:44:02 +02:00
LZL
72e5488631 Typo 2016-08-03 17:27:15 +08:00
Yuki Nagai
7f84ec604e WIP. Update for Xcode 8 beta 4. 2016-08-02 15:46:11 +09:00
nishitani yuki
544e00d917 Fix minor typo 2016-08-01 13:52:57 +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