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 |
Mo Ramezanpoor
|
0fe4c9a792
|
Fixes RxExample.
|
2016-08-17 09:49:29 +01: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 |
|
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
|
2ead37809e
|
Fixes example app compiling.
|
2016-08-04 10:44:46 +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
|
88f718ffc3
|
Updates latest version of data sources.
|
2016-07-04 02:06:08 +02:00 |
Jamie Pinkham
|
39a20441e1
|
begin fixing up the examples
|
2016-06-18 01:24:07 -07:00 |
|
Krunoslav Zaher
|
7687ad4c68
|
Updates RxDataSources.
|
2016-04-29 20:52:00 +02:00 |
|
Krunoslav Zaher
|
834cd872f5
|
Updates data sources.
|
2016-03-22 11:20:10 +01:00 |
|
Krunoslav Zaher
|
80edd849ff
|
Synchronizes `RxDataSources`.
|
2016-03-13 17:30:55 +01:00 |