ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,148 Commits 6 Branches 42 Tags 64 MiB
08cb6a3d1b
Commit Graph

4148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schuetze
6ea14cd2c6 Angular template for config app. 
Added directive for config fields
 2015-06-25 10:52:28 +02:00
Oskar Hahn
f5654837e1 Merge pull request #1569 from normanjaeckel/Slides 
Added agenda slides.
 2015-06-25 08:12:47 +02:00
Oskar Hahn
a08d20d330 Merge pull request #1570 from emanuelschuetze/template-work 
Template improvements
 2015-06-25 08:12:05 +02:00
Emanuel Schuetze
c2920407bb Template improvements 
- Activate slides for users, customslides, motions, assignments.
- Add delete confirm message.
- Fixed required form fields.
- Added version template.
- Improved user import. Updated csv files.
 2015-06-25 00:15:56 +02:00
Norman Jäckel
6da0d41e50 Added agenda slides. 2015-06-24 23:45:21 +02:00
Oskar Hahn
fe16afa1a7 Merge pull request #1568 from normanjaeckel/Slides 
Added motion and assignment detail slide.
 2015-06-24 22:52:17 +02:00
Norman Jäckel
6b5ce5ae2f Added motion and assignment detail slide. 2015-06-24 22:12:06 +02:00
Norman Jäckel
6187ec450d Merge pull request #1566 from ostcar/projector_activation 
Added projector methods to user model
 2015-06-24 13:52:39 +02:00
Oskar Hahn
367404b20d Added projector methods to user model 2015-06-24 13:07:49 +02:00
Norman Jäckel
95b7b16992 Merge pull request #1555 from emanuelschuetze/speakers 
List of speakers with angularjs
 2015-06-22 21:37:39 +02:00
Norman Jäckel
447f7581b8 Merge pull request #1560 from emanuelschuetze/projector 
Projector templates.
 2015-06-22 21:37:07 +02:00
Emanuel Schuetze
8075b0adbb List of speakers with angularjs. 
- Add/remove user to/from list
- Open/close list
 2015-06-22 14:34:23 +02:00
Emanuel Schuetze
f006b99caf Added style to projector slide. 
Added Customslide views.
 2015-06-22 14:27:19 +02:00
Oskar Hahn
836d5042ad Merge pull request #1565 from OpenSlides/revert-1564-RelatedAgendaItems 
Revert "Added view to create related assignment and motion items. Upd…
 2015-06-22 14:24:10 +02:00
Oskar Hahn
35aa36f88e Revert "Added view to create related assignment and motion items. Updated ser…" 2015-06-22 14:23:42 +02:00
Oskar Hahn
2d6cdfa168 Merge pull request #1557 from emanuelschuetze/angular-motions 
Updated motion list, form and detail views.
 2015-06-22 14:18:09 +02:00
Oskar Hahn
3f321051c5 Merge pull request #1562 from emanuelschuetze/chromium-fixes 
Fix JavaScript errors in chromium (Fixed #1530)
 2015-06-22 14:12:12 +02:00
Oskar Hahn
bb2da91204 Merge pull request #1563 from normanjaeckel/Fix 
Fixed bug in users/projector.py.
 2015-06-22 14:11:43 +02:00
Oskar Hahn
0190bb0b0b Merge pull request #1564 from normanjaeckel/RelatedAgendaItems 
Added view to create related assignment and motion items. Updated ser…
 2015-06-22 14:11:32 +02:00
Norman Jäckel
e0188a149d Added view to create related assignment and motion items. Updated serializers. 2015-06-21 23:32:21 +02:00
Norman Jäckel
c4e23daccf Fixed bug in users/projector.py. 2015-06-21 22:36:21 +02:00
Norman Jäckel
4c9683a1b3 Merge pull request #1556 from ostcar/config_default_value 
Fixed missing config default_value for OPTIONS requests.
 2015-06-21 21:50:38 +02:00
Emanuel Schuetze
002a4d583e Fix JavaScript errors in chromium. 2015-06-21 19:39:36 +02:00
Emanuel Schuetze
9a117999ef Updated motion list, form and detail views. 2015-06-20 10:44:00 +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
e24ae3fd2a Merge pull request #1552 from ostcar/projector_client 
Projector client
 2015-06-18 23:29:14 +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
Oskar Hahn
a8eb54655f Merge pull request #1553 from normanjaeckel/VersionView 
Added version view via REST API.
 2015-06-18 23:15:12 +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
4506d787ee Merge pull request #1550 from ostcar/remove_old_static 
Removed old static files
 2015-06-18 19:01:05 +02:00
Oskar Hahn
dc675e173b Removed old static files 2015-06-18 18:24:54 +02:00
Norman Jäckel
2eed3dea4b Merge pull request #1545 from normanjaeckel/Config 
Renamed config variables. Fixed error in settings.
 2015-06-17 13:14:28 +02:00
Norman Jäckel
632ca2bd9a Renamed config variables. Fixed error in settings. 2015-06-17 12:07:09 +02:00
Oskar Hahn
b703655153 Merge pull request #1522 from emanuelschuetze/agenda-import 
Added two agenda import ways.
 2015-06-16 20:33:23 +02:00
Emanuel Schuetze
b7abf770c7 Added two agenda import ways. 
Note: CSV example file was updated because English csv header strings are
required now.
 2015-06-16 20:29:09 +02:00
Oskar Hahn
8544bc329f Merge pull request #1544 from normanjaeckel/Changelog 
Updated CHANGELOG.
 2015-06-16 20:28:03 +02:00
Norman Jäckel
d08d58518f Updated CHANGELOG. 2015-06-16 17:41:19 +02:00
Norman Jäckel
51455e8563 Merge pull request #1539 from ostcar/delete_old_stuff 
Delete old stuff.
 2015-06-16 17:32:38 +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
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
Oskar Hahn
237b0630ca Merge pull request #1535 from normanjaeckel/RESTProjectorPermissions 
Added permission check for objects required for active projector elem…
 2015-06-16 10:35:42 +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