Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Revert "Revert "Ophase Categories"" #135

Merged
merged 4 commits into from
Feb 10, 2017
Merged

Revert "Revert "Ophase Categories"" #135

merged 4 commits into from
Feb 10, 2017

Conversation

jlauinger
Copy link
Member

This reverts commit a90c2d1.

The original PR had to be reverted to make master deployable on the production system. All reverted changes are applied again by this PR.

Before merging, a commit that fixes the migration issues described in #132 needs to be added!

@bhaettasch bhaettasch changed the title Revert "Revert "Ophase Categories"" WIP: Revert "Revert "Ophase Categories"" Feb 8, 2017
Squashed migrations
Manually reworked migrations to support upgrade of existing data (this migrations will delete foreign key relations that you will have to recreate manually)
@bhaettasch
Copy link
Member

The new migrations should fix #132 -- they were tested with empty and prepopulated SQLite and MySQL databases.

@bhaettasch bhaettasch changed the title WIP: Revert "Revert "Ophase Categories"" Revert "Revert "Ophase Categories"" Feb 10, 2017
@bhaettasch bhaettasch merged commit d396b3a into master Feb 10, 2017
@bhaettasch bhaettasch deleted the ophaseCategories branch February 10, 2017 10:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants