inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59390: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59389: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59388: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8)
            - A few extra 4.x changes were required
            59380: MNT-10285 : Clone: Copyright notice shows Alfresco Software, Inc. © 2005-2013All rights reserved.... should now be to 2014
            Update Copyright notice to 2014.
            59387: MNT-10285 : Clone: Copyright notice shows Alfresco Software, Inc. © 2005-2013All rights reserved.... should now be to 2014
            Update Copyright notice to 2014 in enterprise overlays.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:34:38 +00:00
parent 373ee43b2e
commit 91e4fcfa7c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/web/ui/repo/tag/PageTag.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2013 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -101,7 +101,7 @@ public class PageTag extends TagSupport
"<a class='footer' href='http://www.alfresco.com'>Alfresco</a> or its " + "<a class='footer' href='http://www.alfresco.com'>Alfresco</a> or its " +
"<a class='footer' href='http://www.alfresco.com/partners/'>Certified Partners</a>. " + "<a class='footer' href='http://www.alfresco.com/partners/'>Certified Partners</a>. " +
"<a class='footer' href='http://www.alfresco.com/services/support/'>Click here for support</a>. " + "<a class='footer' href='http://www.alfresco.com/services/support/'>Click here for support</a>. " +
"Alfresco Software Inc. &copy; 2005-2013 All rights reserved."; "Alfresco Software Inc. &copy; 2005-2014 All rights reserved.";
private final static Log logger = LogFactory.getLog(PageTag.class); private final static Log logger = LogFactory.getLog(PageTag.class);
private static String alfresco = null; private static String alfresco = null;

4
source/web/jsp/dialog/about.jsp
View File

@@ -1,5 +1,5 @@
<%-- <%--
* Copyright (C) 2005-2013 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -37,7 +37,7 @@
<div style="padding:4px"> <div style="padding:4px">
<a href="http://www.alfresco.com/" class="title" target="new">http://www.alfresco.com</a> <a href="http://www.alfresco.com/" class="title" target="new">http://www.alfresco.com</a>
<p> <p>
Alfresco Software Inc. &copy; 2005-2013 All rights reserved. <a href="http://www.alfresco.com/legal/" target="new">Legal and License</a> Alfresco Software Inc. &copy; 2005-2014 All rights reserved. <a href="http://www.alfresco.com/legal/" target="new">Legal and License</a>
</div> </div>
<div style="padding:4px" class="mainSubTitle"> <div style="padding:4px" class="mainSubTitle">