Commit Graph

385 Commits

Author SHA1 Message Date
Norman Jäckel
ccaa1eaf27 Added create, updated and destroy view for assignment polls. 2015-06-14 23:26:06 +02:00
Norman Jäckel
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
Norman Jäckel
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
Oskar Hahn
9f93208afd Merge pull request #1512 from normanjaeckel/AssignmentRESTAPIChanges
Assignment REST API changes
2015-04-19 21:26:58 +02:00
Norman Jäckel
d0dc2f8934 Set assignment phase index to zero. Added views to manage candidatures. 2015-04-19 21:20:39 +02:00
Oskar Hahn
505e587d6f Send tree for agenda items 2015-04-17 16:46:13 +02:00
Norman Jäckel
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
Oskar Hahn
cfdabfbb40 Added utils.views.CSRFMixin to append the csrf token to a view
Fixes: #1476
2015-02-17 20:09:09 +01:00
Oskar Hahn
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
Norman Jäckel
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
Norman Jäckel
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
Oskar Hahn
7171a71919 angular single page application 2015-02-05 23:06:09 +01:00
Norman Jäckel
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
Norman Jäckel
aad0e8d2d2 Merge pull request #1437 from ostcar/tornado_requests
Send data via tornado and sockjs.
2015-01-31 14:36:54 +01:00
Norman Jäckel
7238b8159a Added REST api for motion, mediafile and config app. Refactor REST api in other apps. 2015-01-31 14:15:10 +01:00
Oskar Hahn
7ec4cdcdf7 send data via tornado 2015-01-30 14:00:04 +01:00
Oskar Hahn
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
Oskar Hahn
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
Oskar Hahn
35024764cf Rework of management command 2015-01-23 15:40:12 +01:00
Oskar Hahn
285d8c2cfb Use a real anonymous user object, instadt of a authentification backend 2015-01-23 15:38:14 +01:00
Norman Jäckel
0d56424c90 Refactored REST api in agenda, core and users app. 2015-01-17 15:58:51 +01:00
Norman Jäckel
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
Oskar Hahn
1a1d072454 remove update_projector and add inform_changed_data 2015-01-17 15:16:49 +01:00
Roland Geider
06b5ad5f2e Fix typos 2015-01-17 12:12:08 +01:00
Oskar Hahn
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
Norman Jäckel
b0422c4680 Added api viewset for agenda items.
Fixed style checker problem.
2015-01-17 09:18:40 +01:00
Norman Jäckel
7ed5d2fc43 Setup Django REST Framework. 2015-01-17 08:49:52 +01:00
Norman Jäckel
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
Emanuel Schuetze
3127048be5 Fixed haystack indexing problem for m2m objects.
Updated django-haystack to <2.4.
2015-01-16 23:07:56 +01:00
Oskar Hahn
4f27b9b63d Fix LocalizedModelMultipleChoiceField
It has to be a generator, so it does not call the queryset
2015-01-16 20:47:43 +01:00
Oskar Hahn
34b6ca80f3 Merge branch 'stable/1.6.x'
Conflicts:
	CHANGELOG
	openslides/users/signals.py
2015-01-06 13:04:07 +01:00
Oskar Hahn
bcb1ee1213 Tags for motions, agenda items and assignments 2015-01-03 17:00:48 +01:00
Norman Jäckel
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
Norman Jäckel
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
Oskar Hahn
5c6f7a41a8 Merge branch 'stable/1.6.x'
Conflicts:
	tests/assignment/test_views.py
2014-10-18 08:53:51 +02:00
Oskar Hahn
c454faef94 Updated Django to 1.7.x 2014-10-14 17:14:52 +02:00
Oskar Hahn
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
Oskar Hahn
32137b6523 Use python3
python3.3 and python3.4 are supported
2014-08-24 21:21:11 +02:00
Emanuel Schuetze
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
Norman Jäckel
ae99784372 Enabled reload always when DEBUG==True. 2014-05-19 22:29:05 +02:00
Oskar Hahn
22bacd1054 bind the reload of the webserver on the debug settings
fix #1163
2014-05-19 22:18:45 +02:00
Oskar Hahn
16a6ad4a9e Merge pull request #1278 from rolandgeider/ckeditor
Replace own CKeditor with dedicated app
2014-05-19 15:15:54 +02:00
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