a0f4506c35
Merge pull request #1549 from normanjaeckel/ConfigRefactoring
...
Refactored config API. Removed form_fields. Added extra fields for HT…
2015-06-18 23:40:23 +02:00
a4c00d5ee3
Angular Client
...
* Split angular app into a site- and a projector app
* Created client slide api and slides for customslide and user
* JS-function to activate a slide
2015-06-18 23:23:34 +02:00
c5fbe2e9ee
Refactored config API.
...
Removed form_field attributes.
Added extra fields for HTML rendering like label and help text.
Added fields for sorting and grouping. Removed old collection system.
Added config groups to config view via OPTIONS requests.
Regrouped all variables.
Added validation. Changed internal handling.
2015-06-18 21:13:30 +02:00
632ca2bd9a
Renamed config variables. Fixed error in settings.
2015-06-17 12:07:09 +02:00
51455e8563
Merge pull request #1539 from ostcar/delete_old_stuff
...
Delete old stuff.
2015-06-16 17:32:38 +02:00
fbf7d0e43d
Remove old thinks not needed for the 2.0 release:
...
* django templates
* widgets
* views
* mppt
* main_menu
* projector 1.x api
Sorted all imports
Add a ending slash to each url with a redirect view
2015-06-16 17:07:39 +02:00
ea908419be
Fixed FileFinder importer for plugin detection in portable.
...
Updated setuptools version for openslides-gui.
2015-06-16 10:38:54 +02:00
5813b8341c
Added permission check for objects required for active projector elements.
2015-06-15 18:22:15 +02:00
ccaa1eaf27
Added create, updated and destroy view for assignment polls.
2015-06-14 23:26:06 +02:00
dc7d27a985
Added REST API for projector. Introduced new projector API.
...
Added custom slide projector element class.
Added welcome slide as custom slide.
Added user slide projector element class.
Added clock, countdown ans message projector elements.
Renamed SignalConnectMetaClass classmethod get_all_objects to get_all (private API).
Added migrations to core app.
Fixed and wrote tests.
Updated CHANGELOG.
2015-05-29 12:44:25 +02:00
b30afbd635
Added several motion REST API views.
...
Added motion creation view, motion update view, version permit and delete view, view to support motions, view to set and reset state. Refactored motion submitters and supporters.
2015-05-13 12:22:50 +02:00
9f93208afd
Merge pull request #1512 from normanjaeckel/AssignmentRESTAPIChanges
...
Assignment REST API changes
2015-04-19 21:26:58 +02:00
d0dc2f8934
Set assignment phase index to zero. Added views to manage candidatures.
2015-04-19 21:20:39 +02:00
505e587d6f
Send tree for agenda items
2015-04-17 16:46:13 +02:00
9b369e1afc
Changed development settings path.
...
Settings and user data live now at development/var/.
Move your existing directory or create new settings and database.
2015-03-06 16:43:13 +01:00
cfdabfbb40
Added utils.views.CSRFMixin to append the csrf token to a view
...
Fixes : #1476
2015-02-17 20:09:09 +01:00
1969416e64
Implemented auth via AngularJS
...
Also added the derective osPerms to check if the current user has permissions.
Removed old Django views and urls for user.
Created utils.views.APIView which should be used instead of the AjaxView.
Fixes : #1470
Fixes : #1454
2015-02-16 11:42:48 +01:00
3a19218bd5
Refactored parts of users app.
...
Refactored user creation and update via REST API. Used new serializer.
Cleaned up management commands, signals and imports. Moved code from 'api.py' to 'models.py'.
Changed usage of group 'Registered'. Now the users don't have to be members to gain its permissions. Used customized auth backend for this.
Added and changed some tests.
2015-02-14 02:29:53 +01:00
87cd31f6a5
Updated ViewSets to Django REST Framework 3.0.5. Refactored imports from openslides/utils/rest_api.py for better overriding them later.
...
Fixed #1450 . Updated requirements.
2015-02-12 19:19:44 +01:00
7171a71919
angular single page application
2015-02-05 23:06:09 +01:00
eed5c59013
Refactored serializers and autoupdate.
...
Added api for groups.
Refactored serializers now using 'id' instead of 'url'.
Rework of tornado autoupdate functionality.
Implemented extra data in SockJS messages.
2015-02-05 19:49:54 +01:00
aad0e8d2d2
Merge pull request #1437 from ostcar/tornado_requests
...
Send data via tornado and sockjs.
2015-01-31 14:36:54 +01:00
7238b8159a
Added REST api for motion, mediafile and config app. Refactor REST api in other apps.
2015-01-31 14:15:10 +01:00
7ec4cdcdf7
send data via tornado
2015-01-30 14:00:04 +01:00
e7230b7391
New Test order.
...
* seperate unittests and integration tests
* moved old tests in seperat folder 'old'
* created a testrunner that does not create a testdatabase, if only unittests are run
* wrote some unit- and integration tests as examples
* fixed user.get_short_name() to use the sort order from config
* fixed wrong url_pattern in the user app
2015-01-24 18:00:03 +01:00
ea45469338
Merge pull request #1424 from ostcar/simple_anonymous_user
...
Use a real anonymous user object, instadt of a authentification backend
2015-01-23 15:53:03 +01:00
35024764cf
Rework of management command
2015-01-23 15:40:12 +01:00
285d8c2cfb
Use a real anonymous user object, instadt of a authentification backend
2015-01-23 15:38:14 +01:00
0d56424c90
Refactored REST api in agenda, core and users app.
2015-01-17 15:58:51 +01:00
2b744942e7
Merge pull request #1407 from ostcar/super_signal
...
Remove update_projector and add inform_changed_data.
2015-01-17 15:25:41 +01:00
1a1d072454
remove update_projector and add inform_changed_data
2015-01-17 15:16:49 +01:00
06b5ad5f2e
Fix typos
2015-01-17 12:12:08 +01:00
0a24b7267b
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
README.rst
openslides/assignment/models.py
openslides/users/forms.py
requirements_production.txt
tests/settings.py
2015-01-17 10:18:29 +01:00
b0422c4680
Added api viewset for agenda items.
...
Fixed style checker problem.
2015-01-17 09:18:40 +01:00
7ed5d2fc43
Setup Django REST Framework.
2015-01-17 08:49:52 +01:00
f7cb518430
Used Bower and gulp to manage third party JavaScript and Cascading Style Sheets libraries.
...
Cleaned up settings. Updated development section in README.rst.
Removed jQuery, jquery.cookie and bootstrap from repository.
2015-01-17 00:12:04 +01:00
3127048be5
Fixed haystack indexing problem for m2m objects.
...
Updated django-haystack to <2.4.
2015-01-16 23:07:56 +01:00
4f27b9b63d
Fix LocalizedModelMultipleChoiceField
...
It has to be a generator, so it does not call the queryset
2015-01-16 20:47:43 +01:00
34b6ca80f3
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
openslides/users/signals.py
2015-01-06 13:04:07 +01:00
bcb1ee1213
Tags for motions, agenda items and assignments
2015-01-03 17:00:48 +01:00
dcd8b7a639
Merge branch 'stable/1.6.x' into 'master'.
...
Conflicts:
CHANGELOG
openslides/agenda/views.py
openslides/assignment/views.py
openslides/mediafile/views.py
openslides/users/views.py
openslides/utils/views.py
tests/motion/test_pdf.py
tests/settings.py
2015-01-02 22:11:56 +01:00
f6b1a84545
Cleaned up utils.views to increase performance when fetching single objects from the database for a view. Fixed #1378 .
2014-12-25 00:02:50 +01:00
5c6f7a41a8
Merge branch 'stable/1.6.x'
...
Conflicts:
tests/assignment/test_views.py
2014-10-18 08:53:51 +02:00
c454faef94
Updated Django to 1.7.x
2014-10-14 17:14:52 +02:00
3527b0a75b
Refactory of the participant app
...
* New user model (used Django's AbstractBaseUser)
* Renamed the app to users
* removed person api
See #861
Fixed #576 #478
2014-10-12 10:06:54 +02:00
32137b6523
Use python3
...
python3.3 and python3.4 are supported
2014-08-24 21:21:11 +02:00
648d5a6ad7
Fixed CKEditor stuff:
...
- Added missing insertpre plugin and allow <pre> tag with class
attribute. Added font style to base.css.
- Removed unused link to old ckeditor.css (now managed by
django-ckeditor).
2014-07-14 22:54:53 +02:00
ae99784372
Enabled reload always when DEBUG==True.
2014-05-19 22:29:05 +02:00
22bacd1054
bind the reload of the webserver on the debug settings
...
fix #1163
2014-05-19 22:18:45 +02:00
16a6ad4a9e
Merge pull request #1278 from rolandgeider/ckeditor
...
Replace own CKeditor with dedicated app
2014-05-19 15:15:54 +02:00
38a4cf1bc3
Merge pull request #1295 from emanuelschuetze/pdf-fix
...
PDF: Added missing 'fontName'.
2014-05-19 09:57:50 +02:00
5dc4742f2f
Merge pull request #1291 from emanuelschuetze/fix-1235
...
Fixed #1235 (DeprecationWarning in utils.views.PDFView).
2014-05-19 09:54:45 +02:00
e9d52245cb
Replace own CKeditor with dedicated app
2014-05-19 00:00:18 +02:00
5f202c22a7
PDF: Add missing 'fontName'.
...
And set 'registerFontFamily(...)' to use bold/italic in regular paragraphs.
2014-05-18 13:57:20 +02:00
bacc9ca87b
Fixed #1235 (DeprecationWarning in utils.views.PDFView)
2014-05-17 13:42:18 +02:00
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
43429d4015
Changed some docstrings.
2014-05-12 22:57:57 +02:00
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
7add4c5691
Portable: Create empty plugins directory.
...
Fixed file permissions.
2014-05-05 21:01:25 +02:00
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
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
d638d5b7e2
Fixed bug of numbering view when there are orga items. Renamed toRoman to to_roman.
2014-05-04 14:00:28 +02:00
2c5b3a8e4f
Automatic numbering of agenda items
2014-05-04 13:47:01 +02:00
42796f6118
Added global chatbox for managers.
2014-04-27 20:58:22 +02:00
2a10feecad
Added CSV import, fixed #1186 . Also cleaned up motion and user CSV import.
2014-04-13 20:35:19 +02:00
78077e4ab1
Fix syntax and style errors and errors after deficient merge conflic
...
resolving after branch merging.
2014-04-08 21:02:09 +02:00
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
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
ce8274fb53
Inserted command line option to translate config strings during database setup. Fixed #460 .
2014-01-31 02:03:43 +01:00
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
04b0cfb0bc
Used entry points to detect plugins automaticly.
2014-01-12 12:48:24 +01:00
e0223c950b
Added possibility to use custom templates and static files in user data path directory.
2014-01-12 11:05:54 +01:00
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
90f9313faa
Use the jsonfield as requirement
2014-01-11 23:01:29 +01:00
56c8dcdac1
Merge branch 'stable/1.5.x'
2014-01-11 22:58:39 +01:00
cde6232477
Merge branch 'stable/1.5.x'
...
Conflicts:
openslides/projector/projector.py
openslides/templates/base.html
2014-01-11 22:30:14 +01:00
19ccbd3b17
Fixed error in main script when using other database engine. Fixed #1166 .
2014-01-11 08:51:17 +01:00
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
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
9a3243706b
Inserted api for the personal info widget.
2013-12-09 12:16:16 +01:00
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
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
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
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
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
cc0298eaa0
Use encoded string for insert in sys.path and print during main script. Fix #1022 .
2013-11-10 22:21:14 +01:00
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
17a2eb97cb
Check used port, fix #985 .
2013-11-06 17:49:41 +01:00
0752d476e4
Change to MIT Licence
...
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
3ec18194fa
New command create-dev-settings. Clean up main script. Fix wrong path for Windows version.
2013-10-29 00:48:49 +01:00
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
47c60078b3
Use sockjs instead of only websocket
2013-10-27 20:50:10 +01:00
a513477033
Fixed #948 : Use DIN A4 format and wlan ssid qrcode on access data PDF.
2013-10-25 20:51:48 +02:00
82f0df4fea
Send js to the projector
...
* fixed scroll and scale of the projector
2013-10-21 07:53:21 +02:00
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
21a1d77e29
fix gui/portable for pull request #903
2013-10-19 14:44:20 +02:00
c63b7f995f
Clean up main.py and move code to __main__.py and utils/main.py.
2013-10-19 14:44:20 +02:00
e277b8babf
Full text search with haystack and whoosh.
...
Updated THANKS file.
Portable: Added haystack and whoosh.
2013-10-16 08:58:35 +02:00
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
d644d49579
Cleaned up utils
2013-10-13 20:43:26 +02:00
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
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
477daa3fdf
Success_message in utils.views
2013-09-14 11:09:45 +02:00
c88d180808
Deletes config cache after each test if it exists.
2013-08-19 18:05:03 +02:00
25bac4a704
Fixed a bug when setting a config var before getting one
2013-08-19 17:59:35 +02:00
20cf960c82
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/core/templatetags/tags.py
2013-08-19 17:54:50 +02:00
99895a28d1
Fix get_absolute_url for deleted persons.
...
Fix #845
2013-08-19 10:50:37 +02:00
967c199a56
Removed utils from INSTALLED_APPS.
...
Moved utils.management and utils.templatetags to core
2013-08-11 09:40:14 +02:00
64af0b162f
Create admin-user after syncdb
2013-06-16 17:07:55 +02:00
dfc160af5b
Disable interactive mode of the syncdb command, fixed #696
2013-06-16 01:05:22 +02:00
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
e630d600ed
Fixes #648
...
delete function for the motion versions
2013-06-15 09:18:21 +02:00
48f237a92f
Print listening info to command line
2013-06-13 16:58:34 +02:00
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
0d1db941b8
Insert LocalizedModelChoiceField for use in MotionSetWorkflowMixin. Fixed #713 .
2013-06-09 16:41:58 +02:00
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
fb91317ce1
Add command to backup the database
2013-06-04 00:07:22 +02:00
e5e7e1bcce
Template improvements.
...
Improved agenda and participants overview.
2013-06-03 22:38:45 +02:00
d5becd5c18
Fixed #431 : Template improvements (removed unused loaded tags and check of all html template files)
2013-05-30 23:25:49 +02:00
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
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
864d20274e
Fixed #636 . Insert general url_name_args attribute to some generic views in utils.views.
2013-05-13 18:15:53 +02:00
b0e5854833
Fixed #629
2013-04-28 10:21:31 +02:00
100238bc66
Fixed #580
2013-04-28 09:37:15 +02:00
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
f581169e1e
Fixed saving anonymous user in a PersonField
2013-04-24 09:28:58 +02:00
0549d22ec8
Fixed manage.py runserver.
...
The reload function did not work
2013-04-21 18:42:58 +02:00
db1503ad7b
Format fix
2013-04-19 19:15:57 +02:00
56844d93f2
Move CKeditor configuration to a separate JS file
...
Remove unneeded try-except block
2013-04-18 13:26:01 +02:00
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
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
fa95119936
New Feature: List of speakers.
2013-04-15 19:23:37 +02:00
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
e40a2e9332
Restart tornado on file changes, respect port and adress flags
2013-04-03 23:20:56 +02:00
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
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
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
3832aa4178
Tests for the motion views
2013-03-15 12:18:27 +01:00
c46ec570bf
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-15 02:16:26 +01:00
81eb92a761
fixed pep8
2013-03-15 02:14:15 +01:00
1a2ebf7b3b
removed some unused functions
2013-03-15 01:34:17 +01:00
2a2c704bf2
GetVersionMixin not required. Fixed htmldiff function.
2013-03-14 23:26:41 +01:00
3f4df58807
Moved htmldiff function to utils.py. Fixed travis build error (pep8).
2013-03-14 23:22:11 +01:00
43cd5aba00
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-14 22:44:11 +01:00
545d4be04f
fixed update of person_api
2013-03-14 22:32:00 +01:00
d21185a449
Merge branch 'master' of github.com:OpenSlides/OpenSlides into category
2013-03-12 22:05:20 +01:00
03fff46517
Add new TestCase class in utils to call the signal on running every test.
2013-03-12 21:38:22 +01:00
31ba70efd1
Category Delete View
2013-03-11 21:38:07 +01:00
514577f7c6
Built-in Workflows are created by listening to a signal which is sent after syncdb.
2013-03-11 21:32:09 +01:00
51a9e41015
Set new django setting. Put tornado code in a seperate file.
2013-02-27 18:54:06 +01:00
2822c39f8a
Merge branch 'master' into tornado
2013-02-18 19:08:58 +01:00
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
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
82e35bebff
Fixed wrong deletion if user clicks "no" in confirm form.
2013-02-05 21:31:45 +01:00
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
e7c65b3db1
Moved some methodes from utils.views.DeleteView to QuestionMixin
2013-02-03 13:23:55 +01:00
15b13c2bcd
Handel null=True in PersonField
2013-02-02 21:19:37 +01:00
2e430b4406
check permission in motion view
2013-02-02 10:59:07 +01:00
3ffb16d4d8
Fixed pep8 errors
2013-02-02 10:52:13 +01:00
6c3eb0f765
fixed urls in views from the participant app
2013-02-01 17:35:27 +01:00
1a2f0a1b5a
Added links to set and reset the state of a motion
2013-02-01 17:20:11 +01:00
b6256b73e0
Changed utils.views.DeleteView
2013-02-01 13:24:30 +01:00
adeaf248ef
Changed utils.- and poll.views
2013-02-01 12:51:01 +01:00
d3b340769b
Added motion config tab
2013-01-26 16:33:55 +01:00
ecb6419f8c
fixed apply and success url in utils.views
2013-01-26 16:19:53 +01:00
1f87749742
Save the submitters to the motion
2013-01-26 15:25:54 +01:00
3bfead298d
Add custom management command to start the application with tornado
2013-01-23 21:12:36 +01:00
586425354d
Reworked new template, especially agenda and dashboard.
2013-01-08 23:05:35 +01:00
0231fe37f5
Start to rewrite the motion app
2013-01-08 20:22:03 +01:00
deb0d5b2e5
Some fixes. Update requirements.txt and setup.py.
2013-01-05 23:20:38 +01:00
13cd52bd96
Merged (conflicts).
2013-01-05 15:29:57 +01:00
6417f5f107
fixed pep8 error
2013-01-05 14:56:22 +01:00
2fcf0b3a07
fixed typo in utils/views.py
2013-01-05 14:46:05 +01:00
ae8641bcad
Raise an error if an CreateView does not define a apply_url
2013-01-05 01:48:03 +01:00
2f28655a25
Show Tabs if there do not define some permissions
2013-01-05 01:03:42 +01:00
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
b79fedc215
fixed jsonfield for django 1.5
2012-12-14 15:36:57 +01:00
366b8e0f1f
Droped support for python 2.5
2012-12-14 14:21:53 +01:00
589c209c79
Merge branch 'master' into Version_String
...
Conflicts:
openslides/__init__.py
openslides/config/views.py
2012-11-28 17:54:29 +01:00
e7c47395bb
Gave the empty user all the attributes it needs
2012-11-27 22:46:54 +01:00
4dfd4ac67f
fix _proper_unicode
2012-11-26 15:48:23 +01:00
bdfb714013
fixed pep8 in pdf.py
2012-11-26 10:35:29 +01:00
b3806d8cdd
some tests for the agenda
2012-11-24 21:10:55 +01:00
bd32994296
cleanup
...
Removed unused imports and fixed pep8 errors
2012-11-24 14:01:21 +01:00
f5a438cf9f
cleanup in utils
2012-11-24 01:42:10 +01:00
4c97291598
Remove non-used revision template var.
2012-11-23 11:33:34 +01:00
1dc7d45670
sort persons in motions
2012-11-22 17:00:09 +01:00
8014f327a2
Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api
2012-11-22 16:35:26 +01:00
fbf81e7780
sort persons
2012-11-22 16:19:09 +01:00
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
e338529865
#296 : Localised the datetime in PDF header
2012-11-17 21:44:17 +01:00
5623bb6888
Move professional support message into base template footer.
2012-11-08 19:13:31 +01:00
79c5e93422
Redesigned the QuestioMixin
2012-10-28 19:59:41 +01:00
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
413cd27d40
fixed deletion of motions. #391
2012-10-24 12:45:40 +02:00
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
c58d478151
rename render_to_forbitten to render_to_forbidden. #370
2012-10-24 11:39:27 +02:00
681d909fa3
rename application to motion
2012-10-24 11:07:36 +02:00
c036be05bf
Fix new class based view for support/unsupport motions. Fix strange error in QuestionMixin.
2012-10-23 11:54:18 +02:00
2984fd791c
small fix to the person api
2012-09-15 09:11:56 +02:00
Oskar Hahn