# HG changeset patch # User Chris Cannam # Date 1328014186 0 # Node ID cb27dd527bd322645ba17cc6c8bdf498311fbdf1 # Parent 48af1a50d2c8191e1d2d484faa4e75b84eb963b8# Parent 67cbdbfbd741e4198cbff3f560d320287c13beed Merge from branch "live" diff -r 67cbdbfbd741 -r cb27dd527bd3 app/views/my/page.rhtml --- a/app/views/my/page.rhtml Mon Dec 05 20:52:29 2011 +0000 +++ b/app/views/my/page.rhtml Tue Jan 31 12:49:46 2012 +0000 @@ -1,5 +1,6 @@
<%= link_to l(:label_personalize_page), :action => 'page_layout' %> + <%= '| ' + link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>

<%=l(:label_my_page)%>

diff -r 67cbdbfbd741 -r cb27dd527bd3 unis.txt --- a/unis.txt Mon Dec 05 20:52:29 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,141 +0,0 @@ -University of Aberdeen -University of Abertay Dundee -Aberystwyth University -Anglia Ruskin University -University of the Arts London -Aston University -Bangor University -University of Bath -Bath Spa University -University of Bedfordshire -Birkbeck, University of London -University of Birmingham -Birmingham City University -Birmingham Conservatoire -University Centre at Blackburn College -University of Bolton -Bournemouth University -University of Bradford -University of Brighton -University of Bristol -Brunel University -University of Buckingham -Buckinghamshire New University -University of Cambridge -Institute of Cancer Research, University of London -Canterbury Christ Church University -Cardiff University -University of Central Lancashire -Central School of Speech and Drama, University of London -University of Chester -University of Chichester -City University London -Courtauld Institute of Art -Coventry University -Cranfield University -University for the Creative Arts -University of Cumbria -De Montfort University -University of Derby -University of Dundee -Durham University -University of East Anglia -University of East London -Edge Hill University -University of Edinburgh -Edinburgh Napier University -Institute of Education, University of London -University of Essex -University of Exeter -University of Glamorgan -University of Glasgow -Glasgow Caledonian University -University of Gloucestershire -Goldsmiths, University of London -University of Greenwich -Glyndŵr University -Heriot-Watt University -University of Hertfordshire -Heythrop College -University of Huddersfield -University of Hull -Hull York Medical School -Imperial College London -Keele University -University of Kent -King's College London -Kingston University -Lancaster University -University of Leeds -Leeds Metropolitan University -University of Leicester -University of Lincoln -University of Liverpool -Liverpool Hope University -Liverpool John Moores University -London Business School -London College of Music -London Metropolitan University -London School of Economics and Political Science -London School of Hygiene and Tropical Medicine -London South Bank University -Loughborough University -University of Manchester -Manchester Metropolitan University -Middlesex University -Newcastle University -University of Northampton -Northumbria University -University of Nottingham -Nottingham Trent University -The Open University -University of Oxford -Oxford Brookes University -Peninsula College of Medicine and Dentistry -University of Plymouth -University of Portsmouth -Queen's University Belfast -Queen Margaret University -Queen Mary, University of London -University of Reading -The Robert Gordon University, Aberdeen -Roehampton University -Royal Academy of Music -Royal College of Art -Royal Holloway, University of London -Royal Veterinary College -University of St Andrews -St George's, University of London -University of Salford -School of Advanced Study, University of London -School of Oriental and African Studies -School of Pharmacy, University of London -University of Sheffield -Sheffield Hallam University -University of Southampton -Southampton Solent University -Staffordshire University -University of Stirling -University of Strathclyde -University of Sunderland -University of Surrey -University of Sussex -Swansea Metropolitan University -Swansea University -University of Teesside -Thames Valley University -University of Ulster -University College London -University of Wales -University of Wales Institute, Cardiff -University of Wales, Newport -University of Wales, Trinity Saint David -University of Warwick -University of Westminster -University of the West of England -University of the West of Scotland -University of Winchester -University of Wolverhampton -University of Worcester -University of York -York St John University