Automated merge with ssh://openslides.org/openslides

This commit is contained in:
Emanuel Schuetze 2011-09-04 09:35:25 +02:00
commit 3d6e3576aa

View File

@ -1,102 +1,15 @@
[ [
{
"pk":1,
"model":"agenda.item",
"fields":{
"weight":0,
"parent":null,
"title":"TOP 1 - Begr\u00fc\u00dfung",
"hidden":false,
"real_type":10,
"closed":false
}
},
{
"pk":2,
"model":"agenda.item",
"fields":{
"weight":0,
"parent":null,
"title":"TOP 23 - Debatten \u00fcber IT",
"hidden":false,
"real_type":10,
"closed":false
}
},
{
"pk":1,
"model":"agenda.itemtext",
"fields":{
"text":"Wir begr\u00fc\u00dfen euch herzlich."
}
},
{
"pk":2,
"model":"agenda.itemtext",
"fields":{
"text":"Hier debattieren wir \u00fcber IT-Sachen."
}
},
{
"pk":1,
"model":"participant.profile",
"fields":{
"gender":"none",
"group":"",
"user":2,
"committee":"",
"type":"observer"
}
},
{
"pk":2,
"model":"participant.profile",
"fields":{
"gender":"none",
"group":"",
"user":3,
"committee":"",
"type":"delegate"
}
},
{
"pk":3,
"model":"participant.profile",
"fields":{
"gender":"none",
"group":"",
"user":4,
"committee":"",
"type":"staff"
}
},
{
"pk":1,
"model":"auth.group",
"fields":{
"name":"Teilnehmer (unangemeldet)",
"permissions":[
28,
55,
74,
75,
73,
50
]
}
},
{ {
"pk":2, "pk":2,
"model":"auth.group", "model":"auth.group",
"fields":{ "fields":{
"name":"Teilnehmer (angemeldet) = Beobachter, Berichterstatter, GS", "name":"Beobachter",
"permissions":[ "permissions":[
28, 28,
56, 56,
55, 55,
74,
75,
73, 73,
71,
50 50
] ]
} }
@ -107,13 +20,14 @@
"fields":{ "fields":{
"name":"Delegierte", "name":"Delegierte",
"permissions":[ "permissions":[
30,
28, 28,
56, 56,
57, 57,
55, 55,
74, 72,
75,
73, 73,
71,
50 50
] ]
} }
@ -130,13 +44,13 @@
56, 56,
58, 58,
55, 55,
76,
74, 74,
75, 72,
73, 73,
71,
51,
50, 50,
66, 46
65
] ]
} }
}, },
@ -144,151 +58,14 @@
"pk":5, "pk":5,
"model":"auth.group", "model":"auth.group",
"fields":{ "fields":{
"name":"Infopoint (Teilnehmerverwaltung)", "name":"Teilnehmerverwaltung",
"permissions":[ "permissions":[
30, 30,
28, 28,
55, 55,
74,
75,
73,
51, 51,
50 50
] ]
} }
},
{
"pk":6,
"model":"auth.group",
"fields":{
"name":"Pr\u00e4sidium",
"permissions":[
29,
30,
28,
56,
58,
55,
76,
74,
75,
73,
50,
51,
66,
65
]
}
},
{
"pk":7,
"model":"auth.group",
"fields":{
"name":"Techniker",
"permissions":[
29,
30,
28,
58,
55,
76,
74,
75,
73,
51,
50,
66,
65,
46
]
}
},
{
"pk":1,
"model":"auth.user",
"fields":{
"username":"admin",
"first_name":"",
"last_name":"",
"is_active":true,
"is_superuser":true,
"is_staff":true,
"last_login":"2011-03-24 15:30:36",
"groups":[
],
"user_permissions":[
],
"password":"sha1$40ca1$d91a0ff8e571d6577fe5de241717ac1e1da94596",
"email":"admin@oshahn.de",
"date_joined":"2011-03-13 08:56:04"
}
},
{
"pk":2,
"model":"auth.user",
"fields":{
"username":"MusterBeobachter",
"first_name":"Muster",
"last_name":"Beobachter",
"is_active":true,
"is_superuser":false,
"is_staff":false,
"last_login":"2011-03-24 15:42:50",
"groups":[
2
],
"user_permissions":[
],
"password":"sha1$3eccf$7b61f1f1a0fd19f003b80aa653d9ba55a22d2db7",
"email":"",
"date_joined":"2011-03-24 15:42:50"
}
},
{
"pk":3,
"model":"auth.user",
"fields":{
"username":"MusterDelegierter",
"first_name":"Muster",
"last_name":"Delegierter",
"is_active":true,
"is_superuser":false,
"is_staff":false,
"last_login":"2011-03-24 15:43:57",
"groups":[
3
],
"user_permissions":[
],
"password":"sha1$99b44$ca83292683582654fa55c3ce833ed9c914e9c127",
"email":"",
"date_joined":"2011-03-24 15:43:57"
}
},
{
"pk":4,
"model":"auth.user",
"fields":{
"username":"MusterPr\u00e4sidium",
"first_name":"Muster",
"last_name":"Pr\u00e4sidium",
"is_active":true,
"is_superuser":false,
"is_staff":false,
"last_login":"2011-03-24 15:45:12",
"groups":[
6
],
"user_permissions":[
],
"password":"sha1$d4a27$d8026e4e1169f7ae60dcb8372850f7218fb2b1dd",
"email":"",
"date_joined":"2011-03-24 15:45:12"
}
} }
] ]