To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.

Statistics Download as Zip
| Branch: | Tag: | Revision:

root / app / models / ssamr_user_detail.rb @ 1534:b31caaed9d4d

History | View | Annotate | Download (522 Bytes)

# Date Author Comment
1520:a1bdbf8a87d5 2014-09-09 10:02 AM Chris Cannam

Merge from branch "redmine-2.4-integration"
1484:51364c0cd58f 2014-01-15 09:59 AM Chris Cannam

Merge from live branch. Still need to merge manually in files overridden by plugins.
1116:bb32da3bea34 2013-01-07 02:41 PM Chris Cannam

Merge from live
927:9ee5fd0b9bd3 2012-05-11 04:13 PM Luis Figueira

Merge from cannam_integration
723:d41bf754c0f2 2011-10-20 04:36 PM Luis Figueira

Merge from branch "live"
689:a8e402f48723 2011-09-16 03:51 PM Chris Cannam

Merge from branch "live"
665:45ec06a8eec9 2011-09-09 04:42 PM Chris Cannam

Merge from branch "cannam_integration"
528:7c7199e1f174 2011-07-25 03:00 PM Chris Cannam

Merge from branch "feature_36"
526:930258005822 2011-07-25 02:53 PM Luis Figueira

Merge from branch "luisf"
525:8a26a0e291cf 2011-07-25 02:53 PM Luis Figueira

Added method to retrieve a user's institution name to the ssamr_user_detail Model.
247:73ff0e6a11b1 2011-03-03 12:11 PM Chris Cannam
  • Merge from branch cannam-pre-20110113-merge
195:172b8d25c1ae 2011-02-07 01:47 PM Chris Cannam

Merge from branch "feature_64"
193:90cc857e968a 2011-02-07 12:52 PM Luis Figueira

Merge from branch "feature_64"
184:b46db3a8b1b4 2011-02-03 03:15 PM Chris Cannam

Merge from branch "feature_55"
163:9a5a265e77f0 2011-01-31 06:10 PM Luis Figueira

labels correctly named
institution field is now mandatory and validated.
96:98b2834d136b 2010-12-16 01:29 PM Chris Cannam

Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.
84:432bb11e0390 2010-12-16 10:03 AM Chris Cannam

Merge from branch "luisf"
64:9d42bcda8cea 2010-12-06 11:15 AM Luis Figueira

Validation of description fields (INCOMPLETE: error messages are not displayed correctly)
61:aedfe093ec32 2010-12-02 07:27 PM Luis Figueira

Now correctly creates a new user with the description
60:cf39b52d24b4 2010-12-01 06:04 PM Luis Figueira

DEVELOPMENT COMMIT: The description can now be seen and edited BUT when a new user registers the informations is not saved to the correct table.
57:215c92fd5954 2010-11-30 05:49 PM Luis Figueira

Wrong naming convention correction.