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
|
1b0e0a3c88
|
Updates RxDataSources.
|
2016-08-07 16:12:16 +02:00 |
|
Krunoslav Zaher
|
2ead37809e
|
Fixes example app compiling.
|
2016-08-04 10:44:46 +02:00 |
Yuki Nagai
|
7f84ec604e
|
WIP. Update for Xcode 8 beta 4.
|
2016-08-02 15:46:11 +09:00 |
Cameron Pulsford
|
5c908f18b8
|
Adds further Xcode 8 beta 3 fixes.
|
2016-07-19 18:42:18 -04: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
|
56e09abb11
|
Fixes problem with Swift 2.3
|
2016-07-04 07:02:49 +02:00 |
|
Krunoslav Zaher
|
2787393621
|
Fixes for Xcode 7.3.1
|
2016-07-04 04:06:01 +02:00 |
|
Krunoslav Zaher
|
bce72a2617
|
Fixes headers.
|
2016-07-04 02:54:32 +02:00 |
|
Krunoslav Zaher
|
88f718ffc3
|
Updates latest version of data sources.
|
2016-07-04 02:06:08 +02:00 |
Jamie Pinkham
|
c719c8cf86
|
fix compiler warnings about unused variables
|
2016-06-22 10:16:49 -04:00 |
|
Jamie Pinkham
|
39a20441e1
|
begin fixing up the examples
|
2016-06-18 01:24:07 -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
|
49b1481dff
|
Updates RxDataSources.
|
2016-05-15 20:44:41 +02:00 |
|
Krunoslav Zaher
|
779eb92d9e
|
Fixes copyright in header.
|
2016-04-30 12:06:00 +02:00 |
|
Krunoslav Zaher
|
7687ad4c68
|
Updates RxDataSources.
|
2016-04-29 20:52:00 +02:00 |
|
Krunoslav Zaher
|
c4ca775bdc
|
Changes for Swift 3.0.
|
2016-04-22 13:14:41 +02:00 |
|
Krunoslav Zaher
|
c234adb9d7
|
Fixes compilation problems with 9.3 runtime.
|
2016-03-22 11:44:46 +01:00 |
|
Krunoslav Zaher
|
834cd872f5
|
Updates data sources.
|
2016-03-22 11:20:10 +01:00 |
Jorge Bernal
|
eddbd23aa5
|
Use new associatedtype syntax
|
2016-03-22 11:09:16 +01:00 |
|
Krunoslav Zaher
|
f9663df3bf
|
Fixes compilation of example app.
|
2016-03-13 18:01:39 +01:00 |
|
Krunoslav Zaher
|
6b3b732208
|
Fixes RxExample-no-module compilation.
|
2016-03-13 17:50:52 +01:00 |
|
Krunoslav Zaher
|
ccd4f29231
|
Fixes debug configuration.
|
2016-03-13 17:30:55 +01:00 |
|
Krunoslav Zaher
|
80edd849ff
|
Synchronizes `RxDataSources`.
|
2016-03-13 17:30:55 +01:00 |