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 / blocks / _colleagues.html.erb @ 1330:441b66f148b6

History | View | Annotate | Download (272 Bytes)

# Date Author Comment
1330:441b66f148b6 2013-06-20 11:32 AM Chris Cannam

HTML-safe the active colleagues box
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"
1224:30c444ea1338 2013-03-12 03:15 PM Chris Cannam

Various fixes to colleagues box
1221:658b403da20a 2013-03-12 01:24 PM Chris Cannam

Merge
1219:3286032e15cf 2013-03-12 01:24 PM Chris Cannam

Some layout and fixes
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