search

PoeticMediaLab / Lacuna

Lacuna: Digital Annotation for Teaching and Learning
http://www.lacunastories.com
GNU General Public License v2.0
36 stars 20 forks source link

Install profile improvements #79

Closed shirazd closed 9 years ago

shirazd commented 9 years ago

Hi Mike,

This pull request of install_profile_improvements should be used to review all tickets relating to both the install profile and annotations, as annotations required fixes to the install profile to work correctly on fresh installs, and I also made some additional fixes to annotations on the install_profile_improvements branch.

There was a conflict resolution in lacuna_stories_content_types where someone (I think you) had tweaked the fields on documentation type (made some of the taxonomy fields hidden, among other changes) whilst also I had moved all courses fields from that feature into the courses feature. I was able to resolve without issue, though it did take some time because field feature component git resolutions can be tricky. This is a good reason for defining features according to functionality rather than component type, as I recommended before. ie. since developers typically work on separate aspects of the site at a time, were those separate aspects in separate features, there is no possibility for a git conflict. I should note here also that from experience I can say that it's specifically the co-development of fields that git has a hard time resolving on its own, so what we could expect in the future is more conflicts specifically in the lacuna_stories_content_types feature. Thus I'm thinking we should probably make a highish priority of me reorganizing the way features are divided. We want to do this eventually anyhow, and the sooner we do it, the less likely we will have to deal with conflict resolutions, as I've just described. It's only a few hours work to reorganize the features. I'd do it on a separate branch with a separate pull request that would be best to get merged in sooner than later so that all the devs can resync on that.

mwidner commented 9 years ago

Sounds like a plan to me. Is it possible to make the separate branch of develop or have things progressed too far on your side? I agree that it's a priority. I can make the PR for the re-org of features the first thing I merge in when I get back.