Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: couchbaselabs/TouchWiki-iOS
base: 4640163a59
...
head fork: couchbaselabs/TouchWiki-iOS
compare: 7b97f0fd7e
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
24 TouchWiki.xcodeproj/project.pbxproj
@@ -164,6 +164,20 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ 2702BFA616B1EEC000AAFD77 /* Sync UI */ = {
+ isa = PBXGroup;
+ children = (
+ 270B93C216829825005ED1CE /* SyncManager.h */,
+ 270B93C316829825005ED1CE /* SyncManager.m */,
+ 270B93D61684085A005ED1CE /* SyncButton.h */,
+ 270B93D71684085A005ED1CE /* SyncButton.m */,
+ 27306B9C1684159C00F91F61 /* SyncPopover.xib */,
+ 27F1E46016962A9B00F0E50F /* LoginController.h */,
+ 27F1E46116962A9B00F0E50F /* LoginController.m */,
+ );
+ name = "Sync UI";
+ sourceTree = "<group>";
+ };
270B93C51682C94E005ED1CE /* Resources */ = {
isa = PBXGroup;
children = (
@@ -245,15 +259,9 @@
274EF877167BE8E300A66172 /* PageEditController.h */,
274EF878167BE8E300A66172 /* PageEditController.m */,
274EF87D167BE8E300A66172 /* PageEditController.xib */,
- 270B93C216829825005ED1CE /* SyncManager.h */,
- 270B93C316829825005ED1CE /* SyncManager.m */,
- 270B93D61684085A005ED1CE /* SyncButton.h */,
- 270B93D71684085A005ED1CE /* SyncButton.m */,
- 27306B9C1684159C00F91F61 /* SyncPopover.xib */,
- 27F1E46016962A9B00F0E50F /* LoginController.h */,
- 27F1E46116962A9B00F0E50F /* LoginController.m */,
27306BB11684E6EB00F91F61 /* Util.h */,
27306BB21684E6EB00F91F61 /* Util.m */,
+ 2702BFA616B1EEC000AAFD77 /* Sync UI */,
2776A59716A0E233006FF199 /* BrowserID */,
274EF863167BE8E300A66172 /* Supporting Files */,
);
@@ -479,6 +487,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
+ CURRENT_PROJECT_VERSION = 0.2;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -512,6 +521,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
+ CURRENT_PROJECT_VERSION = 0.2;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
View
2  TouchWiki/PageController.m
@@ -109,7 +109,7 @@ - (void) syncManager: (SyncManager*)manager addedReplication: (TDReplication*)re
if (replication.pull) {
// Pull replication: Define the set of channels to sync
replication.filter = @"sync_gateway/bychannel";
- replication.query_params = @{@"channels": @[@"*"]};
+ replication.query_params = @{@"channels": @"*"};
} else {
// Push replication: Set filter to block pushing draft documents
replication.filter = @"notDraft"; // defined in WikiStore.m
View
5 TouchWiki/WikiStore.m
@@ -55,7 +55,10 @@ - (id) initWithDatabase: (TDDatabase*)database {
// Filter for push replications, to avoid sending draft page revisions to the server.
[_database defineFilter: @"notDraft"
asBlock: ^BOOL(TDRevision *revision, NSDictionary *params) {
- if ([revision[@"type"] isEqualToString: @"page"])
+ NSString* type = revision[@"type"];
+ if (!type)
+ return NO;
+ if ([type isEqualToString: @"page"])
return ![revision[@"draft"] boolValue];
return YES;
}];

No commit comments for this range

Something went wrong with that request. Please try again.