Merge pull request #1139 from DerPate/fix_last_gpl_header

remove the last occurence of gnu gpl license header fix #1130
This commit is contained in:
Oskar Hahn 2013-12-02 07:46:09 -08:00
commit 2cf2774e58
11 changed files with 1 additions and 70 deletions

View File

@ -638,7 +638,7 @@ class MainWindow(wx.Frame):
info.SetDescription(_( info.SetDescription(_(
"OpenSlides is a free web based presentation and " "OpenSlides is a free web based presentation and "
"assembly system.\n" "assembly system.\n"
"OpenSlides is free software; licensed under the GNU GPL v2+." "OpenSlides is free software; licensed under the MIT license."
).replace(u" ", u"\u00a0")) ).replace(u" ", u"\u00a0"))
info.SetCopyright(_(u"\u00a9 2011-2013 by OpenSlides team")) info.SetCopyright(_(u"\u00a9 2011-2013 by OpenSlides team"))
info.SetWebSite(("http://www.openslides.org/", "www.openslides.org")) info.SetWebSite(("http://www.openslides.org/", "www.openslides.org"))

View File

@ -1,8 +1,3 @@
/*
:copyright: 2012 by OpenSlides team, see AUTHORS.
:license: GNU GPL, see LICENSE for more details.
*/
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

View File

@ -1,10 +1,3 @@
/**
* OpenSlides agenda style
*
* :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
* :license: GNU GPL, see LICENSE for more details.
*/
tr.topline td { tr.topline td {
border-bottom: 1px solid #333333; border-bottom: 1px solid #333333;
background-color: #CDCDCD; background-color: #CDCDCD;

View File

@ -1,10 +1,3 @@
/**
* OpenSlides timepicker style
*
* :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
* :license: GNU GPL, see LICENSE for more details.
*/
.ui-timepicker-div .ui-widget-header { .ui-timepicker-div .ui-widget-header {
margin-bottom: 8px; margin-bottom: 8px;
} }

View File

@ -1,10 +1,3 @@
/**
* OpenSlides assignent style
*
* :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
* :license: GNU GPL, see LICENSE for more details.
*/
td.elected { td.elected {
background-color: #BED4DE !important; background-color: #BED4DE !important;
} }

View File

@ -1,12 +1,4 @@
/*
* OpenSlides mediafile style
*
* :copyright: 20112013 by OpenSlides team, see AUTHORS.
* :license: GNU GPL, see LICENSE for more details.
*/
/** Navigation icons (mapping to glyphicons-halflings) **/ /** Navigation icons (mapping to glyphicons-halflings) **/
.icon-mediafile { .icon-mediafile {
background-image: url("../img/glyphicons_062_paperclip.png"); background-image: url("../img/glyphicons_062_paperclip.png");
background-position: 0; background-position: 0;

View File

@ -1,10 +1,3 @@
/**
* OpenSlides motion style
*
* :copyright: 2013 by OpenSlides team, see AUTHORS.
* :license: GNU GPL, see LICENSE for more details.
*/
/* motion version diff table */ /* motion version diff table */
table.diff, .diff_row { table.diff, .diff_row {
font-size: 12px; font-size: 12px;

View File

@ -1,10 +1,3 @@
/**
* OpenSlides projector control style
*
* :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
* :license: GNU GPL, see LICENSE for more details.
*/
/** Widgets **/ /** Widgets **/
.column { .column {
width: 50%; width: 50%;

View File

@ -1,10 +1,3 @@
/**
* OpenSlides projector view style
*
* :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
* :license: GNU GPL, see LICENSE for more details.
*/
body{ body{
font-size: 20px !important; font-size: 20px !important;
line-height: 24px !important; line-height: 24px !important;

View File

@ -1,10 +1,3 @@
/**
* OpenSlides default template style
*
* :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
* :license: GNU GPL, see LICENSE for more details.
*/
body { body {
background-color: #FBFBFB; background-color: #FBFBFB;
} }

View File

@ -1,11 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""
Unit test for OpenSlides __init__.py
:copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
:license: GNU GPL, see LICENSE for more details.
"""
import tempfile import tempfile