Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support for iCloud documents #1056

Merged
merged 4 commits into from Sep 21, 2012
Merged

support for iCloud documents #1056

merged 4 commits into from Sep 21, 2012

Conversation

skurfer
Copy link
Member

@skurfer skurfer commented Aug 21, 2012

This should add the features discussed in #1054.

QSDownloads is sort of a strange place for the new method, but I needed a central location and that seemed as good as any. Note that I didn't update objectHasChildren: as the test for it seemed too expensive.

@pjrobertson
Copy link
Member

Haven't tested this (not sure if I can?) but a quick question - I'm guessing the preset will show up for 10.6 and 10.7 users, anything we can do about that?

@skurfer
Copy link
Member Author

skurfer commented Aug 21, 2012

I'm guessing the preset will show up for 10.6 and 10.7 users, anything we can do about that?

I had the same thought and meant to look into it before posting this. I thought there was a way to set requirements for presets, but I could be wrong.

@skurfer
Copy link
Member Author

skurfer commented Aug 21, 2012

OK, it should only show up in 10.8 now (or a possible future upgrade to 10.7).

@skurfer
Copy link
Member Author

skurfer commented Aug 23, 2012

Note: This will cause a merge conflict with #1055 as they both add new files to the Xcode project, but it's easy to resolve. There are two conflicts in Quicksilver.xcodeproj/project.pbxproj. For both of them, just accept the changes on both sides.

@skurfer skurfer mentioned this pull request Aug 23, 2012
@skurfer
Copy link
Member Author

skurfer commented Aug 29, 2012

I want to work on that plist re-ordering pull request. Since this already has a merge conflict and that would make it worse, I'll just close this and rebase it after and resubmit.

@skurfer skurfer closed this Aug 29, 2012
@skurfer skurfer reopened this Aug 29, 2012
@skurfer
Copy link
Member Author

skurfer commented Sep 4, 2012

Note that I reopened this as the conflict is in the Xcode project and is easily resolved as described above. :-)

@skurfer skurfer merged commit be2bb4f into quicksilver:master Sep 21, 2012
@skurfer
Copy link
Member Author

skurfer commented Sep 21, 2012

Merged with @pjrobertson's blessing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants