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 / controllers / account_controller.rb @ 1521:2354ddf5a483

History | View | Annotate | Download (11.4 KB)

# Date Author Comment
1521:2354ddf5a483 2014-09-09 02:27 PM Chris Cannam

Fix some merge/runtime problems
1520:a1bdbf8a87d5 2014-09-09 10:02 AM Chris Cannam

Merge from branch "redmine-2.4-integration"
1517:dffacf8a6908 2014-09-09 09:29 AM Chris Cannam

Update to Redmine SVN revision 13367 on 2.5-stable branch
1495:c86dacc2ef0a 2014-03-17 08:55 AM Chris Cannam

Merge from redmine-2.4 branch
1494:e248c7af89ec 2014-03-17 08:54 AM Chris Cannam

Update to Redmine SVN revision 12979 on 2.4-stable branch
1484:51364c0cd58f 2014-01-15 09:59 AM Chris Cannam

Merge from live branch. Still need to merge manually in files overridden by plugins.
1464:261b3d9a4903 2014-01-14 02:37 PM Chris Cannam

Update to Redmine 2.4 branch rev 12663
1339:c03a6c3c4db9 2013-06-20 02:34 PM Luis Figueira

Merge
1338:25603efa57b5 2013-06-20 01:14 PM Chris Cannam

Merge from live branch
1337:077b8890835a 2013-06-20 01:14 PM Chris Cannam

Merge from live branch
1329:b2ea0641f798 2013-06-20 08:47 AM Chris Cannam

Merge from redmine-2.2-integration branch. We're going live!
1298:4f746d8966dd 2013-06-14 09:28 AM Chris Cannam

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
1295:622f24f53b42 2013-06-14 09:02 AM Chris Cannam

Update to Redmine SVN revision 11972 on 2.3-stable branch
1116:bb32da3bea34 2013-01-07 02:41 PM Chris Cannam

Merge from live
1115:433d4f72a19b 2013-01-07 12:01 PM Chris Cannam

Update to Redmine SVN revision 11137 on 2.2-stable branch
940:9fda6880be81 2012-07-11 02:35 PM Chris Cannam

Merge from the default branch
935:fe0249c097f6 2012-07-11 01:33 PM Chris Cannam

Merge from the default branch
927:9ee5fd0b9bd3 2012-05-11 04:13 PM Luis Figueira

Merge from cannam_integration
926:b73a59a6acbd 2012-05-11 04:10 PM Luis Figueira

Merge from cannam_integration
912:5e80956cc792 2012-02-27 01:53 PM Chris Cannam

Merge from branch "redmine-1.3"
909:cbb26bc654de 2012-02-24 07:09 PM Chris Cannam

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)
524:1248a47e81b3 2011-07-25 02:39 PM Luis Figueira

Merge from branch "luisf"
523:0b6c82dead28 2011-07-25 02:23 PM Luis Figueira

Merge from branch "cannam"
514:7eba09d624db 2011-07-14 10:50 AM Chris Cannam

Merge
511:107d36338b70 2011-07-14 10:43 AM Chris Cannam

Merge from branch "cannam"
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
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"
192:d1713ab10813 2011-02-07 12:30 PM Luis Figueira

feature_64: link to terms and conditions wiki page; fixed form resubmission bug.
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"
62:39db1b84d09f 2010-12-03 09:54 AM Luis Figueira

User can register. BUG: Manager cannot approve user.
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.
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)
0:513646585e45 2010-07-23 03:52 PM Chris Cannam
  • Import Redmine trunk SVN rev 3859