Merge remote-tracking branch 'origin/3.3' into 3.4

Dolibarr · Dec 30, 2013 · f0bda47 · f0bda47
2 parents 3e39cd2 + a59a015
commit f0bda47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
@@ -48,3 +48,8 @@ with
 //var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth);
 window.location.href=pRef
 * Replace hard coded string with i18n["String"];
+
+
+JCROP:
+------
+* Remove analytics tag into file index.html
diff --git a/htdocs/includes/jquery/plugins/jcrop/index.html b/htdocs/includes/jquery/plugins/jcrop/index.html
@@ -46,20 +46,5 @@ <h3>Jcrop Links</h3>
 </div>
 
 
-
-
-<!-- Below here for internal analysis {{{ -->
-
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-5176876-1");
-pageTracker._trackPageview();
-</script>
-
-<!-- }}} -->
-
 </body>
 </html>