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 / activities_controller.rb @ 1298:4f746d8966dd

History | View | Annotate | Download (3.37 KB)

# Date Author Comment
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
1078:b9e34a051f82 2012-11-21 05:56 PM Chris Cannam

Merge from live branch
1027:b0e0ffb43fa1 2012-11-13 01:25 PM Luis Figueira

Merge
1026:b42553f6df71 2012-11-13 01:23 PM Luis Figueira

Merge
1025:02ee54197879 2012-11-13 12:10 PM Luis Figueira

Merge
1022:f2ec92061fca 2012-11-13 10:35 AM Chris Cannam

Merge from live branch
1015:52be96e83080 2012-11-12 03:17 PM Chris Cannam

Merge from branch "live"
1014:e3f78fa30a36 2012-11-12 03:17 PM Chris Cannam

Again avoid bombing out when faced with odd events
1012:bbca6f4eebc7 2012-11-12 02:40 PM Chris Cannam

Merge from branch "browsing"
1009:066b55d7c053 2012-11-12 01:34 PM Chris Cannam

Add busy institutions list
927:9ee5fd0b9bd3 2012-05-11 04:13 PM Luis Figueira

Merge from cannam_integration
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)
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)
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