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

1383 Commits

Author SHA1 Message Date
Oskar Hahn
04b3a196ad Merge pull request #620 from CatoTH/ckeditor-4.1.1 
Upgrade CKEditor from 4.1rc to 4.1.1
 2013-04-25 06:17:07 -07:00
Oskar Hahn
017561572d Merge pull request #621 from CatoTH/Issue615 
sortable and disableSelection are not always defined; lead to issue #615
 2013-04-25 06:16:32 -07:00
Norman Jäckel
b6f2176cc8 Move Version page out of config menu. Insert Link into the footer. 2013-04-25 12:37:44 +02:00
Tobias Hößl
5865a73a3e sortable and disableSelection are not always defined; lead to issue #615 2013-04-24 19:51:33 +02:00
Tobias Hößl
4aa033989a Upgrade CKEditor from 4.1rc to 4.1.1 2013-04-24 19:04:02 +02:00
Emanuel Schuetze
8ca8b6911d Set version to 1.4b1-dev 2013-04-24 15:50:49 +02:00
Emanuel Schuetze
b43a6ae1f6 Release 1.4-alpha1 2013-04-24 15:31:55 +02:00
Emanuel Schuetze
e268d43580 Fixed motion poll pdf (use correct delegates group, use template without header/footer) 2013-04-24 15:14:29 +02:00
Emanuel Schuetze
5071daa148 Updated translations. 2013-04-24 14:36:04 +02:00
Emanuel Schuetze
210df06c76 Minor template fixes. 2013-04-24 11:58:09 +02: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
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
f581169e1e Fixed saving anonymous user in a PersonField 2013-04-24 09:28:58 +02:00
Tobias Hößl
acba281581 Sorting agenda items with nestedSortable. 2013-04-23 17:24:27 +02: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
ba75a34017 Fixed list of speakers overlay cache problem 2013-04-22 22:09:09 +02: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
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
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
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
Emanuel Schuetze
e81ed882ca Fixed #553: Switch projector control scroll arrows 2013-04-15 22:04:59 +02: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
f52df88cd6 fixed error on new overlay api 2013-04-15 15:47:18 +02:00
Oskar Hahn
bbf4b33086 New Overlay API 2013-04-15 13:24:08 +02: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
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
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
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
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
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
Norman Jäckel
b310d6077e Move personal info widget to a new app: account. 2013-04-03 00:17:23 +02:00
Norman Jäckel
e3eabada8b Update default groups and permissions. 2013-04-02 15:50:40 +02:00
Norman Jäckel
e1b149cde3 New config app. Apps only have to define config vars once. Config pages, forms and so on are created automaticly. 
Changes after some reviews are done.

Problematic is still that the JS can not be moved to an extra file because of the template tags in the code.
 2013-03-28 15:31:13 +01:00
Emanuel Schuetze
71ac7a1cdb New feature: qr-code for system url on participants password pdf. 
(Note: New dependency! Run 'pip install qrcode')

Fixed pep8 issues. Create qr-code image for system url one time only.

New feature: qr-code for system url on participants password pdf.
(Note: New dependency! Run 'pip install qrcode')

Fixed pep8 issues. Create qr-code image for system url one time only.

Print qrcode image from StringIO stream.
Adapted table stylesheet for better integration of reportlab's Image object.

Fixed pep8 issue.

Made qrcode import as optional feature. Fixed pep8 issue.
 2013-03-22 14:35:40 +01:00
Oskar Hahn
f5e6f736dc Merge pull request #572 from normanjaeckel/Fileupload_3 
Mediafile (new)
 2013-03-20 03:23:50 -07:00
Norman Jäckel
156acc451f Insert whitespace. Fix docstrings. 2013-03-20 11:17:24 +01:00
Norman Jäckel
d81c3bb1f8 Change order of classes for User and Group 2013-03-18 22:43:46 +01:00
Norman Jäckel
d82bb6ee33 Small modifications. Enhencement of tests. 2013-03-18 22:41:42 +01:00
Norman Jäckel
ad0e157bd1 Insert new app to upload files via the frontend. Let tornado server media files. Insert icon-mediafile css class. Insert extra_stylfiles context variable. 2013-03-18 21:44:02 +01:00
Norman Jäckel
571649d5a6 Fix typo in assignment. 2013-03-18 21:31:24 +01:00
Emanuel Schuetze
4e6818fb1a Compressed jquery-ui files (for agenda config). 2013-03-18 20:22:54 +01:00
Emanuel Schuetze
b3fca8f6f2 Updated bootstrap from 2.2.2 to 2.3.1 2013-03-18 20:19:17 +01:00
Oskar Hahn
3832aa4178 Tests for the motion views 2013-03-15 12:18:27 +01:00
Oskar Hahn
c46ec570bf Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-03-15 02:16:26 +01:00
Oskar Hahn
81eb92a761 fixed pep8 2013-03-15 02:14:15 +01:00
Oskar Hahn
1a2ebf7b3b removed some unused functions 2013-03-15 01:34:17 +01:00
Emanuel Schuetze
d180b4f331 Reverted support/unsupport changes (question) 2013-03-14 23:45:17 +01:00
Emanuel Schuetze
20118ae833 Improved version.get command 2013-03-14 23:35:57 +01:00
Emanuel Schuetze
2a2c704bf2 GetVersionMixin not required. Fixed htmldiff function. 2013-03-14 23:26:41 +01:00
Emanuel Schuetze
3f4df58807 Moved htmldiff function to utils.py. Fixed travis build error (pep8). 2013-03-14 23:22:11 +01:00
Emanuel Schuetze
49765bbe6e Merge remote branch 'upstream/master' into motiontemplate 2013-03-14 23:05:38 +01:00
Emanuel Schuetze
b2dc3820bd Changed motion.number to motion.identifier. 2013-03-14 23:04:32 +01:00
Emanuel Schuetze
88a32dc546 Updated motion version warnings (not latest/authorized version) 2013-03-14 22:56:25 +01:00
Emanuel Schuetze
73430e45d8 Changed style for empty category table. 2013-03-14 22:54:33 +01:00
Emanuel Schuetze
fa098f6bd3 Typo. 2013-03-14 22:54:00 +01:00
Oskar Hahn
43cd5aba00 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-03-14 22:44:11 +01:00
Oskar Hahn
63932a348e Merge pull request #561 from emanuelschuetze/datatables-participants 
Datatables for participants table (reworked)
 2013-03-14 14:40:01 -07:00
