You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2015/07/24 02:11:40 UTC
[1/2] archiva-site git commit: MRM-1896 fix point on good licence file
Repository: archiva-site
Updated Branches:
refs/heads/master 69a753468 -> c740abd4d
MRM-1896 fix point on good licence file
Project: http://git-wip-us.apache.org/repos/asf/archiva-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva-site/commit/1b59e2e0
Tree: http://git-wip-us.apache.org/repos/asf/archiva-site/tree/1b59e2e0
Diff: http://git-wip-us.apache.org/repos/asf/archiva-site/diff/1b59e2e0
Branch: refs/heads/master
Commit: 1b59e2e0fa50e6f86a4dd1af4f8eeb710d07f681
Parents: 69a7534
Author: Eric <Er...@192.168.1.15>
Authored: Fri Jul 24 01:40:52 2015 +0200
Committer: Eric <Er...@192.168.1.15>
Committed: Fri Jul 24 01:40:52 2015 +0200
----------------------------------------------------------------------
src/site/xdoc/download.xml.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-site/blob/1b59e2e0/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 1533419..8026209 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -25,7 +25,7 @@ under the License.
</properties>
<body>
<section name="Download Apache Archiva ${archivaReleaseVersion}">
- <p>Archiva is distributed under the <a href="http://archiva.apache.org/license.html}">Apache License, version 2.0</a>.</p>
+ <p>Archiva is distributed under the <a href="http://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
<subsection name="System Requirements">
<table>
<tr>
Re: [2/2] archiva-site git commit: analytics.js as external script to
avoid clash with mirror.cgi
Posted by Olivier Lamy <ol...@apache.org>.
Great! Thanks for the fix.
No worries for the weird name :-)
On 24 July 2015 at 10:58, Eric Barboni <Er...@irit.fr> wrote:
>
> Sorry for the wrong author name. Forget to reconfigure git config :-(
> shame on me
> I try to use git push origin
> +69a753468cb7530a61aafed89188c2b8ade3c13f:master
> but it's forbiden ( I guess it's safer :p)
>
> anlaytics.js works nice now with external script. No more mirror conflict
>
> Eric
>
> Le Vendredi 24 Juillet 2015 02:11 CEST, skygo@apache.org a écrit:
>
> > analytics.js as external script to avoid clash with mirror.cgi
> >
> > Project: http://git-wip-us.apache.org/repos/asf/archiva-site/repo
> > Commit:
> http://git-wip-us.apache.org/repos/asf/archiva-site/commit/c740abd4
> > Tree: http://git-wip-us.apache.org/repos/asf/archiva-site/tree/c740abd4
> > Diff: http://git-wip-us.apache.org/repos/asf/archiva-site/diff/c740abd4
> >
> > Branch: refs/heads/master
> > Commit: c740abd4da3cd3e0d6910269942b0ae0a6aaf42c
> > Parents: 1b59e2e
> > Author: Eric <Er...@192.168.1.15>
> > Authored: Fri Jul 24 01:54:28 2015 +0200
> > Committer: Eric <Er...@192.168.1.15>
> > Committed: Fri Jul 24 01:54:28 2015 +0200
> >
> > ----------------------------------------------------------------------
> > src/site/site.xml | 14 ++++++--------
> > 1 file changed, 6 insertions(+), 8 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/archiva-site/blob/c740abd4/src/site/site.xml
> > ----------------------------------------------------------------------
> > diff --git a/src/site/site.xml b/src/site/site.xml
> > index 4a375b6..51d62ba 100644
> > --- a/src/site/site.xml
> > +++ b/src/site/site.xml
> > @@ -26,8 +26,8 @@
> > <version>1.4</version>
> > </skin>
> >
> > -
> > -
> > +<!-- do not use fluido ga pattern use analytics.js instead-->
> > + <googleAnalyticsAccountId></googleAnalyticsAccountId>
> > <custom>
> > <fluidoSkin>
> > <topBarEnabled>true</topBarEnabled>
> > @@ -57,17 +57,15 @@
> > </custom>
> > <body>
> > <head>
> > - <!--<script type="text/javascript">
> > -
> (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
> > - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
> Date();a=s.createElement(o),
> > -
> m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
> > - })(window,document,'script','//
> www.google-analytics.com/analytics.js','ga');
> > + <!-- Google Analytics -->
> > + <script src='//www.google-analytics.com/analytics.js'></script>
> > + <script>
> > + window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new
> Date;
> >
> > ga('create', 'UA-140879-5', 'auto');
> > ga('send', 'pageview');
> >
> > </script>
> > - -->
> > </head>
> > <menu name="Introduction">
> > <item name="About" href="/index.html" />
> >
>
>
>
>
>
>
--
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy
Re: [2/2] archiva-site git commit: analytics.js as external script to avoid clash with mirror.cgi
Posted by Eric Barboni <Er...@irit.fr>.
Sorry for the wrong author name. Forget to reconfigure git config :-( shame on me
I try to use git push origin +69a753468cb7530a61aafed89188c2b8ade3c13f:master
but it's forbiden ( I guess it's safer :p)
anlaytics.js works nice now with external script. No more mirror conflict
Eric
Le Vendredi 24 Juillet 2015 02:11 CEST, skygo@apache.org a écrit:
> analytics.js as external script to avoid clash with mirror.cgi
>
> Project: http://git-wip-us.apache.org/repos/asf/archiva-site/repo
> Commit: http://git-wip-us.apache.org/repos/asf/archiva-site/commit/c740abd4
> Tree: http://git-wip-us.apache.org/repos/asf/archiva-site/tree/c740abd4
> Diff: http://git-wip-us.apache.org/repos/asf/archiva-site/diff/c740abd4
>
> Branch: refs/heads/master
> Commit: c740abd4da3cd3e0d6910269942b0ae0a6aaf42c
> Parents: 1b59e2e
> Author: Eric <Er...@192.168.1.15>
> Authored: Fri Jul 24 01:54:28 2015 +0200
> Committer: Eric <Er...@192.168.1.15>
> Committed: Fri Jul 24 01:54:28 2015 +0200
>
> ----------------------------------------------------------------------
> src/site/site.xml | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/archiva-site/blob/c740abd4/src/site/site.xml
> ----------------------------------------------------------------------
> diff --git a/src/site/site.xml b/src/site/site.xml
> index 4a375b6..51d62ba 100644
> --- a/src/site/site.xml
> +++ b/src/site/site.xml
> @@ -26,8 +26,8 @@
> <version>1.4</version>
> </skin>
>
> -
> -
> +<!-- do not use fluido ga pattern use analytics.js instead-->
> + <googleAnalyticsAccountId></googleAnalyticsAccountId>
> <custom>
> <fluidoSkin>
> <topBarEnabled>true</topBarEnabled>
> @@ -57,17 +57,15 @@
> </custom>
> <body>
> <head>
> - <!--<script type="text/javascript">
> - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
> - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
> - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
> - })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
> + <!-- Google Analytics -->
> + <script src='//www.google-analytics.com/analytics.js'></script>
> + <script>
> + window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
>
> ga('create', 'UA-140879-5', 'auto');
> ga('send', 'pageview');
>
> </script>
> - -->
> </head>
> <menu name="Introduction">
> <item name="About" href="/index.html" />
>
[2/2] archiva-site git commit: analytics.js as external script to
avoid clash with mirror.cgi
Posted by sk...@apache.org.
analytics.js as external script to avoid clash with mirror.cgi
Project: http://git-wip-us.apache.org/repos/asf/archiva-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva-site/commit/c740abd4
Tree: http://git-wip-us.apache.org/repos/asf/archiva-site/tree/c740abd4
Diff: http://git-wip-us.apache.org/repos/asf/archiva-site/diff/c740abd4
Branch: refs/heads/master
Commit: c740abd4da3cd3e0d6910269942b0ae0a6aaf42c
Parents: 1b59e2e
Author: Eric <Er...@192.168.1.15>
Authored: Fri Jul 24 01:54:28 2015 +0200
Committer: Eric <Er...@192.168.1.15>
Committed: Fri Jul 24 01:54:28 2015 +0200
----------------------------------------------------------------------
src/site/site.xml | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-site/blob/c740abd4/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 4a375b6..51d62ba 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -26,8 +26,8 @@
<version>1.4</version>
</skin>
-
-
+<!-- do not use fluido ga pattern use analytics.js instead-->
+ <googleAnalyticsAccountId></googleAnalyticsAccountId>
<custom>
<fluidoSkin>
<topBarEnabled>true</topBarEnabled>
@@ -57,17 +57,15 @@
</custom>
<body>
<head>
- <!--<script type="text/javascript">
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+ <!-- Google Analytics -->
+ <script src='//www.google-analytics.com/analytics.js'></script>
+ <script>
+ window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
ga('create', 'UA-140879-5', 'auto');
ga('send', 'pageview');
</script>
- -->
</head>
<menu name="Introduction">
<item name="About" href="/index.html" />