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 / _busy.html.erb @ 1356:a6a25685e5a6

History | View | Annotate | Download (1.06 KB)

# Date Author Comment
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
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
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
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