From bffb8cb06c1ccc5f14e66936922dff1f6d25e71d Mon Sep 17 00:00:00 2001
From: Konstantinos Platis <konstantinos.platis@cern.ch>
Date: Wed, 24 Apr 2019 17:08:35 +0200
Subject: [PATCH] Updated README/CHANGELOG/version of module

---
 CHANGELOG.md                  | 37 ++++++++++++++---------------------
 README.md                     | 18 +++++++++--------
 cern_display_formats.info.yml |  4 ++--
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc5b6a7..b39942b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< CHANGELOG.md
 # Changelog
 
 All notable changes to this project will be documented in this file.
@@ -6,31 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.2.0] - 26-02-2019
-### Fixed
-- Error in views that use Horizontal Boxes [provided default value]
-- Fixed default-row-class value being kept even after overriden
 
-### Added
-- Collision display format
-- Countdown display format
-- Teaser List display format
+## [1.3.0] - 24-04-2019
+- Added Vertical Boxes display format
+- Added Featured Banner display format
+- Fixed issue of Accordion display format grouped rows
 
-### Changed
+## [1.2.0] - 26-02-2019
+- Fixed error in views that use Horizontal Boxes [provided default value]
+- Fixed default-row-class value being kept even after overriden
+- Added Collision display format
+- Added Countdown display format
+- Added Teaser List display format
 - Improved code by changing format conditionals (name to ID)
-- Font-size of Teaser List
+- Changed font-size of Teaser List
 
 ## [1.1.0] - 22-11-2018
-### Added
-- Accordion as display format
-
-### Changed
-- Conditions for Horizontal Boxes
-
-### Removed
-- Debugging conditions
+- Added Accordion as display format
+- Changed conditions for Horizontal Boxes
+- Removed debugging conditions
 
 ## [1.0.0] - 04-10-2018
-### Added
-- Horizontal Boxes as display format
-
+- Added Horizontal Boxes as display format
\ No newline at end of file
diff --git a/README.md b/README.md
index ee989ee..9c4a00e 100755
--- a/README.md
+++ b/README.md
@@ -2,14 +2,16 @@
 
 Provides a set of display formats designed for the needs of the CERN users.
 
-Until v1.2.0 the implemented display formats are:
-
-* Accordion: Renders the content in an accordion type style.
-* Horizontal Boxes: Renders the content in a style of cards with the option to use carousel to navigate.
-* Accordion: Renders the view rows in the style of an accordion
-* Teaser List: Renders the view rows the one under the other with appropriate spacing
-* Collision: Renders the view rows creating a "collision" effect
-* Countdown: Renders the view row with a countdown effect
+Until v1.3.0 the implemented display formats are:
+
+* **Accordion**: Renders the content in an accordion type style.
+* **Horizontal Boxes**: Renders the content in a style of cards with the option to use carousel to navigate.
+* **Accordion**: Renders the view rows in the style of an accordion
+* **Teaser List**: Renders the view rows the one under the other with appropriate spacing
+* **Collision**: Renders the view rows creating a "collision" effect
+* **Countdown**: Renders the view row with a countdown effect
+* **Vertical Boxes**: Renders the view rows in a vertical position
+* **Featured Banner**: Renders the view using the Featured Banner template
 
 ## Getting Started
 
diff --git a/cern_display_formats.info.yml b/cern_display_formats.info.yml
index d700dcd..2f8327d 100755
--- a/cern_display_formats.info.yml
+++ b/cern_display_formats.info.yml
@@ -2,8 +2,8 @@ name: CERN Display Formats
 type: module
 description: 'Provides a set of display formats designed for the needs of the CERN users.'
 package: Web Team Drupal Library
-version: 1.3.0-dev
+version: 1.3.0
 core: '8.x'
 dependencies:
   - drupal:views
-  - cern_components (>=8.x-2.4.0)
+  - cern_components (>=8.x-2.4.0)
\ No newline at end of file
-- 
GitLab