Commit Graph

477 Commits

Author SHA1 Message Date
Norman Jäckel 5b4ca84306 Removed restricted fields from PUT request where a users wants to update himself. Fixed #2986 and #2984. 2017-02-24 15:22:55 +01:00
FinnStutzenstein 8a8755f22d Fixing create view for amendments (fixing #3004) 2017-02-24 15:16:12 +01:00
Tobias Hößl afff1f35f8 Solving two bugs in the diff 2017-02-15 20:23:29 +01:00
Oskar Hahn 26b7f2879c Let CollectionElement fail early
Fixes #2835
Fixes #2904
2017-02-12 14:15:58 +01:00
Emanuel Schütze 1230f4a29a New full text search on client-side (Fixed #2865).
Removed server-side search by whoosh.
2017-02-10 22:52:08 +01:00
FinnStutzenstein 49e32d8e57 Possibility to send extra startup data (closes #2885) 2017-01-31 13:17:42 +01:00
FinnStutzenstein d55d374211 Prevent XSS-attacks (fixes #2871) 2017-01-30 21:04:41 +01:00
Oskar Hahn 2daafa8db9 Created a function to convert anything possible to a user-collectoin-element or None
Changed user.has_perm(...) to has_perm(user, ...) at any place.

Removed old code
2017-01-26 18:57:10 +01:00
Maximilian Krambach 929a7e5e89 delete list of speaker error messages (closes #2237) 2017-01-16 18:37:59 +01:00
Norman Jäckel c6b1df9e24 Fixed security issue #2850: Comments were shown for unprivileged users. 2017-01-15 10:26:37 +01:00
FinnStutzenstein a6d1eeb9c3 Worked on startup process.
- fix group view on reload
2017-01-14 21:23:05 +01:00
Norman Jäckel a918361ec5 Fixed motion create view. Fixed #2506. 2017-01-14 11:38:20 +01:00
Oskar Hahn 728576d514 Performance improvements
* Add caching support to users/group
* Add a function has_perm that works with the cache.
* Removed our session backend so other session backends (without the database) can be used
2017-01-13 13:37:18 +01:00
FinnStutzenstein f9f64b3e31 projector language (closes #2653) 2016-12-21 10:41:06 +01:00
Tobias Hößl 159720b983 Bugfix for PDF-export - fixes #2777 2016-12-19 16:17:36 +01:00
Tobias Hößl 08cb6a3d1b Bugfix for line numbering with CKeditor 2016-12-16 21:43:19 +01:00
Norman Jäckel 4ebb8023e3 Merge pull request #2776 from CatoTH/Issue2770-pdfmake-bugfix
Bugfix for #2770
2016-12-16 20:32:54 +01:00
Norman Jäckel 75f4c55181 Removed viewpoint for Django url patterns. Fixed #1453. 2016-12-16 17:01:34 +01:00
Tobias Hößl 46cf26481e Bugfix for #2770 2016-12-14 22:28:44 +01:00
Norman Jäckel 6dc598800d Fixed state flag required permission to see. 2016-12-11 22:02:16 +01:00
Tobias Hößl 2cb1429c8d First attempt to mitigate the list / line number problem 2016-12-06 22:12:29 +01:00
Norman Jäckel cdc37b4dd5 Merge pull request #2703 from normanjaeckel/LeadingZero
Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696.
2016-12-01 14:46:15 +01:00
Norman Jäckel ad651300d9 Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696. 2016-12-01 14:41:12 +01:00
Maximilian Krambach 32aaaf5b9e Majority calculation for assignments.
Majorities when config YN(A) and simple voting method.
2016-12-01 14:35:35 +01:00
Norman Jäckel 6aa3ea0d63 Merge pull request #2627 from CatoTH/change-recommendations-inline-diff
Showing Diff inline
2016-12-01 10:24:18 +01:00
Tobias Hößl bce74cac2f Bugfix for merging change recommendations 2016-11-26 21:48:56 +01:00
Tobias Hößl 2958a401ad Showing Diff inline 2016-11-26 16:50:32 +01:00
Norman Jäckel d068765db9 Merge pull request #2678 from CatoTH/goto-line-numbers-always-available
Make line highlighting and 'Goto'-Feature available on all modes
2016-11-24 00:09:22 +01:00
Tobias Hößl c888419527 Make line highlighting and 'Goto'-Feature available on all modes 2016-11-20 21:55:03 +01:00
FinnStutzenstein 0cc8a81320 countdown and message models (closes #2464) 2016-11-19 12:37:33 +01:00
Emanuel Schütze 9c58efbdae Remove unused serverside pdf file from users app. 2016-11-18 10:50:56 +01:00
Tobias Hößl 4ac7f48bec Bugfix: Caching of extracted line numbers was invalid when a fragment was passed as an argument 2016-11-13 10:20:00 +01:00
Oskar Hahn 7281aa57b8 Removed old code needed be the server to serve pdf 2016-11-07 15:54:29 +01:00
Emanuel Schütze 5b544ceed2 Improve importing and sorting of users
* Add is_present field for csv import of users.
* Refactor JS functions get_full_name and get_short_name (Fixes #2136).
  - Show participant number in get_full_name() output.
  - Sort users by first or last name.
  - Extend config option to sort users.
  - Mark unused Python methods get_short_name and get_full_name.
2016-11-07 15:04:30 +01:00
Norman Jäckel 676e783039 Merge pull request #2516 from FinnStutzenstein/Issue2502
Remove chat history
2016-10-17 21:48:34 +02:00
Norman Jäckel 20f8875dcd Added view to follow recommendations.
for all motions of a motion block
2016-10-17 21:02:50 +02:00
Tobias Hößl 228abf5cee Change recommendations 2016-10-17 19:37:32 +02:00
Emanuel Schütze 7ada65a628 Optimized template and translation for majority feature. 2016-10-17 17:03:42 +02:00
Norman Jäckel 639748bb3b Added view to clear the chatbox. 2016-10-17 16:56:19 +02:00
Maximilian Krambach 88674da36a list-of-speakers overlay (fixes #2211) 2016-10-12 15:45:21 +02:00
Oskar Hahn e209dd6dfe Support to send many objects through the autoupdate system 2016-10-04 18:10:04 +02:00
Oskar Hahn 962deca506 Send full_data through the channel.
Saves db queries.
2016-10-01 13:57:53 +02:00
Oskar Hahn 97bd526dd7 Fix config cache key 2016-10-01 12:37:43 +02:00
Oskar Hahn 98bab9b358 Fix tests and remove old code. 2016-10-01 01:49:27 +02:00
Oskar Hahn ac9c9f4ec3 More tests, development instructions and small changes. 2016-10-01 01:48:30 +02:00
Norman Jäckel 7cd70a568c Added docstrings. Small changes. 2016-10-01 01:48:18 +02:00
Oskar Hahn 368873e738 Adds a cache system to the CollectionElement and add
a Collection class that can be used to call a collection
used this for the list and receive rest api.
2016-09-30 21:37:52 +02:00
Emanuel Schuetze 720c7e76a5 Hot fix for broadcast (will improved later). 2016-09-30 21:20:30 +02:00
Norman Jäckel 8427ffd816 Small changes for multiple projector feature. 2016-09-30 19:11:33 +02:00
Finn Stutzenstein e6b9b21d41 Added support for multiple projectors. 2016-09-30 18:58:59 +02:00
Finn Stutzenstein d13e11beb1 New ui element for comments in config (closes #2348) 2016-09-23 14:37:13 +02:00
Norman Jäckel cab53f0434 Moved custom slides to own app topics for better app structure.
Renamed model to Topic. Added migrations file. Fixed #2402.
2016-09-21 15:00:23 +02:00
Oskar Hahn 6abb0976c2 Change system for autoupdate on the projector (#2394)
* Second websocket channel for the projector

* Removed use of projector requirements for REST API requests.

Refactored data serializing for projector websocket connection.

* Refactor the way that the projector autoupdate get its data.

* Fixed missing assignment slide title for hidden items.

* Release all items for item list slide and list of speakers slide. Fixed error with motion workflow.

* Created CollectionElement class which helps to handle autoupdate.
2016-09-17 22:26:23 +02:00
Norman Jäckel d7936c53e3 Updated settings files. Fixed timezone support. 2016-09-16 21:17:00 +02:00
Finn Stutzenstein 4ffe2b5a80 Migration for new permission matrix 2016-09-08 08:38:17 +02:00
Norman Jäckel 4bed8f6c11 Added recommendations for motions.
Also changed label of former state 'commited a bill' to 'refered to committee'. Fixed #2342.
2016-09-07 23:46:38 +02:00
Norman Jäckel ab845b4137 Added generic fields for comments for motions. 2016-09-07 20:43:00 +02:00
Tobias Hößl a341071e91 Line-Breaking Bugfix: break before an inline element if the first word of the element exceeds the current line 2016-09-05 20:31:43 +02:00
Norman Jäckel 29f9203377 Merge pull request #2314 from FinnStutzenstein/Issue2137
new change password view (fixes #2137)
2016-09-05 13:46:15 +02:00
Finn Stutzenstein 9d3b06c0a6 new change password view (fixes #2137) 2016-09-05 07:56:28 +02:00
Norman Jäckel c87111e81d Merge pull request #2318 from FinnStutzenstein/projectorSize
Control the resolution of the projector
2016-09-01 14:59:53 +02:00
Finn Stutzenstein a8dcc2abdc Control the resolution of the projector 2016-08-31 14:18:29 +02:00
Norman Jäckel 08c6fa11b4 Merge pull request #2291 from normanjaeckel/MotionAmendment
Reimplemented amendments for motions.
2016-08-31 12:39:48 +02:00
Norman Jäckel 2488b8788b Fixed tests. 2016-08-31 12:35:10 +02:00
Norman Jäckel ac6d78b0ee Fixed groups metadata view. Upgraded to djangorestframework 3.4.x. Fixed #2275. 2016-08-29 17:06:33 +02:00
Emanuel Schuetze 53d5946116 Remove old test for checking translation string on server-side.
(Config translations are moved to client-side.)
2016-08-25 17:24:07 +02:00
Emanuel Schütze 73095948ca Merge pull request #2260 from FinnStutzenstein/Feature435
New matrix interface for group editing (closes #435)
2016-08-22 15:26:10 +02:00
Finn Stutzenstein bf3a1ce714 New matrix interface for group editing (closes #435) 2016-08-22 15:05:06 +02:00
Tobias Hößl d986d551e0 Line numbers and inline editing 2016-08-20 11:18:17 +02:00
Norman Jäckel b0070d13b9 Added possibility to sort motions in category numbering view. 2016-08-16 23:51:12 +02:00
Norman Jäckel 7e6dc50b39 Added viewpoint to number all motions in a category. 2016-07-29 11:56:12 +02:00
Norman Jäckel 8e297e4a9a Silenced flake 8 errors. Fixed #2202. 2016-06-16 11:03:16 +02:00
Oskar Hahn fe64941aab Big Mode for OpenSlides
Uses django channels instead of tornado for the autoupdate. Therefore
tornado is nolonger a dependency of OpenSlides (but channels).

This uses websockets instead of SockJS.

Use the flag insecure in the start command to provide static files serving.

Use a new session backend that has a ForeignKey to User.
2016-06-09 11:14:39 +02:00
Maximilian Krambach 5061ea1770 typo fixing (issue #2181) 2016-06-08 22:18:35 +02:00
Norman Jäckel 294fb7ebc5 Fixed motion PDF if motions have no identifier. Fixed #2158. 2016-06-06 14:26:16 +02:00
Oskar Hahn 2221b23447 Redesign of the config variables.
Removed the config cache and created files for each app in which the
config variables are defined.
2016-06-03 13:47:54 +02:00
Emanuel Schuetze 7ebedb1fdd Use always user.groups_id (Fixes #2081)
- Fix rest api: send always groups_id (instead of groups).
- Fix JS-Data-Store: Add hasMany relations for user.groups.
- Fix templates: use field 'groups_id' instead of 'groups'.
2016-04-14 22:13:28 +02:00
Emanuel Schütze 2097121e45 Merge pull request #2030 from normanjaeckel/FixAgendaGetQueryset
Fixed get_queryset method of ItemViewSet. Fixed #2027.
2016-03-06 22:48:50 +01:00
Norman Jäckel 132c6e81ec Forwarding JSON instead of Django model instances to autoupdate loop.
- Used raw SQL for createing default projector during inital migration.
- Removed default_password and hidden agenda items from autoupdate data for some users.
- Removed old get_collection_and_id_from_url() function.
2016-03-06 14:24:53 +01:00
Norman Jäckel bc93b61a02 Fixed get_queryset method of ItemViewSet. Fixed #2027. 2016-03-04 11:48:20 +01:00
Norman Jäckel ca3cfae8b3 Changed name of '--development' option and name of the respective directory. Fixed #2001 2016-03-01 17:38:14 +01:00
Emanuel Schütze 8d1de6923b Merge pull request #2017 from normanjaeckel/FixMotionPoll
Fixed error in motion poll serializer. Fixed #2014.
2016-02-28 00:21:04 +01:00
Norman Jäckel bc49f00c66 Fixed error in motion poll serializer. Fixed #2014. 2016-02-27 21:34:26 +01:00
Norman Jäckel a2a6637c89 Rename and refactor some ProjectorElement methods. Fixed #1631. 2016-02-27 20:56:03 +01:00
Norman Jäckel 758180e7cc Optimized number of queries for motion serializing. Fixed #1655. 2016-02-24 10:30:52 +01:00
Norman Jäckel dcc325c716 Fixed test plugin. 2016-02-16 23:04:26 +01:00
Norman Jäckel cc55aff8cc Added possibility to hide config variables. 2016-02-14 21:38:26 +01:00
Norman Jäckel 198f09801c Fixed error in poll default_votes_validator. Fixed #1967. 2016-02-11 18:02:57 +01:00
Norman Jäckel 60b6a7efe1 Fixed validation of default votes in assignment and motion poll. Fixed #1959. 2016-02-09 21:14:01 +01:00
Norman Jäckel 2ba675c1b6 Fixed assignment PDF. Fixed #1940. 2016-02-05 21:22:47 +01:00
Emanuel Schuetze 3c7d03547c Set default of item.weigth to 10000.
So new items are placed at the end of agenda.
After sorting weight is updated.
2016-01-27 22:16:46 +01:00
Emanuel Schuetze 23503eb4ba Several template fixes and clean up
- Use ng-cloak for hide template parts while loading.
- Set html lang attribute dynamically (Fixes #1546)
- Clean up: Rename 'dashboard' to 'home'.
- Show duration of speech in minutes. (Fixes #1882)
- Save agenda specific stuff for customslides. (Fixes #1887)
- Remove title from QuickEdit from.
- Checkbox for item.closed is now visible for manager only.
- Agenda list view: Show list of speakers link also for normal users.
- Improve slide templates: Show agenda item number and subtitle.
- Fixed agenda title for motions and assignments.
  (Don't load motions and assignmetn in agenda app.)
- Added missing seach template.
2016-01-27 12:10:40 +01:00
Norman Jäckel fdd62cb342 Fixed agenda numbering. Fixed #1892. 2016-01-26 16:13:33 +01:00
Emanuel Schuetze 9ddc558085 Add checkbox 'show as agenda item'. (Fixes #1783)
Used for customslide, motion and assignment forms.
Changed default value of agenda.type to HIDDEN_ITEM (=2) in model.py.
2016-01-23 20:22:56 +01:00
Oskar Hahn 4ffbd8be29 Merge pull request #1868 from normanjaeckel/TrivialChanges
Enabled the option to disabled version for motion update requests.
2016-01-15 09:31:30 +01:00
Norman Jäckel 1eeed1fde9 Add quick fix to motion update view. 2016-01-15 00:03:17 +01:00
Norman Jäckel 01ee197eb6 Enabled the option to disabled version for motion update requests. 2016-01-14 23:23:15 +01:00
Norman Jäckel 3fc82a596c Fixed server error in config update view. Fixed #1828. 2016-01-13 15:04:47 +01:00
Emanuel Schuetze 93e2296bdc A lot of template fixes
- Reset password from current (unsaved) value of default_password.
- MotionForm, AssignmentForm and UserForm factory for open ngDialog.
  Fixes edit url redirect problem.
- Added back-to-detail-view-button to list of speakers view.
- Add translation context.
- Fixed (missing) translation strings.
- Fixed tags and category list views.
- motion detail: Use select box for changing state.
- motion slide updated
2016-01-13 10:22:24 +01:00
Norman Jäckel 2e104d07b7 Removed possibility to block candidates. Fixes #1708. 2016-01-09 18:05:41 +01:00
Emanuel Schuetze 54b1c8e350 Show agenda titles with correct numbering 2016-01-09 14:01:30 +01:00
Oskar Hahn 4b69c57c78 Merge pull request #1789 from ostcar/update_requirements
Update requirements
2016-01-09 12:22:41 +01:00
Oskar Hahn 552998b067 Update requirements, fixt a lot of warnings
Set python 3.4 as minimal supported python version
2016-01-09 12:19:46 +01:00
Oskar Hahn cad252cd2b Merge pull request #1794 from normanjaeckel/LockoutProtextion
Added lockout protection, see #1452.
2016-01-09 12:19:28 +01:00
Norman Jäckel cb22071886 Added lockout protection, see #1452. 2016-01-09 12:07:31 +01:00
Oskar Hahn 308f55bb3f Merge pull request #1782 from ostcar/search
Added a search on the server side.
2016-01-09 11:44:08 +01:00
Oskar Hahn 75dcbab5d1 Add search on the server side. 2016-01-09 11:35:57 +01:00
Norman Jäckel ecf561e305 Added login info text in config and view. 2016-01-09 10:01:17 +01:00
Norman Jäckel e02e07f410 Fixed test. 2015-12-19 22:48:37 +01:00
Norman Jäckel e0e74d6c3c Fixed login, logout and password change view. 2015-12-11 23:58:59 +01:00
Norman Jäckel 24cb58dc12 Added guest enabled info to WhoAmI view. 2015-12-11 13:44:58 +01:00
Norman Jäckel 91174afa99 Added error message if a new candidate is already nominated. 2015-11-28 21:34:24 +01:00
Norman Jäckel f0080865e6 Added REST API viewpoint to number the agenda. 2015-11-25 13:05:39 +01:00
Oskar Hahn 0cce7f967b Merge pull request #1661 from normanjaeckel/CKEditor
Added CKEditor to custom slide create and edit form.
2015-11-18 12:21:39 +01:00
Norman Jäckel 2063dcff51 Fixed create view for non staff users, fixed #1670. 2015-11-18 01:20:49 +01:00
Norman Jäckel d299579f16 Added CKEditor to custom slide create and edit form. 2015-11-17 23:25:09 +01:00
Oskar Hahn c379544e97 Fixed motion states, handled workflow field. 2015-11-11 10:50:49 +01:00
Oskar Hahn 12a08b9732 New Agenda Item
Changed agenda item, so it can not be manualy created, but is always created
when a custom slide, motion or assignment is created.
2015-10-29 15:44:43 +01:00
Norman Jäckel 32b23df763 Split and cleaned up JS files. Added test. 2015-10-22 00:28:01 +02:00
Emanuel Schuetze dda16af532 Added controls for projector elements
countdowns, messages, scale/scroll/edit current slide
Use global serverOffset.
Fixed #1645 (wrong time of projector clock).
Show countdown description on projector slide.
2015-10-08 19:21:25 +02:00
Norman Jäckel 1e08e9411a Cleaned up users app. 2015-09-21 16:23:47 +02:00
Norman Jäckel e646cce91e Added scale and scroll, up, down and reset. Fixed #1633. 2015-09-18 10:31:22 +02:00
Norman Jäckel 8c48d67df0 Fixed projector. 2015-09-14 20:30:37 +02:00
Oskar Hahn f0803f1c03 Merge pull request #1624 from ostcar/agendaTree
Calculate agenda tree on the client side.
2015-09-06 15:04:38 +02:00
Oskar Hahn e22b9984e3 Calculate agenda tree on the client side.
Update changed agenda tree via autoupdate.
2015-09-06 15:01:41 +02:00
Norman Jäckel 5c4c0367a1 Updated Projector config field and control views. 2015-09-06 14:59:33 +02:00
Norman Jäckel c8bf754646 Added possibility to update your own user object. Hide default password for non admins. 2015-09-06 11:26:48 +02:00
Norman Jäckel 47a151c71e Added UUID to projector elements. Added update view. 2015-09-05 21:19:53 +02:00
Norman Jäckel 719b5ffedd Bundle countdown with list of speakers. Fixed #1541. 2015-09-05 15:07:03 +02:00
Emanuel Schuetze 77d027c1cc Agenda templates
- Added manage controls for list of speakers of agenda items.
- New slide for list of speakers.
- Fixed typo (speach -> speech)
2015-09-05 11:23:32 +02:00
Norman Jäckel 5e5ab61612 Removed poll_number field in MotionPoll model. 2015-09-05 09:29:06 +02:00
Oskar Hahn 6674ea85b7 Updated js-data to 2.0
Added js-data relation for the motion and agenda app

Added improved load function
2015-09-04 21:05:49 +02:00
Oskar Hahn 89a6d5b451 Appended an _id suffix to all related field names in the rest api
Fixes #1597
2015-07-25 19:17:33 +02:00
Norman Jäckel 7e404946e4 Refactored view permissions.
Refactored permission check for REST API viewsets.
Removed old PermissionMixin.
Cleaned up several views.py files.
2015-07-05 22:17:58 +02:00
Oskar Hahn f31925387f Updated python requirements.
This included django 1.8
2015-07-02 14:51:08 +02:00
Oskar Hahn 1dbe07c041 Fix osPerms to use groups registered and anonymous
Fixes #1586
2015-07-01 00:32:37 +02:00
Oskar Hahn 3dead745c6 Let the config app accept values that can be converted to the right type.
Fixed config app
2015-06-29 15:41:36 +02:00
Oskar Hahn e042c668d5 Moved config app into the core app 2015-06-29 15:15:33 +02:00
Oskar Hahn 8aab8388b3 Moved agenda tree code to the Item-Manager and used it at the AgendaPDFView.
fixed #1561
2015-06-28 18:26:05 +02:00
Oskar Hahn 2b9c0b4620 Fixed default_value in option request 2015-06-19 09:08:36 +02:00
Oskar Hahn 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
Oskar Hahn 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
Oskar Hahn a5d9f0bb42 Merge pull request #1554 from normanjaeckel/UserResetPassword
Added view to reset user's password.
2015-06-18 23:16:45 +02:00
Norman Jäckel 466fab8752 Added view to reset user's password. 2015-06-18 22:45:23 +02:00
Norman Jäckel 211e39be2c Added version view via REST API. 2015-06-18 21:48:20 +02:00
Norman Jäckel 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
Norman Jäckel 632ca2bd9a Renamed config variables. Fixed error in settings. 2015-06-17 12:07:09 +02:00
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 3e2aa6c081 Update 2015-06-16 14:04:38 +02:00
Oskar Hahn cb1b262c92 Fix anonymous user for rest requests 2015-06-15 15:54:39 +02:00