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 / my_controller.rb @ 1297:0a574315af3e

History | View | Annotate | Download (7.49 KB)

# Date Author Comment
1297:0a574315af3e 2013-06-14 09:07 AM Chris Cannam

Merge from branch "redmine-2.2"
1295:622f24f53b42 2013-06-14 09:02 AM Chris Cannam

Update to Redmine SVN revision 11972 on 2.3-stable branch
1294:3e4c3460b6ca 2013-06-14 09:01 AM Chris Cannam

Update to Redmine SVN revision 11972 on 2.2-stable branch
1229:96790506f247 2013-03-13 10:48 AM Chris Cannam

Merge from branch "cannam"
1228:44475ccf56d3 2013-03-12 03:44 PM Chris Cannam

Merge from branch "live"
1226:d280360758e5 2013-03-12 03:26 PM Chris Cannam

Fix dodgy merge, syntax, defaults
1225:edf7563e2653 2013-03-12 03:14 PM Chris Cannam

Merge from branch "cannam"
1222:2c59ee348e2b 2013-03-12 02:39 PM Chris Cannam

Logger, reinstate this box as default
1218:194867efafa9 2013-03-12 01:00 PM Chris Cannam

Merge from branch "cannam"
1217:875b5b4c574d 2013-03-12 01:01 PM Chris Cannam

Add "People I'm working with" as My Page box -- currently off by default
1210:16826c3afbba 2013-01-23 01:15 PM Chris Cannam

Merge from branch "live"
1209:1b1138f6f55e 2013-01-23 01:11 PM Chris Cannam

Merge from branch live
1199:bae194c52296 2013-01-23 11:10 AM Chris Cannam

Merge from branch cannam
1165:6a10e5fbf8b2 2013-01-21 02:17 PM Chris Cannam

Merge from branch "feature_550"
1164:a943f341c99d 2013-01-21 02:12 PM Chris Cannam

Make "my projects" box on My Page look nice when user has no projects (invite them to create one)
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
1086:5ebdeb79ea9c 2012-11-23 02:29 PM Chris Cannam

Add "My Page" box for my projects. Currently this also affects the layout of the non-My-Page version of the My Projects list, need to adjust that
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"
510:1afe06d9ba94 2011-07-14 10:42 AM Chris Cannam

Merge from branch "cannam"
486:4c0d58c5d1e0 2011-07-11 04:42 PM Chris Cannam

Merge
485:ef125e1f3a10 2011-07-11 04:42 PM Chris Cannam

Remove Calendar from default blocks in My Page
443:350acce374a2 2011-06-06 02:55 PM Chris Cannam

Merge from branch "cannam-pre-20110113-merge"
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
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.
164:bb9724ba3d60 2011-01-31 08:59 PM Luis Figueira

my account view working correctly.
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
0:513646585e45 2010-07-23 03:52 PM Chris Cannam
  • Import Redmine trunk SVN rev 3859