ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,681 Commits 6 Branches 42 Tags 64 MiB
3a19218bd5
Commit Graph

2681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
4f9041df65 Merge pull request #603 from ostcar/participant_name 
Fixed username
 2013-04-22 12:38:09 -07:00
Oskar Hahn
df577646a3 Merge pull request #601 from ostcar/manage_runserver 
Fixed manage.py runserver.
 2013-04-22 12:37:45 -07:00
Oskar Hahn
6b558907c0 Fixed username 2013-04-22 13:49:13 +02:00
Oskar Hahn
0549d22ec8 Fixed manage.py runserver. 
The reload function did not work
 2013-04-21 18:42:58 +02:00
Oskar Hahn
38558e9b03 Merge pull request #600 from ostcar/motion 
Fixed motion bugs
 2013-04-19 11:00:39 -07:00
Oskar Hahn
2d7bf8ca9a fixed #558 2013-04-19 19:56:59 +02:00
Oskar Hahn
10b51f6897 Fixed #595 2013-04-19 19:39:33 +02:00
Oskar Hahn
a4773ad17c Merge pull request #599 from ostcar/bleach 
CKeditor support
 2013-04-19 10:17:09 -07:00
Oskar Hahn
db1503ad7b Format fix 2013-04-19 19:15:57 +02:00
Roland Geider
56844d93f2 Move CKeditor configuration to a separate JS file 
Remove unneeded try-except block
 2013-04-18 13:26:01 +02:00
Emanuel Schuetze
1d1f5fa218 Added html support for motion text. 
Use html parser 'beautifulsoup' to replace html tags which not supported by reportlab pdf.
'pip install bs4' required.

Fixed nested ol lists and unicode warning.

New requirement: beautifulsoup4

HTML support for reportlab.

Move parse html code into new function. Added missing html support in pdf for motion reason.

Added version number for bleach and beautifulsoup4. Moved to core requirements block.

Added bs4, bleach and html5lib requirements to portable build script. Updated portable readme for 1.4.
 2013-04-18 13:23:40 +02:00
Roland Geider
01885c9304 Add first version of server-side filtering of HTML with bleach 
Fix formatting (pep8 and otherwise)

Make the CleanHtml a mixin so it can be used easier, add a test case

Mark HTML fields as 'safe' in the template

Update list of allowed HTML tags, take special care for reportlab

Add heading tags to white list

Rename get_clean_html to get_clean_html_fields
 2013-04-18 13:20:27 +02:00
Tobias Hößl
ce333d4c40 Initial attempt to integrate CKEditor into OpenSlides 2013-04-18 13:20:27 +02:00
Oskar Hahn
97bb45eebf Merge pull request #598 from normanjaeckel/UpdateFabfile 
Update fabfile to reinsert coverage plain report to travis
 2013-04-16 08:16:37 -07:00
Norman Jäckel
fc1ef2b506 Update fabfile to reinsert coverage plain report to travis 2013-04-16 15:04:37 +02:00
Oskar Hahn
ebda7ed0d2 Merge pull request #596 from normanjaeckel/Fabric 
Use Fabric in travis and insert a fabfile for developers
 2013-04-16 00:04:49 -07:00
Norman Jäckel
b9d4af7de7 Use Fabric in travis and insert a fabfile for developers 2013-04-16 00:19:59 +02:00
Oskar Hahn
329e488cf2 Merge pull request #594 from emanuelschuetze/last-1.4a1-changes 
Fixed #553: Switch projector control scroll arrows
 2013-04-15 13:08:19 -07:00
Emanuel Schuetze
e81ed882ca Fixed #553: Switch projector control scroll arrows 2013-04-15 22:04:59 +02:00
Oskar Hahn
1e8e5334a5 Merge pull request #588 from ostcar/speaker_list 
List of speakers
 2013-04-15 11:01:21 -07:00
Oskar Hahn
33f74c3025 List of speakers. Part 2 2013-04-15 19:28:44 +02:00
Emanuel Schuetze
1a416e5726 Updated template and some minor fixed for list of speakers. Updated projector slide. 2013-04-15 19:23:37 +02:00
Oskar Hahn
fa95119936 New Feature: List of speakers. 2013-04-15 19:23:37 +02:00
Oskar Hahn
fc36ef2d7b Merge pull request #593 from ostcar/master 
Fixed Error in new Overlay API
 2013-04-15 06:48:22 -07:00
Oskar Hahn
f52df88cd6 fixed error on new overlay api 2013-04-15 15:47:18 +02:00
Oskar Hahn
1e389c25d8 Merge pull request #592 from ostcar/overlay 
New Overlay API
 2013-04-15 04:26:58 -07:00
