Release 1.0 Merge Coordination

[enewe101]

Hi guys. I would like to propose that we impose on ourselves the discipline to get all dev work (all coding) done by Saturday night, so that by Sunday, we have moved entirely into merging and bug-squashing.

If you object, please post, otherwise please do what you need to make it happen!

For many people (me) this weekend is a time to celebrate with family so I would very much appreciate avoiding last minute merge conflicts.

Lastly, I would like to recommend that everyone adopt the following merging best practices:

• Pull master into your branch often as you develop. Keep a habit of doing it every time you start and finish a working session.
• Run all automated and manual tests before ever merging to master!
• Post when you merge to master and invite someone to try running the app

Anything to add?

Let's keep this issue open as a spot to workout merge conflicts.

[nishanthtgwda]

If anyone wants to try the new data set, I have posted all the required files in Technical Stuff in Mycourses. Please comment out if you run into any problems.

[mangalagb]

I just pulled from master and I am unable to get the autocomplete to work (on the old data set). For example, when I start typing "sma" for smartphones, it gives me something else. Is it due to the data set change? Does anyone else have this issue?

[enewe101]

By "something else" what do you mean exactly? Are you seeing a bunch of JSON code, or something else else?

[mangalagb]

Json code. I'm sorry. I see that the matter has been moved to a new issue

[asutcl]

I just merged a lot of the code people have been working on.

This includes the sliders, the graphs that are inline, the ranking by slider value and everything that was already in the master this morning.

[forgues]

I found some failing unit tests in the master branch. I fixed them and pushed the changes to master. In order to run the unit tests, you'll need to add the old dead_links file in the data folder, and name it test-dead_links.json.

[asutcl]

Edward asked me to publish the release tomorrow. I will be doing so at around noon. So if you have any clean up you want to do in your code or comments you want to add please do it before then. If for some reason there are issues tomorrow when I try to release, unless I can find a quick fix, I will roll back the changes. So if you commit anything between now and tomorrow make sure it works or it won't be included in the release.

If any of you aren't bogged down by projects, enjoy the long weekend. Otherwise, good luck with your work!

[asutcl]

I will be releasing soon. The consumer report website seems to currently be down so I can't do all of the testing (clicking on links), but normally it should fine. We weren't able to get the standalone war configured properly so this will be a pre-release.