Commit Graph

1968 Commits

Author SHA1 Message Date
Oskar Hahn 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
Norman Jäckel 95683949ec Merge pull request #1536 from emanuelschuetze/portable-fixes
Fixed FileFinder importer for plugin detection in portable.
2015-06-16 17:00:30 +02:00
Oskar Hahn 1ccd2ab91c Merge pull request #1529 from normanjaeckel/RESTConfig
Added config update view.
2015-06-16 16:18:33 +02:00
Norman Jäckel 3e2aa6c081 Update 2015-06-16 14:04:38 +02:00
Emanuel Schuetze ea908419be Fixed FileFinder importer for plugin detection in portable.
Updated setuptools version for openslides-gui.
2015-06-16 10:38:54 +02:00
Norman Jäckel 6f02d769cc Added config update view. 2015-06-15 18:24:23 +02:00
Norman Jäckel 5813b8341c Added permission check for objects required for active projector elements. 2015-06-15 18:22:15 +02:00
Oskar Hahn a604f36634 Merge pull request #1537 from normanjaeckel/RESTPoll
Added create, updated and destroy view for assignment polls.
2015-06-15 16:34:11 +02:00
Oskar Hahn cb1b262c92 Fix anonymous user for rest requests 2015-06-15 15:54:39 +02:00
Norman Jäckel ccaa1eaf27 Added create, updated and destroy view for assignment polls. 2015-06-14 23:26:06 +02:00
Norman Jäckel a033f74ba1 Merge pull request #1527 from ostcar/start_browser_on_localhost
Start the browser on 127.0.0.1.
2015-06-12 13:01:00 +02:00
Oskar Hahn e836bccb72 Start the browser on 127.0.0.1
Fixed #1525
2015-06-11 11:37:01 +02:00
Norman Jäckel 5de7365c9a Merge pull request #1526 from normanjaeckel/AgendaSpeakerREST
Added view to add and remove users from the list of speakers.
2015-05-29 13:08:10 +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 0853701cdd Added view to begin and end speach. 2015-05-27 15:42:32 +02:00
Norman Jäckel 95be18b78e Added view to add and remove users from the list of speakers. 2015-05-26 18:42:39 +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
Emanuel Schuetze 8d638a908d Added new angularjs templates
for agenda, motions, assignments, users and mediafiles apps.

