From 6baec6cf81d8297b0d532f1d45519ba10b3add34 Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Mon, 19 Feb 2018 17:04:25 +0000 Subject: [PATCH 1/2] docs(misc): add version-support-status page Closes #16058 Closes #16458 --- README.md | 7 ++- docs/app/assets/css/docs.css | 8 +++ docs/content/api/index.ngdoc | 10 +++- .../content/misc/version-support-status.ngdoc | 54 +++++++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 docs/content/misc/version-support-status.ngdoc diff --git a/README.md b/README.md index ae444e3ccdb8..18c29901c70d 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,12 @@ It also helps with server-side communication, taming async callbacks with promis and it makes client-side navigation and deep linking with hashbang urls or HTML5 pushState a piece of cake. Best of all? It makes development fun! +##### AngularJS will be moving to Long Term Support (LTS) mode on July 1st: [Find out more](misc/version-support-status) + +##### Looking for the new Angular? Go here: https://github.com/angular/angular + +-------------------- + * Web site: https://angularjs.org * Tutorial: https://docs.angularjs.org/tutorial * API Docs: https://docs.angularjs.org/api @@ -20,7 +26,6 @@ piece of cake. Best of all? It makes development fun! * Core Development: [DEVELOPERS.md](DEVELOPERS.md) * Dashboard: https://dashboard.angularjs.org -##### Looking for the new Angular? Go here: https://github.com/angular/angular Documentation -------------------- diff --git a/docs/app/assets/css/docs.css b/docs/app/assets/css/docs.css index 54d81ada753d..65abc5247f0c 100644 --- a/docs/app/assets/css/docs.css +++ b/docs/app/assets/css/docs.css @@ -934,6 +934,14 @@ toc-container > div > toc-tree > ul > li > toc-tree > ul > li toc-tree > ul li { font-size: 13px; } +.dev-status span { + padding: 2px 8px; + border-radius: 5px; +} +.security span { background-color: orange; } +.stable span { background-color: green; color: white; } +.current span { background-color: blue; color: white; } + @media handheld and (max-width:800px), screen and (max-device-width:800px), screen and (max-width:800px) { .navbar { min-height: auto; diff --git a/docs/content/api/index.ngdoc b/docs/content/api/index.ngdoc index 8b954a86bd05..78dbdf100bf7 100644 --- a/docs/content/api/index.ngdoc +++ b/docs/content/api/index.ngdoc @@ -3,7 +3,15 @@ @description # AngularJS API Docs -Welcome to the AngularJS API docs page. These pages contain the AngularJS reference materials for version . + +
+**AngularJS will be moving to Long Term Support (LTS) mode on July 1st.**: [Find out more](misc/version-support-status). +
+ +## Welcome to the AngularJS API docs page. + +These pages contain the AngularJS reference materials for version . + The documentation is organized into **{@link guide/module modules}** which contain various components of an AngularJS application. These components are {@link guide/directive directives}, {@link guide/services services}, {@link guide/filter filters}, {@link guide/providers providers}, {@link guide/templates templates}, global APIs, and testing mocks. diff --git a/docs/content/misc/version-support-status.ngdoc b/docs/content/misc/version-support-status.ngdoc new file mode 100644 index 000000000000..350ca6bd986c --- /dev/null +++ b/docs/content/misc/version-support-status.ngdoc @@ -0,0 +1,54 @@ +@ngdoc overview +@name Version Support Status +@description + +# Version Support Status + +This page describes the support status of the significant versions of AngularJS. + +
+ AngularJS is planning one more significant release, version 1.7, and on July 1, 2018 it will enter a 3 year Long Term Support period. +
+ +### Until July 1st 2018 + +Any version branch not shown (e.g. 1.5.x) is no longer being developed. + + + + + + + + + + +
VersionStatusComments
1.2.xSecurity patches onlyLast version to provide IE 8 support
1.6.xPatch ReleasesMinor features, bug fixes, security patches - no breaking changes
1.7.xActive Development1.7.0 (not yet released) will be the last release of AngularJS to contain breaking changes
+ +### After July 1st 2018 + +Any version branch not shown (e.g. 1.6.x) is no longer being developed. + + + + + + + + + +
VersionStatusComments
1.2.xLong Term SupportLast version to provide IE 8 support
1.7.xLong Term Support1.7.0 will be the last release of AngularJS to contain breaking changes
+ +### Long Term Support + +On July 1st 2018, we will enter a Long Term Support period for AngularJS. + +At this time we will focus exclusively on providing fixes to bugs that satisfy at least one of the following criteria: + +* A security flaw is detected in the 1.7.x branch of the framework +* One of the major browsers releases a version that will cause current production applications using AngularJS 1.7.x to stop working +* The jQuery library releases a version that will cause current production applications using AngularJS 1.7.x to stop working. + +### Blog Post + +You can read more about these plans in our [blog post announcement](https://blog.angular.io/stable-angularjs-and-long-term-support-7e077635ee9c). \ No newline at end of file From 0cda1d49278d0ccd85576f14f2cf631a19dce0d9 Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Tue, 20 Feb 2018 14:42:26 +0000 Subject: [PATCH 2/2] fixup! docs(misc): add version-support-status page --- README.md | 4 +++- docs/content/api/index.ngdoc | 2 +- docs/content/misc/version-support-status.ngdoc | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 18c29901c70d..c2d1a9db2981 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,9 @@ It also helps with server-side communication, taming async callbacks with promis and it makes client-side navigation and deep linking with hashbang urls or HTML5 pushState a piece of cake. Best of all? It makes development fun! -##### AngularJS will be moving to Long Term Support (LTS) mode on July 1st: [Find out more](misc/version-support-status) +-------------------- + +##### AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018: [Find out more](misc/version-support-status) ##### Looking for the new Angular? Go here: https://github.com/angular/angular diff --git a/docs/content/api/index.ngdoc b/docs/content/api/index.ngdoc index 78dbdf100bf7..d34ddfb64c1d 100644 --- a/docs/content/api/index.ngdoc +++ b/docs/content/api/index.ngdoc @@ -5,7 +5,7 @@ # AngularJS API Docs
-**AngularJS will be moving to Long Term Support (LTS) mode on July 1st.**: [Find out more](misc/version-support-status). +**AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018.**: [Find out more](misc/version-support-status).
## Welcome to the AngularJS API docs page. diff --git a/docs/content/misc/version-support-status.ngdoc b/docs/content/misc/version-support-status.ngdoc index 350ca6bd986c..aff4309393dd 100644 --- a/docs/content/misc/version-support-status.ngdoc +++ b/docs/content/misc/version-support-status.ngdoc @@ -12,7 +12,7 @@ This page describes the support status of the significant versions of AngularJS. ### Until July 1st 2018 -Any version branch not shown (e.g. 1.5.x) is no longer being developed. +Any version branch not shown in the following table (e.g. 1.5.x) is no longer being developed. @@ -27,7 +27,7 @@ Any version branch not shown (e.g. 1.5.x) is no longer being developed. ### After July 1st 2018 -Any version branch not shown (e.g. 1.6.x) is no longer being developed. +Any version branch not shown in the following table (e.g. 1.6.x) is no longer being developed.
@@ -35,7 +35,7 @@ Any version branch not shown (e.g. 1.6.x) is no longer being developed. - +
1.2.xLong Term SupportLast version to provide IE 8 support
1.7.xLong Term Support1.7.0 will be the last release of AngularJS to contain breaking changes
1.7.xLong Term SupportSee [Long Term Support](#long-term-support) section below.