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

Author - Cache differentiation #101

Merged
merged 17 commits into from
Nov 28, 2013
Merged

Author - Cache differentiation #101

merged 17 commits into from
Nov 28, 2013

Conversation

afontaine
Copy link
Member

We need a flag to tell whether a story is editable or cached.

@afontaine
Copy link
Member

Now there's a table for the AuthoredStories. If the UUID of a story is in that table, it's safe to author. If this is merged first, merging #93 is redundant, as it is up to da1779b.

@Jtfinlay Jtfinlay mentioned this pull request Nov 27, 2013
@edegraff
Copy link
Contributor

Tested and approved, it seems to work well. There's a few spots where it's just whitespace changes, these could be removed. Merge conflicts also need to be resolved.

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryDB.java
@afontaine afontaine mentioned this pull request Nov 28, 2013
@jviau
Copy link
Member

jviau commented Nov 28, 2013

Tested and approved

jviau pushed a commit that referenced this pull request Nov 28, 2013
Author - Cache differentiation
@jviau jviau merged commit 6dc1dde into IPPETAD:master Nov 28, 2013
@afontaine afontaine deleted the DBUpgrades branch November 28, 2013 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants