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 / user.rb @ 441:cbce1fd3b1b7

History | View | Annotate | Download (19.9 KB)

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

Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
403:b15397a5341c 2011-04-12 04:35 PM Luis Figueira

model changes;
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
210:0579821a129a 2011-02-08 01:51 PM Chris Cannam

Update to Redmine trunk rev 4802
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"
190:440c4f4bf2d6 2011-02-03 05:11 PM Luis Figueira

created the model validation and the checkbox in the registration view.
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)
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"
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.
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