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 / my @ 825:48af1a50d2c8

# Date Author Comment
825:48af1a50d2c8 2012-01-31 12:48 PM Chris Cannam

Merge
824:c62a0b66bd38 2012-01-31 12:47 PM Chris Cannam

Add New Project link to My page, fixing #361
723:d41bf754c0f2 2011-10-20 04:36 PM Luis Figueira

Merge from branch "live"
695:1710ec37bb6a 2011-09-16 06:40 PM Luis Figueira

Merge from branch "feature_36"
688:1f488f375d64 2011-09-16 03:49 PM Chris Cannam

Merge from branch "live"
662:cd9499a11381 2011-09-09 04:34 PM Chris Cannam

Merge from branch "cannam"
641:b4e9410882f1 2011-09-06 12:24 PM Chris Cannam

Merge from branch "cannam"
636:12701b2e1bfc 2011-09-06 11:31 AM Chris Cannam

Change "View all issues" to "View all watched issues" for watched issues box in My Page
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)
443:350acce374a2 2011-06-06 02:55 PM Chris Cannam

Merge from branch "cannam-pre-20110113-merge"
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)
380:6627ac1de32b 2011-04-04 10:31 AM Chris Cannam

Merge from branch "cannam-pre-20110113-merge" (includes merge from feature_121)
379:f25c73364bfb 2011-04-04 10:29 AM Chris Cannam

Merge from branch "feature_121"
378:c80fd1ef305f 2011-04-04 10:28 AM Chris Cannam

Ensure Recent Activity shows only activity on projects the user is actually a member of, if invoked from My Page (rather than on all permitted projects)
369:a70a6b9df76b 2011-04-01 12:13 PM Chris Cannam

Merge from branch "feature_124"
364:7a616ddc3331 2011-04-01 12:03 PM Chris Cannam

Merge
363:ce85aa993384 2011-04-01 11:56 AM Chris Cannam

Add Tip of the Day as a block for My Page (on by default)
348:8d0e011332ef 2011-03-31 03:23 PM Chris Cannam

Merge from branch "feature_122"
346:712264d5d60a 2011-03-31 03:21 PM Chris Cannam

Merge
344:1a514b9347d4 2011-03-31 03:19 PM Chris Cannam

Add Recent Activity partial, include it as a block in My Page (on by default) and in the project information page
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
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"
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
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.
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
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