From d141fd36927594330d8ded270403c0cb63f331ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <openslides@normanjaeckel.de>
Date: Wed, 27 Jan 2016 22:44:42 +0100
Subject: [PATCH] Updated metadata files.

---
 CHANGELOG   |  6 ++++--
 LICENSE     |  2 +-
 MANIFEST.in |  1 +
 bower.json  |  4 ++--
 gulpfile.js | 12 +++++++-----
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0c796a8ac..f59948066 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ Agenda:
   are now agenda items and can be hidden.
 - Removed mptt.
 - Added attachments to custom slides.
+- Improved csv import.
 Assignments:
 - Renamed app from assignment to assignments.
 - Removed possibility to block candidates.
@@ -27,6 +28,7 @@ Users:
 - Used new anonymous user object instead of an authentification backend. Used
   special authentication class for REST requests.
 - Used authentication frontend via AngularJS.
+- Improved csv import.
 Other:
 - New OpenSlides logo.
 - New design for web interface.
@@ -57,8 +59,8 @@ Other:
 - Used Bower and gulp to manage third party JavaScript and Cascading Style
   Sheets libraries.
 - Used setup.cfg for development tools.
-- Removed code for Windows portable version with GUI. Used new repository for
-  this.
+- Removed code for documentation and for Windows portable version with GUI.
+  Used new repositories for this. Cleaned up main repository.
 - Django 1.9 is supported
 Translations:
 - Updated DE, FR, CS and PT translations.
diff --git a/LICENSE b/LICENSE
index 4b3d5d863..2e1f0517c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2015 OpenSlides Team
+Copyright (c) 2011-2016 OpenSlides Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/MANIFEST.in b/MANIFEST.in
index d1cf64661..47b5785b9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,5 @@ include bower.json
 recursive-include openslides *.*
 recursive-exclude openslides *.pyc
 recursive-exclude openslides *.swp
+recursive-exclude openslides *.swo
 recursive-exclude openslides *~
diff --git a/bower.json b/bower.json
index 88a9d3a18..e7186bf71 100644
--- a/bower.json
+++ b/bower.json
@@ -29,9 +29,9 @@
     "ng-file-upload": "~11.2.3",
     "ckeditor": "~4.5.6",
     "angular-ckeditor": "~1.0.3",
+    "angular-pdf": "~1.3.0",
     "roboto-condensed": "~0.3.0",
-    "open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1",
-    "angular-pdf": "~1.3.0"
+    "open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1"
   },
   "resolutions": {
     "angular": ">=1.4.9 <1.5"
diff --git a/gulpfile.js b/gulpfile.js
index 5285a1f96..fdcb7e1a7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -21,7 +21,7 @@ var argv = require('yargs').argv,
     mainBowerFiles = require('main-bower-files'),
     minifyCSS = require('gulp-minify-css'),
     path = require('path'),
-    rename = require("gulp-rename"),
+    rename = require('gulp-rename'),
     through = require('through2'),
     uglify = require('gulp-uglify'),
     vsprintf = require('sprintf-js').vsprintf;
@@ -70,7 +70,7 @@ gulp.task('ckeditor', function () {
         .pipe(gulp.dest(path.join(output_directory, 'ckeditor')));
 });
 
-// Extra task only for pdfjs
+// Extra task only for PDF.js
 gulp.task('pdfjs', function () {
     return gulp.src(path.join('bower_components', 'pdfjs-dist', 'build', 'pdf.worker.js'))
         .pipe(rename(path.join('openslides-libs.worker.js')))
@@ -98,9 +98,11 @@ gulp.task('default', ['js-libs', 'css-libs', 'fonts-libs', 'ckeditor', 'pdfjs',
 // Extracts translatable strings using angular-gettext and saves them in file
 // openslides/locale/angular-gettext/template-en.pot.
 gulp.task('pot', function () {
-    return gulp.src(['openslides/core/static/templates/*.html',
-                     'openslides/*/static/templates/*/*.html',
-                     'openslides/*/static/js/*/*.js'])
+    return gulp.src([
+            'openslides/core/static/templates/*.html',
+            'openslides/*/static/templates/*/*.html',
+            'openslides/*/static/js/*/*.js',
+        ])
         .pipe(gettext.extract('template-en.pot', {}))
         .pipe(gulp.dest('openslides/locale/angular-gettext/'));
 });