diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..dfe6603096c41a67132708b312b38a185fd2d708
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Hallvard Trætteberg <hal@ntnu.no> Hallvard Trætteberg <hal@ntnu.no>
+Hallvard Trætteberg <hal@ntnu.no> Hallvard Traetteberg <hal@ntnu.no>
+Adrian Stoica <george.a.stoica@ntnu.no> Adrian Stoica <george.a.stoica@ntnu.no>
+Adrian Stoica <george.a.stoica@ntnu.no> georgeas <george.a.stoica@ntnu.no>
+Adrian Stoica <george.a.stoica@ntnu.no> George Adrian Stoica <george.a.stoica@ntnu.no>
+Pål-Edward Larsen <paaledwl@stud.ntnu.no> Pål-Edward Larsen <paaledwl@stud.ntnu.no>
+Pål-Edward Larsen <paaledwl@stud.ntnu.no> paaledwl <paaledwl@stud.ntnu.no>
diff --git a/lectures/build.gradle b/lectures/build.gradle
index 94ec6b78ea0c9f2d8518e03d92093dab28b3b941..2aa92bc14492ba53c6b05c24587d903429da3749 100644
--- a/lectures/build.gradle
+++ b/lectures/build.gradle
@@ -39,7 +39,7 @@ asciidoctorj {
}
// useIntermediateWorkDir = true
attributes toc: 'left',
- 'source-highlighter': 'highlight.js'
+ 'source-highlighter': 'highlightjs'
/*
extensions {
@@ -90,7 +90,7 @@ asciidoctorRevealJs {
}
revealjs {
- version '2.0.0' // why not '3.8.0'
+ version '2.0.0' // why not '3.8.0'
templateGitHub {
organisation = 'hakimel'
repository = 'reveal.js'
diff --git a/lectures/revealjs/07-documentation.adoc b/lectures/revealjs/07-documentation.adoc
index 199f047e1d323dcf38c4d4af167c149f8eddfc65..aa516f8fcc21f100915565c130b7be21f6bd3bf5 100644
--- a/lectures/revealjs/07-documentation.adoc
+++ b/lectures/revealjs/07-documentation.adoc
@@ -79,25 +79,25 @@ https://stfalcon.com/uploads/images/55c8bcff18b94.png
== Comments (3)
-``` java
- /**
- * Creates a LatLong object from a String, using a specific separator.
- * The format is <latitude><separator><longitude>.
- * @param s the String to parse
- * @param sep the separator
- * @return the new LatLong object
- */
- public static LatLong valueOf(final String s, final String sep) {
- final int pos = s.indexOf(sep);
- if (pos < 0) {
- throw new IllegalArgumentException("No '" + sep + "' in " + s);
- }
- final double lat = Double.valueOf(s.substring(0, pos).trim());
- final double lon = Double.valueOf(s.substring(pos + sep.length()).trim());
-
- return new LatLong(lat, lon);
- }
-```
+[source,java, role="stretch"]
+----
+/**
+ * Creates a LatLong object from a String, using a specific separator.
+ * The format is <latitude><separator><longitude>.
+ * @param s the String to parse
+ * @param sep the separator
+ * @return the new LatLong object
+ */
+public static LatLong valueOf(final String s, final String sep) {
+ final int pos = s.indexOf(sep);
+ if (pos < 0) {
+ throw new IllegalArgumentException("No '" + sep + "' in " + s);
+ }
+ final double lat = Double.valueOf(s.substring(0, pos).trim());
+ final double lon = Double.valueOf(s.substring(pos + sep.length()).trim());
+ return new LatLong(lat, lon);
+}
+----
== Over-documenting
@@ -121,7 +121,7 @@ https://miro.medium.com/max/1138/1*Pyxsc7Uixbitv5myywaA_Q.jpeg (Gary Larson comi
== Markdown
[.center-paragraph]
-Markdown is a lightweight markup language with plain text formatting syntax. Its design allows it to be converted to many output formats, but the original tool by the same name only supports HTML.[8] Markdown is often used to format readme files, for writing messages in online discussion forums, and to create rich text using a plain text editor.
+Markdown is a lightweight markup language with plain text formatting syntax. Its design allows it to be converted to many output formats, but the original tool by the same name only supports HTML. Markdown is often used to format readme files, for writing messages in online discussion forums, and to create rich text using a plain text editor.
[.smaller-40]
https://en.wikipedia.org/wiki/Markdown
diff --git a/lectures/revealjs/08-workflow-example.adoc b/lectures/revealjs/08-workflow-example.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..bb6a78a99540c7da9f643f3567ab4846695a24c0
--- /dev/null
+++ b/lectures/revealjs/08-workflow-example.adoc
@@ -0,0 +1,97 @@
+= Workflow Example
+:customcss: slides.css
+:icons: font
+
+++++
+ <img id="main-logo" class="main-logo" src="images/template/main_logo_eng_no_text.png" width="300" alt="ntnu logo"/>
+++++
+
+[.smaller-80][.center-paragraph]
+IT1901 Fall 2019 - 8th Lecture
+
+
+[background-color = "#124990"]
+[color = "#fff6d5"]
+== Overview
+
+- User story
+- Issues
+- Git flow
+
+[background-color = "#124990"]
+[color = "#fff6d5"]
+== User Story
+
+== User Story
+
+In the backlog of the simpleexample2 we get the following user story:
+
+- As a user I want to be able to add name, description etc. to some of the locations I saved on the map in order to be easier to refer back to the most interesting places.
+
+[.notes]
+--
+* we know from the PO / users that the expected points with additional info is relatively small
+--
+
+== From user story to issues
+
+[%step]
+- considering that the user story is to be included in the next iteration (sprint) then
+- the user story starts a process of discussion and planning within the development team
+- we need to understand what are the consequences of the new requirements for the different modules
+- we also need to create the necessary issues that
+
+[background-color = "#124990"]
+[color = "#fff6d5"]
+== Issues
+
+
+== The issues
+
+https://gitlab.stud.idi.ntnu.no/it1901/course-material/issues
+
+[background-color = "#124990"]
+[color = "#fff6d5"]
+== Typical git flow
+
+== Source code management
+[.center-paragraph]
+link:scm.html[Source code management (SCM)]
+
+
+++++
+ <div id="footer" class="footer">
+ <div style="display:table-row;">
+ <span class="element" style="width:150px;">
+ <a href="https://www.ntnu.no" target="_blank">
+ <img id="footer-logo" class="footer-logo"
+ src="images/template/logo_ntnu.png"
+ alt="ntnu logo" height="28"/>
+ </a>
+ </span>
+ <span class="element" style="width:300px;">| IT1901 - 8th lecture </span>
+ <span class="element">| Workflow example </span>
+ <span class="element"> </span>
+ </div>
+ </div>
+
+ <div id="vertical-ntnu-name" class="vertical-ntnu-name">
+ <span class="helper"></span>
+ <img src="images/template/vertical-ntnu-name.png" alt="Norwegian University of Science and Technology" />
+ </div>
+
+ <script type="text/javascript">
+ window.addEventListener("load", function() {
+ revealDiv = document.querySelector("body div.reveal")
+ footer = document.getElementById("footer");
+ revealDiv.appendChild(footer);
+
+ titleSlideDiv = document.querySelector("div.slides section.title")
+ mainLogo = document.getElementById("main-logo");
+ titleSlideDiv.prepend(mainLogo);
+
+ vertName = document.getElementById("vertical-ntnu-name");
+ revealDiv.appendChild(vertName);
+ } );
+ </script>
+++++