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 / users_controller.rb @ 912:5e80956cc792

History | View | Annotate | Download (10.3 KB)

# Date Author Comment
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"
510:1afe06d9ba94 2011-07-14 10:42 AM Chris Cannam

Merge from branch "cannam"
508:851510f1b535 2011-07-14 10:37 AM Chris Cannam

Merge from branch "redmine-1.2"
507:0c939c159af4 2011-07-14 10:32 AM Chris Cannam

Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
442:753f1380d6bc 2011-06-06 02:41 PM Chris Cannam

Merge from branch "redmine-1.2"
441:cbce1fd3b1b7 2011-06-06 02:24 PM Chris Cannam

Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
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"
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.
187:752184172a34 2011-02-03 03:34 PM Chris Cannam

Merge from branch "feature_55"
185:594ed6aef7bd 2011-02-03 03:31 PM Luis Figueira

fixed issue with users with no entry in the ssamr_user_details_table.
added javascript for those users in the my/account view.
184:b46db3a8b1b4 2011-02-03 03:15 PM Chris Cannam

Merge from branch "feature_55"
169:bc23796a7120 2011-02-01 05:50 PM Luis Figueira

ssamr validation on my/account is now done correctly
other small bug fixes.
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)
108:d70a0b926135 2010-12-17 01:02 PM Luis Figueira

Feature #52: All users can now view and edit their description and university
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
104:0511601cda6b 2010-12-16 06:16 PM Luis Figueira

DEV commit: editing the show method in the users controller
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.
94:fb3d7118d65f 2010-12-16 01:04 PM Chris Cannam

Merge from branch "luisf"
93:7366fb57fce9 2010-12-16 01:02 PM Luis Figueira

Merge
92:e408a3f7089f 2010-12-16 12:11 PM Luis Figueira

Bug #45 - fixed the user show method in the users view
84:432bb11e0390 2010-12-16 10:03 AM Chris Cannam

Merge from branch "luisf"
63:b5bd39e27658 2010-12-03 01:14 PM Luis Figueira

Users status can now be changed (activated/locked)
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.
58:e77d73b181e3 2010-11-30 05:49 PM Luis Figueira

Wrong naming convention correction.
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)
0:513646585e45 2010-07-23 03:52 PM Chris Cannam
  • Import Redmine trunk SVN rev 3859