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 / views / account / register.rhtml @ 804:548e23d4cd71

History | View | Annotate | Download (3.25 KB)

# Date Author Comment
804:548e23d4cd71 2011-11-23 11:15 AM Chris Cannam

Merge from branch "cannam"
787:a36cce722860 2011-11-18 04:53 PM Luis Figueira

Merge from branch "cannam"
717:fce7374e48b7 2011-10-04 10:55 AM Chris Cannam

Remove language field; we only handle English
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"
194:c56dcdfe6722 2011-02-07 01:16 PM Chris Cannam

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

Merge from branch "feature_64"
192:d1713ab10813 2011-02-07 12:30 PM Luis Figueira

feature_64: link to terms and conditions wiki page; fixed form resubmission bug.
190:440c4f4bf2d6 2011-02-03 05:11 PM Luis Figueira

created the model validation and the checkbox in the registration view.
184:b46db3a8b1b4 2011-02-03 03:15 PM Chris Cannam

Merge from branch "feature_55"
183:0d3dd7562e6a 2011-02-03 03:15 PM Luis Figueira

orders the institution select dropdown by the db's order field
177:dc01516c819d 2011-02-02 04:29 PM Luis Figueira

added nobr tags to the institution fields in order to prevent line breaks.
176:ae833c41f474 2011-02-02 01:50 PM Luis Figueira

fixed html character issue in Institutions list.
163:9a5a265e77f0 2011-01-31 06:10 PM Luis Figueira

labels correctly named
institution field is now mandatory and validated.
162:bd3f92477cbb 2011-01-31 05:00 PM Luis Figueira

new javascript to hold registration page specific functions.
registration page specific behaviour.
161:bad82329a115 2011-01-31 01:41 PM Luis Figueira

new javascript for institution field handling.
160:7eb2194ee428 2011-01-28 06:44 PM Luis Figueira

. institution field correctly handled in the user edit and show forms, and in the register view;
153:6bd9b26ebd07 2011-01-25 02:57 PM Luis Figueira

DEV commit - added new logic and view details.
146:0f3210a90f46 2011-01-24 01:52 PM Luis Figueira

development commit: terms and conditions.
107:361f1e8b2e23 2010-12-17 11:18 AM Luis Figueira

Feature #1:
Fixed the collection_select variable issue
User edit view: removed wiki toolbar and description from the description text area in the user;
User edit view: added institutions collection select;
User show view: institution name now visible.
Users_controller: fixed a bug retrieving the institution name
105:975e65e075d1 2010-12-16 08:32 PM Luis Figueira

Working, but needs one migration which was not pushed from my c4dm desktop computer.
102:dc252f2ddef5 2010-12-16 05:42 PM Luis Figueira

- Removed Wiki Toolbar from DEscription input box
- Added the Institution dropdown to the registration view
97:5467cbbf393b 2010-12-16 01:43 PM Luis Figueira

Merge from branch "live"
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.
91:d357e6b0b8e3 2010-12-16 11:41 AM Chris Cannam

Remove spare linebreak
84:432bb11e0390 2010-12-16 10:03 AM Chris Cannam

Merge from branch "luisf"
77:d9df68bf8907 2010-12-14 04:52 PM Luis Figueira

Bug #57 - User Description can be entered as wiki text and is displayed as such.
73:a7fa8dd0446f 2010-12-08 05:03 PM Luis Figueira

Added a description string to the user's description field, to make it more "informative".
66:29d087fde142 2010-12-06 01:48 PM Luis Figueira

Correctly prints the error messages if user description is blank.
65:69ee2e406f71 2010-12-06 12:54 PM Luis Figueira

Correctly outputs an error message if the user's description field is not set.
64:9d42bcda8cea 2010-12-06 11:15 AM Luis Figueira

Validation of description fields (INCOMPLETE: error messages are not displayed correctly)
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.
55:bbb139d5ca95 2010-11-26 03:44 PM Luis Figueira

changes to add SSAMR info. This is a development Commit - DO NOT USE this version.
0:513646585e45 2010-07-23 03:52 PM Chris Cannam
  • Import Redmine trunk SVN rev 3859