Oskar Hahn
bbf4b33086 New Overlay API 2013-04-15 13:24:08 +02:00
Oskar Hahn
5f120c2bf4 Merge pull request #591 from normanjaeckel/WarningRechtAufRechte 
Protection for participant managers, Issue #122
 2013-04-14 16:21:19 -07:00
Norman Jäckel
0155690630 Protection for participant managers, Issue #122 
Raises a validation error, if a non-superuser user edits himself and
removes the last group containing the permission to manage participants
 2013-04-14 23:52:20 +02:00
Oskar Hahn
e530109cf5 Merge pull request #589 from normanjaeckel/SortingOnGroupDetailView 
Fixed issue #585. Sort group members by first name or last name in group...
 2013-04-13 10:05:29 -07:00
Norman Jäckel
82b1796875 Fixed issue #585. Sort group members by first name or last name in group detail view according to config variable 2013-04-13 18:13:11 +02:00
Oskar Hahn
e5c18d71f4 Merge pull request #587 from emanuelschuetze/portable 
Updated win32 portable build script.
 2013-04-11 15:12:17 -07:00
Emanuel Schuetze
71437eaaf7 Updated win32 portable build script. 
prepare_portable.py:
 Added new site-packages tornado and qrcode.
 Fix incorrect exclude patterns. (by Andy)
 Do not exclude unittest from bundled modules for portable (by Andy)
Updated license files for win32.
requirements.txt: Updated all required packages and current version numbers.
MANIFEST.in: updated file structure
 2013-04-12 00:04:32 +02:00
Oskar Hahn
632c9476ed Merge pull request #584 from emanuelschuetze/participants-1 
Participants fields: add 'title', remove 'type', use 'groups'
 2013-04-09 13:25:18 -07:00
Oskar Hahn
fcc0690b8b Merge pull request #581 from normanjaeckel/Antragsschluss 
Inserted a new config variable 'Stop submitting of new motions'
 2013-04-09 13:18:50 -07:00
Emanuel Schuetze
2c5bae7b01 #560 fixed: FormField to choose permissions is too small 2013-04-09 20:12:57 +02:00
Emanuel Schuetze
9f6da9f33b Reorder GroupDetailView code in view.py. 2013-04-09 19:53:18 +02:00
Emanuel Schuetze
2a97a61a14 Remove participants field 'type'. Use 'group' field instead. Updated csv import, overview table and user detail view 2013-04-09 11:21:55 +02:00
Emanuel Schuetze
051f9af1f7 #436: New participant field 'title' 2013-04-09 08:51:31 +02:00
Norman Jäckel
82c804e2d6 Inserted a new config variable 'Stop submitting of new motions' 
Normal delegates can not submit a new motion when this is set to true. Inserted also a new template filter to relate to config variables in if-clauses.
 2013-04-05 11:49:57 +02:00
Oskar Hahn
dc65f5e349 Merge pull request #577 from rolandgeider/issue-592 
Restart tornado on file changes, respect port and adress flags
 2013-04-04 07:14:37 -07:00
Roland Geider
e40a2e9332 Restart tornado on file changes, respect port and adress flags 2013-04-03 23:20:56 +02:00
Oskar Hahn
e7def39323 Merge pull request #582 from normanjaeckel/AgendaConfigJSFix 
Moved javascript code for agenda config into extra file.
 2013-04-03 10:21:08 -07:00
Oskar Hahn
ab280d7feb Merge pull request #583 from normanjaeckel/UpdateTests 
Update tests to extend test cover by coverage
 2013-04-03 10:18:13 -07:00
Norman Jäckel
5d472b274a Update tests to extend test cover by coverage 2013-04-03 17:55:30 +02:00
Norman Jäckel
623cf60adf Moved javascript code for agenda config into extra file. Moved translation to correct area for javascript files. 2013-04-03 14:51:19 +02:00
Oskar Hahn
a75c390bc5 Merge pull request #579 from normanjaeckel/AccountPersonalWidget 
Move personal info widget to a new app: account.
 2013-04-02 15:19:23 -07:00
Norman Jäckel
b310d6077e Move personal info widget to a new app: account. 2013-04-03 00:17:23 +02:00
Oskar Hahn
07535bd639 Merge pull request #578 from normanjaeckel/UpdatingDefaultGroups 
Update default groups and permissions
 2013-04-02 11:03:05 -07:00
Norman Jäckel
e3eabada8b Update default groups and permissions. 2013-04-02 15:50:40 +02:00