Skip to content

Commit e4ccff3

Browse files
kimchouardkimchouard
committed
Merge branch 'master' into v2.0
Conflicts: data/featured.json data/org.json index.html params.json stylesheets/styles.css
2 parents 11f17eb + a1fa9c8 commit e4ccff3

File tree

3 files changed

+434
-14
lines changed

3 files changed

+434
-14
lines changed

‎index.html‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
<!DOCTYPE html>
32
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en" > <![endif]-->
43
<!--[if gt IE 8]><!--> <html class="no-js" lang="en" ng-app="AdobeOpenSource"> <!--<![endif]-->
@@ -293,6 +292,17 @@ <h5 class="details">...and with <a target="_blank" href="http://angularjs.org/"
293292
</div>
294293
</div>
295294

295+
<!-- Google Analytics -->
296+
<script>
297+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
298+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
299+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
300+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
301+
302+
ga('create', 'UA-46814863-1', 'github.com');
303+
ga('send', 'pageview');
304+
</script>
305+
296306
<!--[if gte IE 10]><!-->
297307
<script src="js/vendor/custom.modernizr.js"></script>
298308
<script type="text/javascript" src="//use.typekit.net/gad4asz.js"></script>
@@ -309,19 +319,7 @@ <h5 class="details">...and with <a target="_blank" href="http://angularjs.org/"
309319
<script src="js/dcjs/dc.min.js"></script>
310320
<!--<![endif]-->
311321
<script src="js/script.js"></script>
312-
313-
<!-- Analytics Google
314-
<script>
315-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
316-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
317-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
318-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
319-
320-
ga('create', 'UA-46814863-1', 'github.com');
321-
ga('send', 'pageview');
322-
323-
</script>
324-
-->
322+
325323

326324
<!-- Unused Foundation scripts
327325
<script src="js/foundation/foundation.abide.js"></script>

‎params.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"name":"Adobe Open Source","tagline":"Advancing technology through open initiatives","body":"### Welcome to Adobe's open source on Github ![Adobe standard logo]( http://adobe.github.com/img/adobe_logo_standard_png.png)\r\n\r\n##**New and Noteworthy**:\r\n\r\n[**Cordova 3.3:** ](http://projects.apache.org/projects/cordova.html) Cordova 3.3 released (leaves the github site)\r\n\r\n[**ActionScript® 4 specification:** ](https://github.com/adobe-research/ActionScript4) The ActionScript® 4.0 Language Specification \r\n\r\n[**ShaderDSL**: ](https://github.com/adobe-webplatform/shaderdsl) is a compiler from a subset of JavaScript to GLSL. ShaderDSL.js allows you to write GLSL shaders in plain JavaScript, instead of the C like (GLSL) language used today.\r\n\r\n\r\n\r\n## **Organizations:**\r\n(Adobe groups that are releasing technology under open source. There may be multiple projects under each organization)\r\n\r\n[**Adobe:** ](https://github.com/adobe) Repository for certain Adobe Open Source releases\r\n\r\n[**Adobe Muse:** ](https://github.com/Adobe-Muse) Repository for releases from the Adobe Muse team\r\n\r\n[**Adobe Marketing Cloud:** ](https://github.com/organizations/Adobe-Marketing-Cloud/) Open source SDKs. samples and boilerplate from the Adobe Marketing Cloud\r\n\r\n[**Adobe Security:** ](https://github.com/adobe-security) Tools and techniques from Adobe Security\r\n\r\n[**Adobe Research:** ](https://github.com/adobe-research) Technology and cool stuff from Adobe Research\r\n\r\n[**Adobe Web Platform:** ](https://github.com/adobe-Webplatform) Technology relating to the web from Adobe Web Platform\r\n\r\n[**Adobe Fonts:** ](https://github.com/adobe-fonts) Open fonts and related technology from the Adobe Font teams\r\n\r\n[**Adobe CloudOps:** ](https://github.com/Adobe-CloudOps) Techniques and technology from the Adobe Cloud Operations\r\n\r\n[**Brackets:** ](http://www.brackets.io/) An open source code editor for the web, written in JavaScript, HTML and CSS\r\n\r\n[**Edge Code:** ](https://github.com/edge-code) The source for Edge code related technology\r\n\r\n[**Topcoat**: ](https://github.com/topcoat/topcoat) UI Library for creating beautiful and responsive applications using web standards\r\n\r\n[**Adobe Flash**: ](https://github.com/adobe-flash) Technology releases relating to Adobe Flash\r\n\r\n[**Adobe Photoshop**: ](https://github.com/adobe-photoshop) Adobe Photoshop teams open source technology releases\r\n\r\n## **Popular Projects**:\r\n\r\n[**Brackets:** ](http://www.brackets.io/) An open source code editor for the web, written in JavaScript, HTML and CSS\r\n\r\n[**Source Sans Pro:** ](https://github.com/adobe/source-sans-pro) OpenType fonts that have been designed to work well in user interface (UI) environments\r\n\r\n[**Source Code Pro:** ](https://github.com/adobe/source-code-pro) OpenType fonts that have been designed to work well in code environments\r\n\r\n[**CSS Filterlab:** ](https://github.com/adobe/cssfilterlab) Browser-based tool that lets you use and modify CSS filters and see the effects in real time \r\n\r\n[**Balanced Text:** ](https://github.com/adobe-webplatform/balance-text) jQuery plugin for implementing balancing of wrapping text in a web page\r\n\r\n[**Phonegap:** ](http://github.com/phonegap) Web platform that exposes native mobile device apis and data to JavaScript. PhoneGap is a distribution of [Apache Cordova](http://cordova.apache.org/)\r\n\r\n[**Generator**: ](https://github.com/adobe-photoshop) is a JavaScript-based extensibility technology for Adobe Photoshop CC.\r\n\r\n[**Theseus**: ](https://github.com/adobe-research/theseus) is a new type of JavaScript debugger for Node.js, Chrome, and both simultaneously. It is an extension for the Brackets code editor. Theseus is part of a collaboration between the User Interface Design Group at MIT CSAIL and Adobe Research.\r\n\r\n***","google":"UA-40048712-1","note":"Don't delete this file! It's used internally to help with page regeneration."}

0 commit comments

Comments
 (0)