Users app:
- Show permissions in group form (Fixed #1500)
- Added experimental csv import for users.

Agenda:
- new agenda sort view.
- Added experimental angular-xeditable for item-list view.

General:
- Added core.tag templates.
- Added mediafiles templates.
- Remove old template and js files. Remove old views.
- Skip old tests.

Added external angular modules:
- angular-loading-bar (Fixed #1448)
- ui-tree (for sorting agenda tree)
- ng-fab-forms (for better form validation)
- ui-bootstrap (for modal window, dropdown, popover)
- ngBootbox (for confirm delete dialogs in agenda and users app)
2015-05-06 09:19:16 +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
Oskar Hahn 0b5f75339e Rename apps and permissions
* Fixed agenda permissions
* Renamed assignment to assignments, fixed assignments permission names
* Renamed mediafile to mediafiles
* Renamed motion to motions. Fixed motions permission names
2015-03-29 20:35:53 +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 80ca3f2484 Use ui-router to handle django urls
See: #1453
2015-03-02 19:03:19 +01:00
Emanuel Schuetze db3625ec91 Angular templates for users app. Use angular-gettext.
- Use new "Font Awesome" icons.
- Sorting columns.
- Filter table.
- New focusMe directive.
- Delete user
- Use ui-sref.
- Use angular-gettext for i18n.
- Added sample po files for DE and FR.
- group views
- use google coding style (2 spaces, optional end tags, etc)
2015-03-02 16:25:36 +01:00
Norman Jäckel 681d1115c9 Merge pull request #1499 from ostcar/autoupdate_delete
Autoupdate for delete views.
2015-03-01 16:52:37 +01:00
Oskar Hahn 86c189c964 Autoupdate for delete views
Fixes: #1495

Also fixed the (example) assignment angular code
2015-03-01 08:42:47 +01:00
Oskar Hahn f8e18a8900 Altered ui-router definitions
1. Allow trailing slash in urls
2. Use integer ids for detail views as default
2015-03-01 07:15:44 +01:00
Oskar Hahn 787343d651 Fixes users password PDF view.
Fixes: #1496
2015-02-27 11:56:31 +01:00
Norman Jäckel 2ef7c7cf29 Added 'id' to user creation response. 2015-02-25 17:16:36 +01:00
Norman Jäckel 1777ac48b6 Cleaned up urls.py. Fixed #1472. Removed use of 'django.views.i18n.javascript_catalog'. 2015-02-25 16:55:44 +01:00
Norman Jäckel acbfd84fc5 Cleaned up users.signals. Fixed #1483. 2015-02-25 16:12:20 +01:00
Norman Jäckel 1fe84195e1 Merge pull request #1488 from normanjaeckel/OpenSlidesVersion
Updated setup.py and openslides module init, esp. version string.
2015-02-25 13:37:13 +01:00
Norman Jäckel 274648b180 Merge commit 'stable/1.7.x' into master.
Conflicts:
	CHANGELOG
	openslides/__init__.py
	openslides/assignment/views.py
2015-02-25 13:26:49 +01:00
Oskar Hahn de52634561 Merge pull request #1482 from normanjaeckel/Groups
Updated REST API for group create, update and delete.
2015-02-25 12:12:13 +01:00
Norman Jäckel 8c04454ecd Updated setup.py and openslides module init, esp. version string. Removed git commit id grabbing during development. 2015-02-18 16:44:26 +01:00
Norman Jäckel fd34055611 Updated REST API for group create, update and delete. 2015-02-17 21:24:33 +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 0f55583b4c Updated version to 1.7.1-dev 2015-02-15 20:48:02 +01:00
Norman Jäckel 7806e79574 Release 1.7 2015-02-15 20:45:21 +01:00
Norman Jäckel 3015e3d389 Updated CHANGELOG. Updated language files (only metadata changes). 2015-02-15 20:43:15 +01:00
Oskar Hahn 411213b1ce Merge pull request #1458 from normanjaeckel/feature/rest-api/users
Refactoring users app.
2015-02-14 02:35:56 +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 99c6a4dbd8 Merge pull request #1461 from ostcar/js-data
Updated angular-data to js-data (angular-data 2.1).
2015-02-14 00:32:17 +01:00
Oskar Hahn d31be54817 Update angular-data to js-data (angular-data 2.1)
Also reload all data after 5 minutes
2015-02-13 23:27:27 +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 c4c9322321 Rework of assignment
fixes: #1429, #1345

A database recreation is needed
2015-02-12 10:14:10 +01:00
Oskar Hahn ac6f3de60d Used AngularUI Router for more generic URL routing. 2015-02-12 09:52:07 +01:00
Oskar Hahn dcd7ce4e80 Small agenda improvments
Updated the tests and changed only small internal parts of method of the agenda model. No API changes
2015-02-09 20:30:04 +01:00
Oskar Hahn 7171a71919 angular single page application 2015-02-05 23:06:09 +01:00
Oskar Hahn afc295b2ec Merge pull request #1441 from normanjaeckel/RefactorConfigAPI
Added api retrieve method for config variables. Refactored api output.
2015-02-05 20:05:56 +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 ecf7e07fe7 Added api retrieve method for config variables. Refactored api output. 2015-02-05 19:42:51 +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 c7b52245b7 Fix AssignmentPollUpdateView 2015-01-25 15:15:28 +01:00
Oskar Hahn b4e17b9b35 fix #1430 - anonymous user and motion detail view 2015-01-25 01:20:59 +01:00
Oskar Hahn ac01d39eaa use our anonymous user object for the rest framework
fix: #1432
2015-01-25 01:11:14 +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
Oskar Hahn 8b88d38ac5 Merge branch 'stable/1.7.x'
Conflicts:
	openslides/__init__.py
	openslides/assignment/views.py
	openslides/motion/pdf.py
	openslides/users/pdf.py
2015-01-23 02:33:17 +01:00
Norman Jäckel 33c4562e62 Updated version to 1.7 2015-01-21 20:58:03 +01:00
Norman Jäckel 136f57057f Release 1.7b1 2015-01-21 20:58:03 +01:00
Norman Jäckel afc2b246db Fixed bug in chatbox. 2015-01-21 17:24:39 +01:00
Emanuel Schuetze 6cbec7a32a Updated translations (DE, FR, CS, PT) for 1.7. 2015-01-21 15:59:27 +01:00
Emanuel Schuetze 4296fb0360 Show special characters in PDF, like "&". (Fixed #1415)
Added escape function for agenda, motion, assignment and participants
pdf views.
2015-01-21 13:03:03 +01:00
Emanuel Schuetze 18fe7e2d89 Update to bootstrap 3.3.1. 2015-01-21 12:23:32 +01:00
Norman Jäckel c5a7cc889e Merge pull request #1411 from boehlke/master
Fix #1352 and fix order in motion form.
2015-01-18 09:07:24 +01:00
André Böhlke 591d230cbb Fix field order in motion forms.
Add documentation for new attribute.
Added .idea to .gitignore.
2015-01-18 01:01:38 +01:00
Norman Jäckel 4821a3b59b Added api for assignments.
Also small changes in agenda REST api.
2015-01-17 22:46:23 +01:00
André Böhlke e2e16a4c34 explicitly define fields attribute to fix deprecation warnings 2015-01-17 22:28:32 +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 8cb70017da Added api viewset for users. 2015-01-17 08:51:57 +01:00
Norman Jäckel 7644cb9a09 Added api viewset for custom slides. 2015-01-17 08:51:54 +01:00
Norman Jäckel 7ed5d2fc43 Setup Django REST Framework. 2015-01-17 08:49:52 +01:00
Norman Jäckel 82f46708f6 Merge pull request #1397 from emanuelschuetze/haystack-fix
Fixed haystack indexing problem for m2m objects.
2015-01-17 00:21:45 +01:00
Norman Jäckel 9b89e10cc7 Merge pull request #1398 from emanuelschuetze/portable-install-script
Improved portable install script.
2015-01-17 00:20:49 +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 fd266a4e45 Fixed AttributeError in chatbox on_open method.
Fixed TODO and updated get session method for session key.
2015-01-16 23:41:46 +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 5d0737f656 Merge pull request #1396 from DebVortex/feature/update-pdfjs
Updated pdf.js to 1.0.907
2015-01-16 22:37:49 +01:00
Max Brauer f0af21103c Updated pdf.js to 1.0.907 2015-01-16 22:16:31 +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
Emanuel Schuetze a9468cb0a4 Fixed missing translation strings. 2015-01-16 14:25:34 +01:00
Norman Jäckel 3ba86a6441 Updated English language files. 2015-01-11 19:04:21 +01:00
Norman Jäckel 3ec55daaf9 Fixed bug. Projector was not updated when an object was deleted. Fixex #1394. 2015-01-11 18:43:05 +01:00
Emanuel Schuetze 91cef13326 Improve the usage of bsmselect jquery plugin.
Allow to disable the plugin for defined <select multiple> form fields
with extra css class 'dont_use_bsmselect'. (E.g. not for the group form
fields permissions and users.)

Partly fixed changes from pull request #1381.
2015-01-08 10:58:25 +01:00
Norman Jäckel 06919fa543 Fixed bug in ResetPasswordView. Fixed #1391. 2015-01-06 16:27:50 +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
Emanuel Schuetze 3cfb9b739b Template improvements for tags of agenda items, motions and
assignments.
2015-01-05 13:57:37 +01:00
Oskar Hahn bcb1ee1213 Tags for motions, agenda items and assignments 2015-01-03 17:00:48 +01:00