Commit Graph

278 Commits

Author SHA1 Message Date
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