To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.
hg clone
Merge from live branch
Merge from branch "cannam"
Merge from branch "luisf"
Merge
Created a patch for the ProjectsHelper to replace the one previously created for the Projects controller.
added projects_controller_patch (includes the publications helper to the projects controller) - forgot to add this file to version control in the last commit.
Merge from cannam_integration
Merge from branch "live"
Merge from branch "feature_36"
Merge from branch "cannam_integration"
The create publication notice is now being called in the Publications Controller.
Feature #253: Correctly sending emails to users when new publication is added.
Patch file that extends Mailer controller.
Some JS changes to the behaviour of user/author selection interface.
Some Author/User logic.
Created just one function to fill the user's author info (used to be in 2 different places)
For "I am this author", always pull details from user not from a prior authorship
Merge from branch feature_36
Move set_initial_author_order to before_save to avoid duplicate author creation;Remove unwanted has-one relationship between user and publication
working on the author<->user logic.
Fixes Bugs #219 and #226.
Continuing development of Feature #237–corrected seeding of database.
Feature #237: migration, new table with BibtexEntry Types and rake task to populate the table.
fixed wrong institution name retrieval for users with no ssamr_user_details
Correctly searches and sends the parameters for both users and authors.
virtual attribute to handle users; javascript handling users correctly
removed unnecessary rjs file; extending the User Model to handle Users with no Author.
Merge from branch "feature_36" into a specially created integration branch
Created the one-to-one relationship between bibliography authors and users.
correctly adding more than one project to a publication.
Searching for publications via AJAX call; the publication ID is not being sent correctly, so still shows the current publication's associated projects in the select list.
Adding other projects to publication - created query for projects and controller actions to be used in the AJAX call; still need to get the AJAX call working
Created the Projects - Publications relationship.