ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,701 Commits 6 Branches 42 Tags 64 MiB
5071daa148
Commit Graph

1701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schuetze
5071daa148 Updated translations. 2013-04-24 14:36:04 +02:00
Emanuel Schuetze
31cb82efd2 Updated README, INSTALL and THANKS for 1.4-alpha1 release. 2013-04-24 14:26:09 +02:00
Oskar Hahn
851e1ce805 Merge pull request #614 from ostcar/list_of_speaker_csv_export 
fab command, to run scripts with the OpenSlides settings
 2013-04-24 05:07:04 -07:00
Oskar Hahn
8c9d1d134e Merge pull request #616 from emanuelschuetze/last-1.4a1-changes 
Minor template fixes
 2013-04-24 05:06:52 -07:00
Oskar Hahn
9d78d44e5b fab command, to run scripts with the OpenSlides settings 
Add two example scripts
 2013-04-24 13:06:04 +02:00
Emanuel Schuetze
210df06c76 Minor template fixes. 2013-04-24 11:58:09 +02:00
Oskar Hahn
3872097311 Merge pull request #610 from emanuelschuetze/last-1.4a1-changes 
A lot of template improvements and translation fixes
 2013-04-24 02:39:29 -07:00
Emanuel Schuetze
81b82c559d Updated jQuery UI to v1.10.2. 
Changed link in agenda view to static file.
 2013-04-24 11:34:24 +02:00
Emanuel Schuetze
472c79d9c5 Added Roland to AUTHORS file. (Thanks for contributing CKEditor support!) 2013-04-24 10:50:24 +02:00
Emanuel Schuetze
abad75c129 A lot of template improvements and translation fixes 
- Fixed agenda widget for special slide views (e.g. list of speakers, summary).
- Fixed back to motion(s) link
- Set icon for list of speakers widget.
- Fixed overlay widget layout of form elements.
- Added submenu with other config_pages to version.html.
- Updated completly DE translations, fixed EN strings.
- Coding style: Use correct ugettext and ugettext_lazy strings. Use "as _" for ugettext only.
Updated translation.
- Improved projector template (clock image, fixed facicon, added subtitle for list of speakers)
- Changed permission strings ('oneself'). Added check if group(pk=3) exists.
- Added event name and description to base template. Some minor template layout fixes.
- Use static subtile (no context var). Show last 2 old_speakers for projector.
- Cut old_speakers.
- Projektor template style changes (e.g. overlay list of speakers).
 2013-04-24 10:38:03 +02:00
Oskar Hahn
26824f7545 Merge pull request #613 from ostcar/anonymous_person 
Fixed saving anonymous user in a PersonField
 2013-04-24 00:38:03 -07:00
Oskar Hahn
f581169e1e Fixed saving anonymous user in a PersonField 2013-04-24 09:28:58 +02:00
Oskar Hahn
e755712403 Merge pull request #611 from emanuelschuetze/Issue543 
Sorting agenda items with nestedSortable.
 2013-04-23 22:52:17 -07:00
Tobias Hößl
acba281581 Sorting agenda items with nestedSortable. 2013-04-23 17:24:27 +02:00
Oskar Hahn
7bdb1ee10c Merge pull request #607 from normanjaeckel/Rename_State_Attribute 
Rename the state flag dont_set_new_version_active to leave_old_version_a...
 2013-04-22 13:58:36 -07:00
Norman Jäckel
7fbe609d04 Rename the state flag dont_set_new_version_active to leave_old_version_active. 2013-04-22 22:31:58 +02:00
Oskar Hahn
150c4d6205 Merge pull request #606 from ostcar/master 
Fixed list of speakers overlay cache problem
 2013-04-22 13:20:57 -07:00
Oskar Hahn
ba75a34017 Fixed list of speakers overlay cache problem 2013-04-22 22:09:09 +02:00
Oskar Hahn
a4b671f0ac Merge pull request #602 from ostcar/motion_poll_pdf 
Motion poll pdf
 2013-04-22 12:49:54 -07:00
Oskar Hahn
02d1025346 Motion poll PDF 2013-04-22 21:47:40 +02:00
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