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 / activities @ 1531:ae8145b28b2b

# Date Author Comment
1527:c3edf97ea198 2014-09-11 12:46 PM Chris Cannam

Merge from live branch

1526:404aa68d4227 2014-09-11 12:46 PM Chris Cannam

Merge from live branch

1525:fb9a13467253 2014-09-11 12:45 PM Chris Cannam

Merge from branch redmine-2.5-integration

1520:a1bdbf8a87d5 2014-09-09 10:02 AM Chris Cannam

Merge from branch "redmine-2.4-integration"

1519:afce8026aaeb 2014-09-09 09:34 AM Chris Cannam

Merge from branch "live"

1504:0fcf95cec435 2014-03-21 01:14 PM Chris Cannam

Merge from branch cannam

1501:467282ce64a4 2014-03-21 01:03 PM Chris Cannam

Add varied-mature-projects Featured box

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

1361:7c0909052511 2013-07-18 12:21 PM Chris Cannam

Merge from live branch

1356:a6a25685e5a6 2013-07-18 12:19 PM Chris Cannam

Merge from live branch

1349:4ff3f8b81ab3 2013-07-11 05:32 PM Luis Figueira

Merge from live.

1346:befaf13fec0d 2013-06-21 03:05 PM Chris Cannam

I think we have room for 7 projects here, rather than 5

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

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

1190:91db8e091f10 2013-01-22 03:45 PM Chris Cannam

Remove My Projects from projects list (now in My Page)

1187:7f57e82048a4 2013-01-22 02:49 PM Chris Cannam

Merge

1186:e19f375f9afa 2013-01-22 02:49 PM Chris Cannam

Score activity to favour more recent events

1185:f37237021a46 2013-01-22 02:14 PM Chris Cannam

Merge

1184:1027f0f3a81a 2013-01-22 02:12 PM Chris Cannam

Make "busy projects" and "recent projects" look uniform

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

1096:8b57fd618c84 2012-11-29 02:38 PM Luis Figueira

Merge

1091:3d387b121e85 2012-11-26 05:39 PM Luis Figueira

Merge

1081:b56a4c5afa35 2012-11-22 05:26 PM Chris Cannam

Merge from branch cannam

1078:b9e34a051f82 2012-11-21 05:56 PM Chris Cannam

Merge from live branch

1063:6f464526403b 2012-11-19 07:57 PM Luis Figueira

Merge

1061:01076ed49ffc 2012-11-19 07:50 PM Luis Figueira

Merge from live site's latest changes.

1040:ff783f2cc500 2012-11-13 03:08 PM Chris Cannam

Merge from branch cannam

1031:873d052b361b 2012-11-13 10:37 AM Chris Cannam

Merge from browsing 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

1021:967fb7e62b1d 2012-11-13 10:35 AM Chris Cannam

Include only public projects in busy institutions / projects queries, so results can be cached (the tag cloud was already public projects only). Introduce tentatively some cacheing thingies

1020:e816ffefcb71 2012-11-13 10:24 AM Chris Cannam

Use setting for number of activities days rather than hardcoding it

1015:52be96e83080 2012-11-12 03:17 PM Chris Cannam

Merge from branch "live"

1012:bbca6f4eebc7 2012-11-12 02:40 PM Chris Cannam

Merge from branch "browsing"

1011:f44860e089c5 2012-11-12 02:38 PM Chris Cannam

Refactor into activities helper

1009:066b55d7c053 2012-11-12 01:34 PM Chris Cannam

Add busy institutions list

1006:4ffe9098c16c 2012-11-09 05:41 PM Chris Cannam

Busy-projects partial, etc

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

918:04114f36670d 2012-03-06 02:07 PM Chris Cannam

Rename .erb to .html.erb in line with the convention

915:2a68662d5adf 2012-03-02 12:37 PM Luis Figueira

needs further testing Moved several files' extension to ".erb"; modified two files because they were calling partials/templates with rhtml extensions; renamed email templates sent when a user is added to a publication.

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

Merge from branch "redmine-1.3"

911:487d96eac004 2012-02-24 08:18 PM Chris Cannam

Remove .svn directories from subdirectories in preparation for merging from newer svn repo format

909:cbb26bc654de 2012-02-24 07:09 PM Chris Cannam

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

907:df51e8ff578d 2012-02-24 06:29 PM Chris Cannam

Remove .svn directories from subdirectories in preparation for merging from newer svn repo format

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)

368:f3d8335d4e71 2011-04-01 12:13 PM Chris Cannam

Merge from branch "bug_127"

362:d1eb5d381a77 2011-04-01 11:41 AM Chris Cannam

Merge

361:30f68ecfdde4 2011-04-01 11:41 AM Chris Cannam

Formatting for Latest News box -- make it much more like the Recent Activity layout. Also adjust the date formatting in Latest Projects likewise.

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

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

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)
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