X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docs%2Frelease-notes.rst;h=1e6deb4bedf11ad71e2de1f681a5ec25b9b831a1;hb=749749f288de7ef42e3d1507c7f07a4453a774b4;hp=ff4e6b9e72df5752a03f3324f0d976f13a069bf2;hpb=5b686151904e2582ea9ce9d2f1c6abb7a400afa5;p=portal%2Fric-dashboard.git

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index ff4e6b9e..1e6deb4b 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -16,17 +16,49 @@
 .. limitations under the License.
 .. ===============LICENSE_END=========================================================
 
-===========================
 RIC Dashboard Release Notes
 ===========================
 
-Version 1.0.5, 28 June 2019
----------------------------
+Version 1.2.1, ? Aug 2019
+-------------------------
+* Add EPSDK-FW user management and Portal security
+
+Version 1.2.0, 23 Aug 2019
+--------------------------
+* Split URL properties into prefix/suffix parts
+* Add jacoco plugin to back-end for code coverage
+* Compile with Java version 11, use base openjdk:11-jre-slim
+* Clean code of issues reported by Sonar
+* Drop mock RAN names feature that supported R1 testing
+* Extend mock endpoints to simulate delay seen in tests
+* Move mock configuration classes into test area
+* Update App manager client to spec version 0.1.7
+* Update E2 manager client to spec version 20190815
+* Add controller for page refresh of Angular routes
+* Extend E2 mock configuration for demo purposes
+* Add pattern for matching AC/admin application name
+* Add custom (plain but not white-label) error page
+* Synch A1 method paths in front-end and back-end
+* Add xapp dynamic configuration feature
+* Disable x-frame-options response header
+* Repair app manager undeploy-app back/front methods
+* Display AC xAPP metrics data via Kibana source (metrics.url.ac) on dashboard
+* Pass AC policy parameter without parsing as JSON
+* Use snake_case (not camelCase) names in AC policy front end
+* Update A1 mediator client to spec version 0.10.3
+* Extend AC control screen to read policy from A1
+
+Version 1.0.5, 5 July 2019
+--------------------------
 * Upgrade to Angular version 8
 * Upgrade to Spring-Boot 2.1.6.RELEASE
-* Fixed AC xApp policy page title is not aligned
-* Update E2 manager client to spec version 20190626
+* Align AC xApp policy page title
+* Update E2 manager client to spec version 20190703
 * Add configuration-driven mock of E2 getNodebIdList
+* Revise front-end components to use prefix 'rd'
+* Improve error handling in BE and FE code
+* Revise the notification service to display multiple notifications
+* Add JUnit test cases for controller methods
 
 Version 1.0.4, 27 June 2019
 ---------------------------
@@ -49,13 +81,8 @@ Version 1.0.4, 27 June 2019
 * Update App manager client to spec version 0.1.5
 * Move RAN connection feature to control screen
 * Rework admin table
-<<<<<<< HEAD
 * Update the notification service
-* Remove the RAN connection invocation link from left menu and move it to control screen
-=======
-* Update the notification service 
 * Move RAN connection feature to control screen
->>>>>>> Upgrade E2 to version 20190626
 * Repair deploy-app feature and use icon instead of text button
 
 Version 1.0.3, 28 May 2019