teltek · andiempettJISC · Apr 7, 2017 · Apr 7, 2017 · Apr 10, 2017 · Apr 10, 2017
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ pip-log.txt
 \#*\#
 nbproject/
 .idea/
+.vscode
 *\.sw*
 
 #Galicaster unit test / coverage reports

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 sudo: required
 dist: trusty
 
+# Fix. Will stop working at some point
+group: deprecated-2017Q2
+
 language: python
 python:
   - "2.7"

diff --git a/CHANGELOG b/CHANGELOG
@@ -5,7 +5,70 @@ Web version of the changelog in http://wiki.teltek.es/display/Galicaster/Release
 To get the diff for a specific change, go to https://github.com/teltek/galicaster/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/teltek/galicaster/compare/1.2.1...1.2.3
 
-* 2.0.0 (???)
+* 2.2.0 (Unreleased)
+ * Added script_button plugin: Allows configuring a button for the Galicaster UI that executes a script
+ * Edited default recording title to include the capture agent name
+ * Changed the galicaster.xml file to json format. Updated mp test files.
+
+* 2.1.1 (2018-10-18)
+ * Improved ical logic: Solves existing issues. Supports an unordered events ical
+ * Fixed error when inserting non-unicode characters in the presenter metadata field
+ * Added link to Commiter docs on CONTRIBUTING.md
+ * Fixed error when manifest.xml has 0ms duration after editing Opencast metadata
+
+* 2.1.0 (2018-02-09)
+ * Added lowaudio plugin #495
+ * Added multistream bin #512 (ppettit)
+ * Allowed "auto" framerate option for blackmagic pipeline #561
+ * Improved logger for plugin load errors #527 (ppettit)
+ * Sending offline status to Opencast before closing Galicaster (OC > 2.3.0) #455
+ * Added tags conf option to profile tracks. #575
+ * Added default (series) conf option for unscheduled recordings #468
+ * Refactored profile validation logic #510 (ppettit)
+ * Added pausedialog_size conf option #515 (ppettit)
+ * Added LDAP login to lockscreen plugin
+ * Added checkspace plugin #438
+ * Added CONTRIBUTING.md file (Contributing Guidelines)
+ * Improved cURL and StringIO handling in the Opencast client #562 (sinhote)
+ * Fixed scheduler logic by using DTSTART instead of dcterm:temporal #567
+ * Removed duplicated cameracontrol external plugin (has its own repo)
+ * Added "version" option to run_galicaster.py (pmgration)
+ * Fixed get_recording_start_time() returning wrong duration when pipeline is paused #559 (pmgration)
+ * Added "dcterm:temporal" to newly created mps #570
+ * Added "Close button" to about window when none appears #559
+
+* 2.0.2 (2017-09-28)
+ * Improved profile validation #507 (ppettit)
+ * Added buffer-time property to Pulse bin
+ * Fixed error with default profile and Ubuntu 16.04.2 #543
+ * Fixed crash when stop a recording from rest plugin
+ * Fixed Galicaster not starting when calendar.ical is empty #548
+ * Fixed lockscreen not working in class mode (pmgration)
+
+
+* 2.0.1 (2017-07-03)
+ * Improved Galicaster stability (Fixed preview freezes after multiple recordings #457, file descriptor leaks #441 and timeouts getting recorder status #493)
+ * Added an option to dump dot file of Gstreamer pipeline (ppettit)
+ * Added "capture.device.timezone" to Opencast config #472
+ * Added a new signal 'record-finished' when a recording is finished
+ * Added the possibility to close a popup dialog before execute his callback
+ * Corrected some bad interactions between the no-audio dialog and other popups.
+ * Fixed shutdown button
+ * Fixed problems with unicode strings #300 #458
+ * Fixed problem with 720p resolution #436
+ * Fixed bug: send config to MH in shot heartbeat instead of long heartbeat #114
+ * Fixed ingesting even if ingest was disabled #529
+ * Fixed exception if a recording finishes while it's paused #513 (ppettit)
+ * Fixed pause button not dissapearing when a recording finish
+ * Fixed incorrect status sent to Opencast #473 #491
+ * Fixed nightly timer from starting at wrong time #483
+ * Fixed errors in timestamps with offsets #471
+ * Fixed ical processing issue where first event is ignored #451
+ * Fixed a bug that permit launch recordings from next recordings window
+ * Fixed non public series from Opencast aren't shown in Galicaster
+ * Fixed minor bug: the swapvideos button was not hiding when set to false.
+
+* 2.0.0 (2017-03-13)
  * Upgrade to Gstreamer 1.x and GTK 3.x
  * Move the recorder logic to a service (in order to obtain the recorder state, get the current mediapackage, work on the recorder, ...)
  * Added the possibility to configure videosinks and audiosinks
@@ -19,6 +82,7 @@ To get the diff between two versions, go to https://github.com/teltek/galicaster
  * Unified the naming scheme for the signals and made them available in a page from Galicaster's github wiki (https://github.com/teltek/Galicaster/wiki/Galicaster-2.0-signals-schema)
  * Improved plugin lockscreen with LDAP authentication
  * Removed plugin notifycrash
+ * Removed plugin nocursor
  * Added a way to insert new elements in GUI
  * Added a new plugin to enable/disable inputs from a button or rest
  * Added a new plugin to control remote camera Sony EVI-H100S/H100V
@@ -44,7 +108,7 @@ To get the diff between two versions, go to https://github.com/teltek/galicaster
  * Changes to signals to allow failovermic plugin to run (androidwiltron)
  * Added the option to configure the output framerate using Blackmagic devices
  * Force to reload available space on entering in the recorder UI
- * Use a temporal folder to save the manifest (save zip), closes #15
+ * Use a temporary folder to save the manifest (save zip), closes #15
  * Change the current working directory to the rectemp folder
  * Capture any general exception in order to print it to the log file
  * Set the polling_config interval to the long heartbeat, fixes #114

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,56 @@
+# Contributing to Galicaster
+
+1. [General Guidelines](#general-guidelines)
+   1. [Questions and support](#questions-and-support)
+   2. [Report issues](#report-issues)
+   3. [Contribute code](#contribute-code)
+2. [Committers](#committers)
+3. [Reviewing Rules](#reviewing-rules)
+
+## General Guidelines
+First of all, thanks for contributing to the Galicaster project!
+
+Below are some guidelines that will help you to contribute to this project.
+
+### Questions and support
+
+If you have a problem with Galicaster, want to discuss a new feature or have any doubts regarding this project, consider subscribing to the galicaster community mailing list ([email protected]) through this [SUBSCRIBE LINK](http://groups.google.com/a/galicaster.org/group/community/subscribe).
+
+Feel free to send any questions you may have regarding Galicaster there.
+
+
+### Report issues
+
+Please give as much detail as possible:
+
+1. Specify the tag or release branch where you found the issue.
+2. Specify the steps to reproduce the issue, if possible.
+3. If it is a recording issue, include the profile and/or conf.ini file with the tracks configuration. Include the hardware you are using as well.
+4. Feel free to add any other details you think may be relevant.
+
+### Contribute code
+
+#### Guidelines
+* All new features must be contributed to master.
+* All bugfixes should be contributed to the first affected release branch.
+* Features or bug fixes that don't merge cleanly won't be accepted. You should solve any conflicts by rebasing your code with the origin branch to avoid extra *merge commits*.
+* Please create a separate Pull Request for each feature/bugfix you want to contribute.
+* Please use descriptive commit messages and include a reference to the relevant issue, if any (e.g. "issue #15, ").
+* If you are submitting a bugfix, it's encouraged to **add a test** reproducing the bug. Make sure that the test fails if the fix is not applied.
+* Try to follow PEP8. The line-length limit can be ignored if following it makes the code less readable.
+
+#### Branching model
+We are using a model inspired by Vincent Driessen's [git-flow](http://nvie.com/posts/a-successful-git-branching-model/). The main difference between our model and his is that we don't have a branch named **develop**. We use the **master** branch instead to hold the latest version of the code.
+
+For a better explanation, here is a picture of our model:
+
+![git-flow-image](docs/git-flow.jpg)
+
+## Committers
+
+For more information about the commiter role, check out the Committers section of the Developer docs: [Committers.md](https://github.com/teltek/Galicaster-doc/blob/master/DeveloperGuide/Committers.md)
+
+## Reviewing Rules
+
+For more information about the reviewing rules, check out the Reviewing Rules section section of the Developer docs: [ReviewingRules.md](https://github.com/teltek/Galicaster-doc/blob/master/DeveloperGuide/ReviewingRules.md)
+
diff --git a/README → README.md b/README → README.md
@@ -1,19 +1,29 @@
 What is Galicaster?
 ===================
 
-Galicaster is a Multistream Recorder and Player designed for mobile equipment without requiring an Internet connexion, 
+Galicaster is a Multistream Recorder and Player designed for mobile equipment without requiring an Internet connexion,
 allowing us to record, tag and review multistream material, all together in one application.
 
-Galicaster is designed to be compatible with the Opencast Matterhron Project. The Opencast Matterhorn (OC-MH) project, 
-an international, free, open-source effort on educational multimedia content from which we would benefit from, 
-taking advantage of all the tools within to process and distribute educational material. 
+Galicaster is designed to be compatible with the Opencast Matterhron Project. The Opencast (OC) project,
+an international, free, open-source effort on educational multimedia content from which we would benefit from,
+taking advantage of all the tools within to process and distribute educational material.
 
 Galicaster is been developed with GStreamer and Python, designed as a heavy application fully based on free software.
 
-    http://galicaster.teltek.es
-    [email protected]
+http://galicaster.org
+[email protected]
 
 
+Documentation Project
+=====================
+
+https://github.com/teltek/Galicaster-doc
+
+
+External Plugins List
+--------------------------
+https://github.com/teltek/Galicaster-doc/blob/master/ExternalPluginsList.md
+
 
 Coding Style
 ============