search

dealy14 / LearningFox-LMS

0 stars 0 forks source link

Merge "cosmos", "cosmos_content" and "master" branches #54

Open ccalvert opened 12 years ago

ccalvert commented 12 years ago

After completing issue #53, merge the "cosmos" and "cosmos_content" branches into master. The basic design elements from issue #53 should not be merged, effectively creating a "template" for each brand.

Any functional differences should be handled via configuration.

ryanammons commented 12 years ago

First major merge of cosmos into master complete. Next step is to pull back out the specific design elements to create templates. The functional configuration to switch between 'content' and 'company/demo', however, is now implemented within master (and up to date).

ryanammons commented 12 years ago

The newly-configurable version of the LMS has been uploaded to safetytrainingsystem.com/LMS, and the styling and functional configuration appear to be working as expected.

ccalvert commented 12 years ago

Is there anything more to do?

dealy14 commented 12 years ago

Are you asking me?

-----Original Message----- From: Charles Calvert [mailto:reply@reply.github.com] Sent: Tuesday, March 27, 2012 12:34 PM To: dealy14 Subject: Re: [LearningFox-LMS] Merge "cosmos", "cosmos_content" and "master" branches (#54)

Is there anything more to do?

Reply to this email directly or view it on GitHub: https://github.com/dealy14/LearningFox-LMS/issues/54#issuecomment-4720587

ryanammons commented 12 years ago

I'm double-checking to make sure I didn't miss anything.

The only thing left to do is to create something like submodules to contain the config/style differences.

dealy14 commented 12 years ago

Is there something that’s not complete on the SOW that is reported as complete?

The message indicates there's something not complete.

Thanks.

-----Original Message----- From: Ryan Ammons [mailto:reply@reply.github.com] Sent: Wednesday, March 28, 2012 3:07 AM To: dealy14 Subject: Re: [LearningFox-LMS] Merge "cosmos", "cosmos_content" and "master" branches (#54)

I'm double-checking to make sure I didn't miss anything.

The only thing left to do is to create something like submodules to contain the config/style differences.

Reply to this email directly or view it on GitHub: https://github.com/dealy14/LearningFox-LMS/issues/54#issuecomment-4749854

ccalvert commented 12 years ago

I think that it's just a crossed wire in communicating. I got email from Ryan yesterday after (but not in response to) posting my comment that indicated that everything was done and uploaded. I think that he's just double-checking in response to my comment.