Emanuel Schuetze
0587c2019a Integrated DataTables function for participants table (for client side sorting/filtering/pagination). Removed old server side sorting/filtering code. 
Fixed csv import (added success url).

Added large csv file for testing import of >1000 participants.

Removed lage csv example file for paticipants (will be sustitute by a test script in future).
 2013-03-14 22:34:40 +01:00
Oskar Hahn
545d4be04f fixed update of person_api 2013-03-14 22:32:00 +01:00
Emanuel Schuetze
247f6c9431 Merge remote branch 'upstream/master' into motiontemplate 
Conflicts:
	openslides/motion/models.py
	openslides/motion/views.py
 2013-03-14 21:36:02 +01:00
Emanuel Schuetze
a1a11ff53c New motion version diff view. Improved version history table in motion detail template. 2013-03-14 21:28:03 +01:00
Oskar Hahn
2944b6ded3 fixed travis 2013-03-13 00:29:53 +01:00
Oskar Hahn
71b9bd0a08 dont set identifier prefix, if it is empty 2013-03-12 23:54:37 +01:00
Oskar Hahn
b2c888b151 set identifier 2013-03-12 23:35:08 +01:00
Oskar Hahn
304887e8f3 Changed comlex workflow automaticly set the identifier 2013-03-12 22:13:17 +01:00
Oskar Hahn
d21185a449 Merge branch 'master' of github.com:OpenSlides/OpenSlides into category 2013-03-12 22:05:20 +01:00
Oskar Hahn
9cd69f59e0 Motion Identifier 2013-03-12 22:03:56 +01:00
Norman Jäckel
03fff46517 Add new TestCase class in utils to call the signal on running every test. 2013-03-12 21:38:22 +01:00
Norman Jäckel
9679be1867 Move builtin groups to a signal. 2013-03-12 20:58:22 +01:00
Emanuel Schuetze
196ad217b0 Fixed version history. 2013-03-11 23:58:45 +01:00
Emanuel Schuetze
d41ce146e2 Added category_delete function to template. 2013-03-11 21:50:16 +01:00
Emanuel Schütze
db97d3c312 Merge pull request #2 from ostcar/category 
Category Delete View
 2013-03-11 13:45:54 -07:00
Oskar Hahn
31ba70efd1 Category Delete View 2013-03-11 21:38:07 +01:00
Norman Jäckel
514577f7c6 Built-in Workflows are created by listening to a signal which is sent after syncdb. 2013-03-11 21:32:09 +01:00
Emanuel Schuetze
d9fbaf9aa7 Updated motion category template. 2013-03-11 21:29:56 +01:00
Emanuel Schütze
ff848a865a Merge pull request #1 from ostcar/category 
Category
 2013-03-11 12:46:42 -07:00
Oskar Hahn
f411040c3a Append missing files 2013-03-11 20:43:23 +01:00
Oskar Hahn
bc7be27131 Add CategoryFormField to the MotionForm 2013-03-11 20:41:02 +01:00
Oskar Hahn
2614a1cb2f Categories for Motions 2013-03-11 20:17:19 +01:00
Emanuel Schuetze
1b93cec209 Merge remote branch 'upstream/master' 
Conflicts:
	openslides/motion/models.py
 2013-03-11 19:16:16 +01:00
Emanuel Schuetze
42c847dfba Update motion templates to new template design. Added some missing model and view functions. 2013-03-11 18:26:22 +01:00
Emanuel Schuetze
5c70b4a044 Update after comments: Removed user context var. Removed condition in unupport state check. 2013-03-11 16:56:56 +01:00
Emanuel Schuetze
ee0e599a6c Update motion templates to new template design. Added some missing model and view functions. 2013-03-09 14:29:40 +01:00
Emanuel Schuetze
71b1bede6f Set new button als primary/blue button. 2013-03-09 14:17:30 +01:00
Emanuel Schuetze
c3c200b423 Changed link to new csv import wiki page on github. 2013-03-09 14:16:28 +01:00