To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.
hg clone
History | View | Annotate | Download (1002 Bytes)
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.
Merge from cannam_integration
Merge from branch "live"
Merge from branch "feature_36"
Merge from branch "cannam_integration"
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.
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.