ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1916 from normanjaeckel/Metadata

Browse Source 
Updated metadata files.
This commit is contained in:
Emanuel Schütze 2016-01-27 22:55:56 +01:00
commit 30e6e1aa13
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -14,6 +14,7 @@ Agenda:
are now agenda items and can be hidden. are now agenda items and can be hidden.
- Removed mptt. - Removed mptt.
- Added attachments to custom slides. - Added attachments to custom slides.
- Improved csv import.
Assignments: Assignments:
- Renamed app from assignment to assignments. - Renamed app from assignment to assignments.
- Removed possibility to block candidates. - Removed possibility to block candidates.
@ -27,6 +28,7 @@ Users:
- Used new anonymous user object instead of an authentification backend. Used - Used new anonymous user object instead of an authentification backend. Used
special authentication class for REST requests. special authentication class for REST requests.
- Used authentication frontend via AngularJS. - Used authentication frontend via AngularJS.
- Improved csv import.
Other: Other:
- New OpenSlides logo. - New OpenSlides logo.
- New design for web interface. - New design for web interface.
@ -57,8 +59,8 @@ Other:
- Used Bower and gulp to manage third party JavaScript and Cascading Style - Used Bower and gulp to manage third party JavaScript and Cascading Style
Sheets libraries. Sheets libraries.
- Used setup.cfg for development tools. - Used setup.cfg for development tools.
- Removed code for Windows portable version with GUI. Used new repository for - Removed code for documentation and for Windows portable version with GUI.
this. Used new repositories for this. Cleaned up main repository.
- Django 1.9 is supported - Django 1.9 is supported
Translations: Translations:
- Updated DE, FR, CS and PT translations. - Updated DE, FR, CS and PT translations.

2
LICENSE
View File

@ -1,6 +1,6 @@
The MIT License (MIT) 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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

1
MANIFEST.in
View File

@ -7,4 +7,5 @@ include bower.json
recursive-include openslides *.* recursive-include openslides *.*
recursive-exclude openslides *.pyc recursive-exclude openslides *.pyc
recursive-exclude openslides *.swp recursive-exclude openslides *.swp
recursive-exclude openslides *.swo
recursive-exclude openslides *~ recursive-exclude openslides *~

4
bower.json
View File

@ -29,9 +29,9 @@
"ng-file-upload": "~11.2.3", "ng-file-upload": "~11.2.3",
"ckeditor": "~4.5.6", "ckeditor": "~4.5.6",
"angular-ckeditor": "~1.0.3", "angular-ckeditor": "~1.0.3",
"angular-pdf": "~1.3.0",
"roboto-condensed": "~0.3.0", "roboto-condensed": "~0.3.0",
"open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1", "open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1"
"angular-pdf": "~1.3.0"
}, },
"resolutions": { "resolutions": {
"angular": ">=1.4.9 <1.5" "angular": ">=1.4.9 <1.5"

12
gulpfile.js
View File

@ -21,7 +21,7 @@ var argv = require('yargs').argv,
mainBowerFiles = require('main-bower-files'), mainBowerFiles = require('main-bower-files'),
minifyCSS = require('gulp-minify-css'), minifyCSS = require('gulp-minify-css'),
path = require('path'), path = require('path'),
rename = require("gulp-rename"), rename = require('gulp-rename'),
through = require('through2'), through = require('through2'),
uglify = require('gulp-uglify'), uglify = require('gulp-uglify'),
vsprintf = require('sprintf-js').vsprintf; vsprintf = require('sprintf-js').vsprintf;
@ -70,7 +70,7 @@ gulp.task('ckeditor', function () {
.pipe(gulp.dest(path.join(output_directory, 'ckeditor'))); .pipe(gulp.dest(path.join(output_directory, 'ckeditor')));
}); });
// Extra task only for pdfjs // Extra task only for PDF.js
gulp.task('pdfjs', function () { gulp.task('pdfjs', function () {
return gulp.src(path.join('bower_components', 'pdfjs-dist', 'build', 'pdf.worker.js')) return gulp.src(path.join('bower_components', 'pdfjs-dist', 'build', 'pdf.worker.js'))
.pipe(rename(path.join('openslides-libs.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 // Extracts translatable strings using angular-gettext and saves them in file
// openslides/locale/angular-gettext/template-en.pot. // openslides/locale/angular-gettext/template-en.pot.
gulp.task('pot', function () { gulp.task('pot', function () {
return gulp.src(['openslides/core/static/templates/*.html', return gulp.src([
'openslides/*/static/templates/*/*.html', 'openslides/core/static/templates/*.html',
'openslides/*/static/js/*/*.js']) 'openslides/*/static/templates/*/*.html',
'openslides/*/static/js/*/*.js',
])
.pipe(gettext.extract('template-en.pot', {})) .pipe(gettext.extract('template-en.pot', {}))
.pipe(gulp.dest('openslides/locale/angular-gettext/')); .pipe(gulp.dest('openslides/locale/angular-gettext/'));
}); });