Commit Graph

493 Commits

Author SHA1 Message Date
Norman Jäckel 38a4cf1bc3 Merge pull request #1295 from emanuelschuetze/pdf-fix
PDF: Added missing 'fontName'.
2014-05-19 09:57:50 +02:00
Norman Jäckel 5dc4742f2f Merge pull request #1291 from emanuelschuetze/fix-1235
Fixed #1235 (DeprecationWarning in utils.views.PDFView).
2014-05-19 09:54:45 +02:00
Roland Geider e9d52245cb Replace own CKeditor with dedicated app 2014-05-19 00:00:18 +02:00
Emanuel Schuetze 5f202c22a7 PDF: Add missing 'fontName'.
And set 'registerFontFamily(...)' to use bold/italic in regular paragraphs.
2014-05-18 13:57:20 +02:00
Emanuel Schuetze bacc9ca87b Fixed #1235 (DeprecationWarning in utils.views.PDFView) 2014-05-17 13:42:18 +02:00
Norman Jäckel b16641c0dc Renamed 'permission_required' to 'required_permission' etc.
Renamed method and attribute of openslides.utils.views.PermissionMixin. Renamed attribute of widgets and main menu entries. Fixed #1160.
2014-05-15 20:07:09 +02:00
Norman Jäckel 43429d4015 Changed some docstrings. 2014-05-12 22:57:57 +02:00
Norman Jäckel b8cd2d360b Merge pull request #1270 from emanuelschuetze/fix1178
Adds plugin directory for win32 portable version (Fixed #1178).
2014-05-05 21:07:51 +02:00
Emanuel Schütze 7add4c5691 Portable: Create empty plugins directory.
Fixed file permissions.
2014-05-05 21:01:25 +02:00
Andy Kittner 3584da89c3 Automatically load plugins from portable plugins dir; closes #1178
All modules/ packages in the openslides/plugins subdirectory of the
portable version will be automatically added to INSTALLED_PLUGINS
2014-05-05 00:55:22 +02:00
Emanuel Schütze 3ece699cd6 Add get_win32_portable_user_data_path() function in main.py to return
correct user data path ("/openslides") of portable version.
2014-05-05 00:55:17 +02:00
Norman Jäckel d638d5b7e2 Fixed bug of numbering view when there are orga items. Renamed toRoman to to_roman. 2014-05-04 14:00:28 +02:00
Stefan Frauenknecht 2c5b3a8e4f Automatic numbering of agenda items 2014-05-04 13:47:01 +02:00
Norman Jäckel 42796f6118 Added global chatbox for managers. 2014-04-27 20:58:22 +02:00
Norman Jäckel 2a10feecad Added CSV import, fixed #1186. Also cleaned up motion and user CSV import. 2014-04-13 20:35:19 +02:00
Norman Jäckel 78077e4ab1 Fix syntax and style errors and errors after deficient merge conflic
resolving after branch merging.
2014-04-08 21:02:09 +02:00
Emanuel Schütze 3d7ecab8e4 Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2
Conflicts:
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/assignment/views.py
	openslides/core/static/img/circle.png
	openslides/motion/pdf.py
	openslides/utils/pdf.py
2014-04-07 22:35:52 +02:00
Emanuel Schütze b5fb83c026 Fixed #551: Used unicode font for circle in ballot pdf. Removed pillow.
That fixed also #1140 (Server error when trying to view ballot paper pdf)
2014-03-29 13:20:31 +01:00
Norman Jäckel ce8274fb53 Inserted command line option to translate config strings during database setup. Fixed #460. 2014-01-31 02:03:43 +01:00
Emanuel Schuetze d8d2ad002a Rename and clean up static direcories.
- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files
2014-01-14 23:27:12 +01:00
Norman Jäckel 04b0cfb0bc Used entry points to detect plugins automaticly. 2014-01-12 12:48:24 +01:00
Norman Jäckel e0223c950b Added possibility to use custom templates and static files in user data path directory. 2014-01-12 11:05:54 +01:00
Oskar Hahn c82ee4ce1f Added AbsoluteUrlMixin and used it in any model.
cleaned up get_absolute_url() in some models
2014-01-12 00:35:16 +01:00
Oskar Hahn 90f9313faa Use the jsonfield as requirement 2014-01-11 23:01:29 +01:00
Oskar Hahn 56c8dcdac1 Merge branch 'stable/1.5.x' 2014-01-11 22:58:39 +01:00
Oskar Hahn cde6232477 Merge branch 'stable/1.5.x'
Conflicts:
	openslides/projector/projector.py
	openslides/templates/base.html
2014-01-11 22:30:14 +01:00
Norman Jäckel 19ccbd3b17 Fixed error in main script when using other database engine. Fixed #1166. 2014-01-11 08:51:17 +01:00
Norman Jäckel 21ff62dd32 Changes in projector and core app and in utils.
Changed api for main menu entries.
Enhanced http error pages using a classed based views.
Moved dashboard and select widgets view from projector to core app.
Also some small clean ups.
2014-01-10 16:17:54 +01:00
Norman Jäckel 03fd7fd142 Fixed http status code when requesting a non-existing static page using Tordado web server. Fixed #1161. 2013-12-23 17:42:11 +01:00
Norman Jäckel 9a3243706b Inserted api for the personal info widget. 2013-12-09 12:16:16 +01:00
Norman Jäckel fee983045b Change API for plugins, esp. for names and versions of plugins. Also enhance possibility to patch existing OpenSlides urlpatterns.
Fix some other tests by the way.
2013-12-05 16:40:54 +01:00
Norman Jäckel 1fb1f17d15 New API for widgets using a metaclass.
It is now possible to define a default state and to submit extra stylefiles and javascript files when defining a widget in an app. This is done by a new metaclass in openslides.utils.dispatch. Also fixed some other tests.
2013-12-01 21:30:12 +01:00
Oskar Hahn 4fa2c25978 Make sure QuestionView.get_question_message is in a unicode context.
This is important if the attribute question_message is set with
ugettext_lazy which needs an unicode context

Fixes #1066
2013-11-17 11:11:39 +01:00
Andy Kittner 87d46d079d Rework DjangoStaticFileHandler (fixes #1034)
Fixes multiple issues
 - Unicode errors when path contained non-ascii characters

 - 403 errors when the current working directory was not a parent
   directory of the static files

 - "API abuse" super() implementation of the get() method was passed a
   filesystem path instead of the url-path it was expecting

 - The above could also lead to 403 errors on case-insensitive file
   systems due to the way the base-class resolved and validated paths
   with respect to self.root
2013-11-14 22:45:29 +01:00
Andy Kittner 0d4c48a9c0 Set reuse address option (fixes #1043)
When the server is killed there may still be client-sockets connected in
the TIME_WAIT state, causing the bind() call to fail. With the
REUSEADDR option we can reuse the address immediately unless another
process is actually *listening* on the same address.
that we want to reuse the address
2013-11-14 22:38:12 +01:00
Norman Jäckel cc0298eaa0 Use encoded string for insert in sys.path and print during main script. Fix #1022. 2013-11-10 22:21:14 +01:00
Emanuel Schuetze 45588024fd Fixed #957 (Allow list-style in CKEditor)
Allowed additional css styles 'color' and 'background-color'
for span html fields in ck-editor (and bleach).
2013-11-10 19:33:38 +01:00
Norman Jäckel 17a2eb97cb Check used port, fix #985. 2013-11-06 17:49:41 +01:00
Oskar Hahn 0752d476e4 Change to MIT Licence
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
Norman Jäckel 3ec18194fa New command create-dev-settings. Clean up main script. Fix wrong path for Windows version. 2013-10-29 00:48:49 +01:00
Norman Jäckel b2afa77e25 Add error message if a invalid answer was send via POST to a QuestionView. Fix #940. 2013-10-28 17:02:18 +01:00
Oskar Hahn 47c60078b3 Use sockjs instead of only websocket 2013-10-27 20:50:10 +01:00
Emanuel Schuetze a513477033 Fixed #948: Use DIN A4 format and wlan ssid qrcode on access data PDF. 2013-10-25 20:51:48 +02:00
Oskar Hahn 82f0df4fea Send js to the projector
* fixed scroll and scale of the projector
2013-10-21 07:53:21 +02:00
Norman Jäckel a1ad1e4c49 Some changes in __main__.py and utils.main and other.
Reinsert --no-browser option.

Move some code to utils.main.

Some other small style changes.

Fix merge conflict misstakes.

Change settings behavior. Add tests.

Fix rebase problems.
2013-10-19 14:44:46 +02:00
Andy Kittner 21a1d77e29 fix gui/portable for pull request #903 2013-10-19 14:44:20 +02:00
Norman Jäckel c63b7f995f Clean up main.py and move code to __main__.py and utils/main.py. 2013-10-19 14:44:20 +02:00
Emanuel Schuetze e277b8babf Full text search with haystack and whoosh.
Updated THANKS file.
Portable: Added haystack and whoosh.
2013-10-16 08:58:35 +02:00
Oskar Hahn d937262d28 Use flake8 instead of pep8. Orderd the imports with isort
* changed the fab-command pep8 to check
* checked and fixed any code with flake8. Also the urls.py
* checkt the projector app with pylint
2013-10-14 18:43:12 +02:00
Oskar Hahn d644d49579 Cleaned up utils 2013-10-13 20:43:26 +02:00
Oskar Hahn 6aae8bff15 More projector fixtures
* Update projector when polls are updated.
* Update projector when assignment candidates are updated
* Update projector when motion submitter are updated
* Fixed the assignment publish poll view
* Added projector.api.register_slide_model
2013-10-10 18:40:24 +02:00
Oskar Hahn ecf5248962 Rework of the projector with websocket
* Set a static projector title
* absolute_urls for the activate links
* update the projector when a slide changes (in save())
* insert the absolute_url template filter
* Preview to slides
* renamed is_active to is_active_slide
* The SlideMixin has to come before the PersonMixin
* Update list of speakers
* Render Countdown via JS
* Reconnect projector after connection lost
* Overlays can allways be active and do not appear in the widget
* Rewrote the clock as overlay
2013-09-24 23:35:05 +02:00
Oskar Hahn 477daa3fdf Success_message in utils.views 2013-09-14 11:09:45 +02:00
Norman Jäckel c88d180808 Deletes config cache after each test if it exists. 2013-08-19 18:05:03 +02:00
Oskar Hahn 25bac4a704 Fixed a bug when setting a config var before getting one 2013-08-19 17:59:35 +02:00
Oskar Hahn 20cf960c82 Merge remote-tracking branch 'openslides/stable/1.4.x'
Conflicts:
	openslides/core/templatetags/tags.py
2013-08-19 17:54:50 +02:00
Oskar Hahn 99895a28d1 Fix get_absolute_url for deleted persons.
Fix #845
2013-08-19 10:50:37 +02:00
Oskar Hahn 967c199a56 Removed utils from INSTALLED_APPS.
Moved utils.management and utils.templatetags to core
2013-08-11 09:40:14 +02:00
Oskar Hahn 64af0b162f Create admin-user after syncdb 2013-06-16 17:07:55 +02:00
Norman Jäckel dfc160af5b Disable interactive mode of the syncdb command, fixed #696 2013-06-16 01:05:22 +02:00
Oskar Hahn 575da78f3a Editview for releated agenda items.
Releated Agenda Items need there own edit view to edit some agenda specifc
values.

Also added a new filter 'trans' to translate variables.

Fixes #710
2013-06-16 00:55:07 +02:00
Oskar Hahn e630d600ed Fixes #648
delete function for the motion versions
2013-06-15 09:18:21 +02:00
Norman Jäckel 48f237a92f Print listening info to command line 2013-06-13 16:58:34 +02:00
Oskar Hahn 4b0c62d29a Fixes #721
Saving the anonymous user into a list of speakers.

Also raises an AttributeError if someone tries to save the anonymous user
into any person field.
2013-06-09 18:57:42 +02:00
Norman Jäckel 0d1db941b8 Insert LocalizedModelChoiceField for use in MotionSetWorkflowMixin. Fixed #713. 2013-06-09 16:41:58 +02:00
Emanuel Schütze 37da0cc7bb Merge pull request #709 from emanuelschuetze/fixes-for-1.4b2
Fixes and improvements for 1.4b2
2013-06-03 15:58:13 -07:00
Andy Kittner fb91317ce1 Add command to backup the database 2013-06-04 00:07:22 +02:00
Emanuel Schuetze e5e7e1bcce Template improvements.
Improved agenda and participants overview.
2013-06-03 22:38:45 +02:00
Emanuel Schuetze d5becd5c18 Fixed #431: Template improvements (removed unused loaded tags and check of all html template files) 2013-05-30 23:25:49 +02:00
Emanuel Schuetze b5a5acbf2c Some last (template) improvements for next release
- Added dataTable function for group overview table.
- Added default form help text for groups and an explanation for group overview table.
- Updated translation.
- Translate group name in form.
- Username: FirstName instead of First_Name
- Hide group 'registered' from UserForm
- Linked persons/candidates/submitter etc. to UserView
- Fixed permissions in template

Translation
2013-05-16 21:03:42 +02:00
Emanuel Schuetze b082f8a8fc A lot of template improvements
- Translate group name in participant overview table.
- Move 'status_link' function from participants.js to utils.js for using in VoteCollector plugin.
- Added hook 'post_js' for VoteCollector plugin.
- Fixed poll id in poll_form.
- Improved 'show log' button
- Used welcome_title for default custom slide
- Used bootstraps' fluid grid nesting for responsive layout of widgets.
- Added microphone icon for 'add-me-to-list-of-speakers' button.
- Format motion identifier and title in (motion and account) widgets.
- Format list of speakers (slide, overlay, view, overview)
- Format list of speakers widget and view. Added view to link to current list of speakers (without add to list).
- Fixed motion slide. Made up/down animation faster and the scroll way shorter.
- Fixed icon name.
- Set default context of 'extra_javascript' to use kwargs['context']['extra_javascript'].append('...') without error.
- Fixed translation of motion state.

Moved css code.
2013-05-14 23:20:54 +02:00
Norman Jäckel 864d20274e Fixed #636. Insert general url_name_args attribute to some generic views in utils.views. 2013-05-13 18:15:53 +02:00
Oskar Hahn b0e5854833 Fixed #629 2013-04-28 10:21:31 +02:00
Oskar Hahn 100238bc66 Fixed #580 2013-04-28 09:37:15 +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
Oskar Hahn 0549d22ec8 Fixed manage.py runserver.
The reload function did not work
2013-04-21 18:42:58 +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
Oskar Hahn fa95119936 New Feature: List of speakers. 2013-04-15 19:23:37 +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
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
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
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 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
Oskar Hahn 43cd5aba00 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-03-14 22:44:11 +01:00
Oskar Hahn 545d4be04f fixed update of person_api 2013-03-14 22:32:00 +01:00
Oskar Hahn d21185a449 Merge branch 'master' of github.com:OpenSlides/OpenSlides into category 2013-03-12 22:05:20 +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
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
Oskar Hahn 51a9e41015 Set new django setting. Put tornado code in a seperate file. 2013-02-27 18:54:06 +01:00
Oskar Hahn 2822c39f8a Merge branch 'master' into tornado 2013-02-18 19:08:58 +01:00
Norman Jäckel f2dde228c9 Work on motion workflow system.
Also: Insert new base exception for OpenSlides.

Also: Insert a workflow field to the state class. Update tests. Rename versioning attribute.
2013-02-13 23:04:24 +01:00
Oskar Hahn 27c73092e1 Merge remote-tracking branch 'emanuel/newtemplate' into new_motion
Conflicts:
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
2013-02-06 09:25:27 +01:00
Emanuel Schuetze 82e35bebff Fixed wrong deletion if user clicks "no" in confirm form. 2013-02-05 21:31:45 +01:00
Oskar Hahn 139ba74459 Merge remote-tracking branch 'emanuel/newtemplate' into new_template
Conflicts:
	.travis.yml
	INSTALL.txt
	openslides/agenda/templates/agenda/base_agenda.html
	openslides/agenda/templates/agenda/edit.html
	openslides/agenda/templates/agenda/item_row.html
	openslides/agenda/templates/agenda/overview.html
	openslides/agenda/templates/agenda/widget.html
	openslides/assignment/templates/assignment/base_assignment.html
	openslides/assignment/templates/assignment/config.html
	openslides/assignment/templates/assignment/edit.html
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/poll_view.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/templates/assignment/widget.html
	openslides/config/templates/config/general.html
	openslides/motion/templates/motion/base_motion.html
	openslides/motion/templates/motion/config.html
	openslides/motion/templates/motion/edit.html
	openslides/motion/templates/motion/import.html
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
	openslides/motion/templates/motion/widget.html
	openslides/motion/views.py
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/edit.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_widget.html
	openslides/participant/templates/participant/import.html
	openslides/participant/templates/participant/login.html
	openslides/participant/templates/participant/overview.html
	openslides/participant/templates/participant/password_change.html
	openslides/participant/templates/participant/settings.html
	openslides/participant/templates/participant/user_widget.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/control_countdown.html
	openslides/projector/templates/projector/control_overlay_message.html
	openslides/projector/templates/projector/custom_slide_widget.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/projector/templates/projector/new.html
	openslides/projector/templates/projector/overlay_widget.html
	openslides/templates/base.html
	openslides/utils/template.py
	openslides/utils/views.py
	requirements.txt
2013-02-03 19:03:18 +01:00
Oskar Hahn e7c65b3db1 Moved some methodes from utils.views.DeleteView to QuestionMixin 2013-02-03 13:23:55 +01:00
Oskar Hahn 15b13c2bcd Handel null=True in PersonField 2013-02-02 21:19:37 +01:00
Oskar Hahn 2e430b4406 check permission in motion view 2013-02-02 10:59:07 +01:00
Oskar Hahn 3ffb16d4d8 Fixed pep8 errors 2013-02-02 10:52:13 +01:00
Oskar Hahn 6c3eb0f765 fixed urls in views from the participant app 2013-02-01 17:35:27 +01:00
Oskar Hahn 1a2f0a1b5a Added links to set and reset the state of a motion 2013-02-01 17:20:11 +01:00
Oskar Hahn b6256b73e0 Changed utils.views.DeleteView 2013-02-01 13:24:30 +01:00
Oskar Hahn adeaf248ef Changed utils.- and poll.views 2013-02-01 12:51:01 +01:00
Oskar Hahn d3b340769b Added motion config tab 2013-01-26 16:33:55 +01:00
Oskar Hahn ecb6419f8c fixed apply and success url in utils.views 2013-01-26 16:19:53 +01:00
Oskar Hahn 1f87749742 Save the submitters to the motion 2013-01-26 15:25:54 +01:00
Roland Geider 3bfead298d Add custom management command to start the application with tornado 2013-01-23 21:12:36 +01:00
Emanuel Schuetze 586425354d Reworked new template, especially agenda and dashboard. 2013-01-08 23:05:35 +01:00
Oskar Hahn 0231fe37f5 Start to rewrite the motion app 2013-01-08 20:22:03 +01:00
Norman Jäckel deb0d5b2e5 Some fixes. Update requirements.txt and setup.py. 2013-01-05 23:20:38 +01:00
Emanuel Schuetze 13cd52bd96 Merged (conflicts). 2013-01-05 15:29:57 +01:00
Oskar Hahn 6417f5f107 fixed pep8 error 2013-01-05 14:56:22 +01:00
Oskar Hahn 2fcf0b3a07 fixed typo in utils/views.py 2013-01-05 14:46:05 +01:00
Oskar Hahn ae8641bcad Raise an error if an CreateView does not define a apply_url 2013-01-05 01:48:03 +01:00
Oskar Hahn 2f28655a25 Show Tabs if there do not define some permissions 2013-01-05 01:03:42 +01:00
Emanuel Schuetze 4ae7f3e243 Merge remote branch 'upstream/master' into newtemplate
Conflicts:
	openslides/application/views.py
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/views.py
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/motion/templates/motion/config.html
	openslides/motion/templates/motion/edit.html
	openslides/motion/templates/motion/import.html
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_overview.html
	openslides/participant/templates/participant/overview.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/dashboard.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/static/styles/base.css
	openslides/templates/base.html
	openslides/templates/front_page.html
	openslides/utils/utils.py
2013-01-02 23:01:43 +01:00
Oskar Hahn b79fedc215 fixed jsonfield for django 1.5 2012-12-14 15:36:57 +01:00
Oskar Hahn 366b8e0f1f Droped support for python 2.5 2012-12-14 14:21:53 +01:00
Norman Jäckel 589c209c79 Merge branch 'master' into Version_String
Conflicts:
	openslides/__init__.py
	openslides/config/views.py
2012-11-28 17:54:29 +01:00
Oskar Hahn e7c47395bb Gave the empty user all the attributes it needs 2012-11-27 22:46:54 +01:00
Oskar Hahn 4dfd4ac67f fix _proper_unicode 2012-11-26 15:48:23 +01:00
Oskar Hahn bdfb714013 fixed pep8 in pdf.py 2012-11-26 10:35:29 +01:00
Oskar Hahn b3806d8cdd some tests for the agenda 2012-11-24 21:10:55 +01:00
Oskar Hahn bd32994296 cleanup
Removed unused imports and fixed pep8 errors
2012-11-24 14:01:21 +01:00
Oskar Hahn f5a438cf9f cleanup in utils 2012-11-24 01:42:10 +01:00
Norman Jäckel 4c97291598 Remove non-used revision template var. 2012-11-23 11:33:34 +01:00
Oskar Hahn 1dc7d45670 sort persons in motions 2012-11-22 17:00:09 +01:00
Oskar Hahn 8014f327a2 Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api 2012-11-22 16:35:26 +01:00
Oskar Hahn fbf81e7780 sort persons 2012-11-22 16:19:09 +01:00
Emanuel Schuetze 27fa32b718 Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard) 2012-11-17 22:14:49 +01:00
Emanuel Schuetze e338529865 #296: Localised the datetime in PDF header 2012-11-17 21:44:17 +01:00
Emanuel Schuetze 5623bb6888 Move professional support message into base template footer. 2012-11-08 19:13:31 +01:00
Oskar Hahn 79c5e93422 Redesigned the QuestioMixin 2012-10-28 19:59:41 +01:00
Oskar Hahn 7dcc2374f4 Merge remote-tracking branch 'openslides/master' into supporter
Conflicts:
	openslides/application/urls.py
	openslides/motion/models.py
	openslides/motion/views.py
2012-10-25 09:23:24 +02:00
Oskar Hahn 413cd27d40 fixed deletion of motions. #391 2012-10-24 12:45:40 +02:00
Oskar Hahn 3e1938941f Append a default class for the person-api.
Also fixed the assignment-ballot-paper for group-persons
2012-10-24 12:15:29 +02:00
Oskar Hahn c58d478151 rename render_to_forbitten to render_to_forbidden. #370 2012-10-24 11:39:27 +02:00
Oskar Hahn 681d909fa3 rename application to motion 2012-10-24 11:07:36 +02:00
Norman Jäckel c036be05bf Fix new class based view for support/unsupport motions. Fix strange error in QuestionMixin. 2012-10-23 11:54:18 +02:00
Oskar Hahn 2984fd791c small fix to the person api 2012-09-15 09:11:56 +02:00
Emanuel Schuetze 7fde53a09e Updated template with twitter bootstrap. Step 1: agenda and application. 2012-09-05 00:20:28 +02:00
Oskar Hahn 31ca01563e some corrective actions 2012-08-13 14:37:49 +02:00
Oskar Hahn df40de67b0 rename openslidesuser to user and openslidesgroup to group 2012-08-12 12:52:38 +02:00
Oskar Hahn cdf160dfc3 fix some problems with the creation of new users 2012-08-11 11:09:20 +02:00
Oskar Hahn 9b3bec69d1 rewrote the passwort reset view as class base view 2012-08-10 21:24:26 +02:00
Oskar Hahn 87af568eeb redesign the DeleteView
Append a QuestionMixin to send a question via the django message api
2012-08-10 21:00:13 +02:00
Oskar Hahn ddb5756868 rewrote the participant edit view as class based view 2012-08-10 13:22:09 +02:00
Oskar Hahn 1719aa588d rename some user api and participant names 2012-08-07 22:43:57 +02:00
Oskar Hahn b55ceddb82 append tests for the participant app 2012-08-07 10:15:39 +02:00
Oskar Hahn 465497ab30 some pep8 changes for the user-api 2012-08-04 14:47:09 +02:00
Oskar Hahn 72e41fe286 user-api: reorderd the user-api 2012-08-04 13:18:06 +02:00
Oskar Hahn fe1ebf806a user-api: Use the right Exception in get_user() 2012-08-04 12:51:07 +02:00
Oskar Hahn 14bf6d0a35 user-api: updated the application-supporter system to new user-api 2012-08-04 12:19:31 +02:00
Oskar Hahn c16d38d9a3 user-api: Load the User-List from UserFormField on any request 2012-08-03 16:25:04 +02:00
Oskar Hahn 1ae91d1130 changed user-api, so it can be filter the result for the prefix and the id 2012-08-03 14:23:13 +02:00
Oskar Hahn 93020f9ead mark group to be teated as user 2012-08-03 12:44:34 +02:00
Oskar Hahn 4ffb701397 created new user-api 2012-08-03 00:11:53 +02:00
Emanuel Schuetze 1f3cfaf25a Added ugettext_lazy for 403 error page. 2012-07-23 23:06:36 +02:00
Emanuel Schuetze cdddc00d54 Improved else block. 2012-07-23 22:59:31 +02:00
Emanuel Schuetze 219b1e936e Fixed two PDF build errors. 2012-07-23 12:35:15 +02:00
Oskar Hahn 93f9e2dc97 fix error in the translation of the participant-list 2012-07-20 11:40:36 +02:00
Oskar Hahn 84a78e8584 #290 fix unicode problem for python 2.5 in strftime 2012-07-14 09:19:45 +02:00
Oskar Hahn 68215e78d6 add Licence for django-jsonfield 2012-07-11 09:45:48 +02:00
Oskar Hahn aa130ab2da cleanup openslides base files.
Do not manipulate the pythonpath anymore.
2012-07-10 14:00:51 +02:00
Oskar Hahn 5fcef8aba4 cleanup utils 2012-07-10 13:19:12 +02:00
Oskar Hahn debaa505fb fix problems with reportlab and ugettext_lazy 2012-07-10 12:11:07 +02:00
Andy Kittner 5438b2c318 Add a workaround for django bug 18404 (fixes #204) 2012-07-08 18:09:23 +02:00
Oskar Hahn e01d456e7b clean up the config app. Use jsonfield to save the config values.
Syncdb necessary.
2012-07-07 14:48:21 +02:00
Oskar Hahn 15621b7702 clean up the projector App 2012-07-07 14:01:40 +02:00
Oskar Hahn f8a1c58fff #277 throw an error, in the invalid-field or the votecast-field is lower -2 2012-07-07 11:14:04 +02:00
Oskar Hahn 1889cff68b #276 fix unicode Error in html_string() function 2012-07-07 10:35:29 +02:00
Oskar Hahn 29d25d30d6 cleanup the agenda app 2012-07-04 12:50:33 +02:00
Oskar Hahn ebc81d9236 #255 fixed assignment-poll delete message 2012-07-01 17:38:34 +02:00
Oskar Hahn 00eb365b91 rewrote active_slide in generic view
also reordert some imports
2012-07-01 15:35:05 +02:00
Oskar Hahn 0f42dd06fd #234 take 75 chars at maximum 2012-06-30 14:50:52 +02:00
Oskar Hahn e8e664b92e #237, #238 only show the first line of a comment in the agenda 2012-06-30 10:39:58 +02:00
Oskar Hahn 239f328372 rewrote projector-widget system 2012-06-11 13:43:48 +02:00
Oskar Hahn 960543b64e load all models in projector.views 2012-06-10 10:43:50 +02:00
Emanuel Schuetze d8cd0c2b6a Renamed logo files (typo). 2012-06-04 10:17:56 +02:00
Oskar Hahn 965b682abc edit, delete, slide for releated item in agenda 2012-06-03 09:35:26 +02:00
Emanuel Schuetze ca2900e9d1 #195: Fixed unicode string in pdf header. 2012-05-17 21:34:19 +02:00
Andy Kittner 3815ef26af Fix wrong translations in forms/ models
Converted utils.translation_ex.ugettext to use ugettext_lazy and changed
forms modules to import ugettext from there (models where already importing
it from there)
2012-05-15 01:08:08 +02:00
Emanuel Schuetze 4e8e9b5407 #155: Remove header/footer in frameless PDF. 2012-04-29 18:54:42 +02:00
Emanuel Schuetze 1a4a748e6c #112: Use monotype for printing first time password 2012-04-27 22:47:41 +02:00
Emanuel Schuetze 20ce7579ce #158: Added from_invalid error notification for ItemCreate/Update. 2012-04-27 21:40:42 +02:00
Emanuel Schuetze 7ef298881d Updated license header. 2012-04-25 22:29:19 +02:00
Emanuel Schuetze 5f3c6c4821 #111: Move pdf creation code from utils to participant app. 2012-04-20 23:23:50 +02:00
Emanuel Schuetze 7a6eaf2660 Fixed building AssignmentPollPDF. 2012-04-20 14:33:40 +02:00
Oskar Hahn 4e904c7356 now it is possible to create a item, witch is realted to another object, for example an application. 2012-04-19 12:46:04 +02:00
Oskar Hahn 59225bf822 added default get_filename for PDFView 2012-04-18 20:57:44 +02:00
Emanuel Schuetze 3812b5ebd1 #103: Set application filename. 2012-04-18 18:54:48 +02:00
Oskar Hahn e9e9fa54b2 fixed problem with deleting the default permissions 2012-04-18 16:57:33 +02:00
Oskar Hahn 6798050ded added help_message 2012-04-18 15:04:16 +02:00
Oskar Hahn 534a81c46c rewrote projector_messages system. Recalled it projector_overlay and added a special overlay for unique messages 2012-04-16 16:35:30 +02:00
Oskar Hahn c1cd0a2805 send class, not object, for template_manipulation 2012-04-16 11:11:45 +02:00
Emanuel Schuetze abf7721f3f Filled frontpage with config values. 2012-04-15 13:26:01 +02:00
Oskar Hahn 6f0fd91ec2 some permission problems 2012-04-15 12:52:59 +02:00
Emanuel Schuetze 4d7940cb12 Automated merge with ssh://openslides.org/openslides 2012-04-15 12:39:35 +02:00
Emanuel Schuetze 95d5929449 Added participant and version config page. Moved system settings to general. Some style work. 2012-04-15 12:39:28 +02:00
Oskar Hahn 1d5455f8f9 frontpage 2012-04-15 11:24:40 +02:00
Oskar Hahn e752ddf3ee fixe error with tabs in DetailView 2012-04-15 10:02:53 +02:00
Oskar Hahn 361bc40821 view for Agenda.item 2012-04-15 09:55:21 +02:00
Oskar Hahn 500b418f91 Automated merge with ssh://openslides.de/openslides 2012-04-14 20:10:56 +02:00
Oskar Hahn 3a849880fb code for control view in apps 2012-04-14 20:10:49 +02:00
Emanuel Schuetze a73b548032 Minor changes. 2012-04-14 18:13:55 +02:00
Oskar Hahn fbdcc5e0b4 Automated merge with ssh://openslides.de/openslides 2012-04-14 14:31:15 +02:00
Oskar Hahn 535795391d remove default permission after syncdb 2012-04-14 14:31:09 +02:00
Emanuel Schuetze 1528ab90c6 Merged. 2012-04-14 14:27:31 +02:00
Emanuel Schuetze d192ac4952 Added AssignmentPollDelete View. Moved Assignment pdf functions to assignment's views.py 2012-04-14 14:24:13 +02:00
Oskar Hahn 6f377453bc rename system in config. Add default config in each apps 2012-04-14 12:52:56 +02:00
Emanuel Schuetze a4db8a49dd Automated merge with ssh://openslides.org/openslides 2012-04-14 10:54:31 +02:00
Emanuel Schuetze 4abd79e7b5 Added PDF document title. 2012-04-14 10:54:22 +02:00
René Köcher d2f9f630c7 Move AnonymousAuth from system to utils. 2012-04-14 09:49:37 +02:00
René Köcher a792cd4c15 Support for localized permissions on top of the static django model. 2012-04-14 09:34:31 +02:00
Emanuel Schuetze 698697a75c Applications: Moved pdf functions from pdf.py to new PDF view in views.py. 2012-04-13 23:52:34 +02:00
Oskar Hahn f889c49c1b some clean up in participant app 2012-04-13 11:35:53 +02:00
Oskar Hahn d187f341b3 DeleteView in utils.views 2012-04-12 20:11:05 +02:00
Oskar Hahn 497a8cdb70 added AjaxView 2012-04-12 14:20:05 +02:00
Oskar Hahn 3eeae673c0 some small fixes 2012-04-11 10:58:59 +02:00
Oskar Hahn c4c42611b4 generate tab liste by app list 2012-03-18 17:11:58 +01:00
Oskar Hahn 282778c8a0 fixed error with permission Mixin 2012-03-18 14:33:53 +01:00
Oskar Hahn f54cf05fc6 bug in signals 2012-03-17 00:22:46 +01:00
Oskar Hahn fb17b16fae config pages in apps 2012-03-16 14:31:59 +01:00
Oskar Hahn ccdce52caa start a way to send messages to the projector. Start to use this api for the countdown 2012-03-16 12:28:42 +01:00
Oskar Hahn 062e9bd4cb added signals for template-context-manipulation 2012-03-06 12:16:03 +01:00
Oskar Hahn 281450341d some fixes to pdf.py 2012-02-21 13:32:39 +01:00
Oskar Hahn e9299625ae Automated merge with ssh://openslides.de/openslides 2012-02-21 13:17:58 +01:00
Oskar Hahn 898cab4aa8 Generate Agenda-PDF in a generic View. Added PDFView in utils.views.py 2012-02-21 13:17:42 +01:00
Emanuel Schuetze 0cc5d6478d Changed config_get() to config[]. 2012-02-21 08:07:56 +01:00
Oskar Hahn 1e7d420485 added utils.forms.py 2012-02-20 18:44:38 +01:00
Oskar Hahn 8c52ecd669 generic views for the Agenda-App 2012-02-20 17:46:45 +01:00
Oskar Hahn 7e076dc6c4 removed some unneedet dependencies 2012-02-20 00:39:52 +01:00
Oskar Hahn 114a68b120 some additions in poll and application-poll 2012-02-15 13:44:55 +01:00
Oskar Hahn bc05b78648 rewrote the config api 2012-02-15 12:04:11 +01:00
Oskar Hahn 0957de83a9 start to rewrite the poll-api 2012-02-14 16:31:21 +01:00
Oskar Hahn 21a13b4d1a The Version of openslides can be written in openslides/__init__.py 2012-02-09 13:43:39 +01:00
Oskar Hahn 28170becb3 cleand the apenda-app 2012-02-09 02:29:38 +01:00
Emanuel Schuetze 8ed81db9f2 Application import: Added propper_unicode function to handle
unicode/ascii mix. Thanks to Rene Koecher!
2011-11-29 12:10:06 +01:00
rene 03bca90511 Extend patchup for builtin excel dialect 2011-11-24 20:24:13 +01:00
rene d75e736be7 Add patchup-helper to assist csv.Sniffer() 2011-11-24 19:38:25 +01:00