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 / users @ 441:cbce1fd3b1b7

# Date Author Comment
441:cbce1fd3b1b7 2011-06-06 02:24 PM Chris Cannam

Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
310:b9c2ba9e49b4 2011-03-28 05:50 PM Chris Cannam

Merge from branch "feature_73"
303:93b4cfd3aaaa 2011-03-28 05:30 PM Chris Cannam

Merge from branch "bug_97"
280:d242e28efb23 2011-03-22 02:14 PM Luis Figueira

merge from feature_72
247:73ff0e6a11b1 2011-03-03 12:11 PM Chris Cannam
  • Merge from branch cannam-pre-20110113-merge
246:eeebe205a056 2011-03-03 12:02 PM Chris Cannam
  • Merge from default branch, bringing us up to SVN trunk rev 4993
245:051f544170fe 2011-03-03 11:42 AM Chris Cannam
  • Update to SVN trunk revision 4993
243:0c38ffddde77 2011-03-03 11:08 AM Chris Cannam

Fix up entries, etc, from a current SVN checkout (for the same revision as previously)
210:0579821a129a 2011-02-08 01:51 PM Chris Cannam

Update to Redmine trunk rev 4802
209:ff5112f823e5 2011-02-08 01:24 PM Chris Cannam

Merge from branch "feature_72", to provide just enough of the site support for external repos to permit testing while developing the conversion code
201:61d8fba252fd 2011-02-07 04:04 PM Luis Figueira

external repository check box.
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"
189:b55279e641b8 2011-02-03 03:55 PM Chris Cannam

Merge from branch "feature_55"
188:f9fe5ef6156e 2011-02-03 03:54 PM Luis Figueira

fixed bugs with validation of forms.
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.
175:592e09cc3a7b 2011-02-02 01:33 PM Luis Figueira

fixed no prompt issue for users with no institution selected
169:bc23796a7120 2011-02-01 05:50 PM Luis Figueira

ssamr validation on my/account is now done correctly
other small bug fixes.
164:bb9724ba3d60 2011-01-31 08:59 PM Luis Figueira

my account view working correctly.
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;
158:e71a969c151a 2011-01-27 06:46 PM Luis Figueira

migration with new "institution_type" column in ssamr_user_details table.

radio buttons now rely on database
153:6bd9b26ebd07 2011-01-25 02:57 PM Luis Figueira

DEV commit - added new logic and view details.
142:e6ed6c7a2ce9 2011-01-20 02:06 PM Luis Figueira

corrected bug in the institution field while creating a new user.
129:5e974759e8b2 2011-01-19 03:15 PM Chris Cannam

Merge from the default branch
128:07fa8a8b56a8 2011-01-19 03:04 PM Chris Cannam

Update to Redmine trunk rev 4732
120:cd2282d2aa55 2011-01-13 02:33 PM Chris Cannam

Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
119:8661b858af72 2011-01-13 02:12 PM Chris Cannam
  • Update to Redmine trunk rev 4705
118:b859cc0c4fa1 2011-01-13 01:21 PM Chris Cannam

Merge from branch "redmine-1.1"
117:af80e5618e9b 2011-01-13 12:53 PM Chris Cannam
  • Update to Redmine 1.1-stable branch (Redmine SVN rev 4707)
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
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"
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".
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.
59:7ff14a13f48a 2010-12-01 12:21 AM Luis Figueira

a few fixes
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.
51:371eac10df0b 2010-11-24 12:20 PM Chris Cannam
  • Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.
41:7f0e922c8982 2010-11-19 02:45 PM Luis Figueira

merged with new version from trunk
38:33d69fee1d99 2010-11-19 01:41 PM Chris Cannam
  • Merge SVN update from default branch
37:94944d00e43c 2010-11-19 01:24 PM Chris Cannam
  • Update to SVN trunk rev 4411
25:9fd6221709a6 2010-09-24 03:51 PM Chris Cannam
  • Merge cannam branch
23:ca82a3468d27 2010-09-24 02:17 PM Chris Cannam
  • Merge SVN update from default
22:40f7cfd4df19 2010-09-24 02:06 PM Chris Cannam
  • Update to SVN trunk rev 4173
15:9c6c72729d91 2010-08-25 04:33 PM Chris Cannam
  • Merge from default (for SVN trunk update)
14:1d32c0a0efbf 2010-08-25 04:30 PM Chris Cannam
  • Update to SVN trunk (revisions 3892-4040)
1:cca12e1c1fd4 2010-07-28 12:08 PM Chris Cannam
  • Update to Redmine trunk (SVN revisions 3860-3892)
0:513646585e45 2010-07-23 03:52 PM Chris Cannam
  • Import Redmine trunk SVN rev 3859