ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,012 Commits 6 Branches 42 Tags 64 MiB
d368bedfc9
Commit Graph

2082 Commits

Author SHA1 Message Date
Oskar Hahn
c379544e97 Fixed motion states, handled workflow field. 2015-11-11 10:50:49 +01:00
Emanuel Schuetze
5b37a21c87 Motion detail updated for polls. 
bower.json: updated ui-select
New QuickEdit feature in motion list.
 2015-11-11 10:50:49 +01:00
Oskar Hahn
2495ba609b create MotionPoll in JS 2015-11-11 10:50:49 +01:00
Emanuel Schuetze
798126551b Motions template improvements. 
- Added quickedit form for motion list.
 2015-11-11 10:50:49 +01:00
Norman Jäckel
8154b0324b Added possibility to reset password. Work on user app in general. 2015-11-08 22:10:24 +01:00
Oskar Hahn
08c31a6b09 Merge pull request #1666 from normanjaeckel/Mediafile 
Fixed serializer and template. Fixed #1650.
 2015-11-07 07:14:39 +01:00
Norman Jäckel
03fcf950ff Updated logo help text. 2015-11-06 17:25:25 +01:00
Norman Jäckel
cc21b3d015 Fixed mediafile serializer and template. Fixed #1650. 2015-11-06 17:17:27 +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
Oskar Hahn
0e3688fc33 Merge pull request #1653 from normanjaeckel/FixMotionPoll 
Fixed changes in motion poll serializer.
 2015-10-21 23:15:28 +02:00
Norman Jäckel
f8cf279d82 Added JSHint to Gulp. Split up JS-Code in users app. 2015-10-21 22:44:07 +02:00
Norman Jäckel
0fc915ec35 Fixed changes in motion poll serializer. 2015-10-21 22:24:11 +02:00
Oskar Hahn
17973bae3d Merge pull request #1652 from ostcar/make_os-perms-lite_and_ng-show_compatible 
Fix os-perms-lite to make it compatible to ng-show and ng-hide
 2015-10-21 21:25:29 +02:00
Oskar Hahn
bf3e125786 Merge pull request #1651 from normanjaeckel/MotionPoll 
Changed Motion Poll REST fields.
 2015-10-21 21:25:06 +02:00
Oskar Hahn
1f0ab173d3 Fix os-perms-lite to make it compatible to ng-show and ng-hide 2015-10-21 21:21:48 +02:00
Norman Jäckel
817e15b01a Changed Motion Poll REST fields. 2015-10-21 21:20:38 +02:00
Emanuel Schuetze
fac45fbf2a Added multiselection delete mode for users list view. 
Fix users import: Allows multiple groups.
 2015-10-15 21:09:49 +02:00
Oskar Hahn
69268f0cc7 Merge pull request #1634 from emanuelschuetze/countdown-controls 
Projector elements controls
 2015-10-08 22:27:35 +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
Emanuel Schuetze
4559ffb882 Fix agenda slide and agendaIsProjected function. 2015-09-24 21:43:37 +02:00
Norman Jäckel
30e390dcfb Added API view for server time. 2015-09-24 21:28:30 +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
4ad99f2bc9 Cleaned up mediafiles app. Fixed #1629. 2015-09-17 22:58:24 +02:00
Norman Jäckel
4600fd9b02 Merge pull request #1625 from boehlke/master 
Add upload feature to mediafiles module.
 2015-09-17 12:41:10 +02:00
André Böhlke
10b8a1d838 Add upload feature to mediafiles module 2015-09-17 12:35:40 +02:00
Oskar Hahn
264895b773 Configure js-data for projector elements to "replace" on inject. 
fixes #1632
 2015-09-17 12:04:45 +02:00
Norman Jäckel
187cb0c42f Fixed blue line for active projector elements. 2015-09-16 23:59:20 +02:00
Norman Jäckel
2a23150b78 Fixed agenda tree, fixed #1635. 2015-09-14 22:18:55 +02:00
Norman Jäckel
c8dfb9437b Removed imports from openslides.users in other apps: Cleaned up agenda, assignments and motions. 2015-09-14 21:13:56 +02:00
Emanuel Schuetze
7f9c8b6a38 Agenda item list: new multiselect delete mode 
Remove action column.
 2015-09-14 20:35:24 +02:00
Norman Jäckel
8c48d67df0 Fixed projector. 2015-09-14 20:30:37 +02:00
Norman Jäckel
6d76454925 Added model, serializer and viewset for chat messages. 2015-09-07 17:13:42 +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
85be9f23cc Merge pull request #1623 from normanjaeckel/ProjektorElementsOutput 
Updated Projector config field and control views.
 2015-09-06 15:04:26 +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
5fc215c359 Fix docstrings. 2015-09-06 11:48:37 +02:00
Oskar Hahn
1fc7a361eb Merge pull request #1621 from normanjaeckel/User 
Added possibility to update your own user object.
 2015-09-06 11:37:52 +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
Oskar Hahn
2c64a161ac fix projector 2015-09-06 10:24:15 +02:00
Norman Jäckel
973d3fa653 Merge pull request #1618 from normanjaeckel/Projector 
Added UUID to projector elements. Added update view.
 2015-09-05 21:23:00 +02:00
Norman Jäckel
47a151c71e Added UUID to projector elements. Added update view. 2015-09-05 21:19:53 +02:00
Oskar Hahn
bd51c6a52c Added osPermLite as alternative to osPerm 2015-09-05 19:17:41 +02:00
Oskar Hahn
d8e9ef5575 Merge pull request #1616 from ostcar/main_menu 
Autogenerate the main menu.
 2015-09-05 18:19:59 +02:00
Oskar Hahn
c54b00c5f4 Merge pull request #1613 from emanuelschuetze/user-profile 
User settings profile view
 2015-09-05 18:19:17 +02:00
Oskar Hahn
2da2177c49 Autogenerate the main menu. 2015-09-05 17:23:47 +02:00
Emanuel Schuetze
60002d9111 Added user profile view. 2015-09-05 17:22:37 +02:00
Oskar Hahn
f802fde7de Merge pull request #1614 from normanjaeckel/BundleCountDown 
Bundle countdown with list of speakers. Fixed #1541.
 2015-09-05 17:12:22 +02:00
André Böhlke
8691608c5d Fix javascript syntax 2015-09-05 16:15:25 +02:00
Norman Jäckel
719b5ffedd Bundle countdown with list of speakers. Fixed #1541. 2015-09-05 15:07:03 +02:00
Oskar Hahn
948e776d33 Merge pull request #1612 from ostcar/motion_tag_save 
Reload config after login
 2015-09-05 11:32:52 +02:00
Oskar Hahn
fbc57cc23a Reload config after login 
Fix errors by saving tags to motions
 2015-09-05 11:26:41 +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
Emanuel Schuetze
0e124dbbae Use tags in agenda. Fix motions.js. 2015-09-05 10:07:53 +02:00
Oskar Hahn
026f4d45cb Merge pull request #1607 from normanjaeckel/PollNumber 
Removed poll_number field in MotionPoll model.
 2015-09-05 09:58:57 +02:00
Norman Jäckel
80efae4980 Start browser at 'localhost:8000' in start script. Fixed #1534. 2015-09-05 09:32:56 +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
Norman Jäckel
a1f1cfed1f Added views to create, update and delete MotionPoll objects. 2015-09-04 19:55:47 +02:00
Norman Jäckel
965206e1fc Set permissions for OPTIONS requests. Fixed js-data dependency. Fixed blank in some motion model fields. Fixed error handling in agenda and core views. 2015-09-04 15:44:28 +02:00
Norman Jäckel
aaadfbf78e Merge pull request #1600 from normanjaeckel/Plugins 
Updated plugin utils. Enabled plugins to override urlpatterns.
 2015-07-25 22:29:45 +02:00
Norman Jäckel
1cf8a1f222 Updated plugin utils. Enabled plugins to override urlpatterns. 2015-07-25 21:37:03 +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
291f60ee9f Added a way to load angular apps dynamical 2015-07-01 20:10:40 +02:00
Oskar Hahn
1dbe07c041 Fix osPerms to use groups registered and anonymous 
Fixes #1586
 2015-07-01 00:32:37 +02:00
Emanuel Schuetze
c6800bc8f5 Update version to 2.0b1-dev 2015-06-29 21:58:58 +02:00
Emanuel Schuetze
d50d771014 Release 2.0a1 2015-06-29 21:58:58 +02:00
Emanuel Schuetze
bc74a2983c Fixed typo. Removed unused config.js. 2015-06-29 20:23:10 +02:00
Norman Jäckel
87cce491a0 Merge pull request #1583 from emanuelschuetze/agenda-slides 
Use item-detail and item-list slides for agenda app.
 2015-06-29 18:05:45 +02:00
Emanuel Schuetze
6f985ef483 Use item-detail and item-list slides for agenda app. 2015-06-29 16:45:46 +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
ec1d676ed9 Added initial migrations for all apps 2015-06-29 15:38:15 +02:00
Oskar Hahn
16fa6bfffc Removed the projector App 2015-06-29 15:20:28 +02:00
Oskar Hahn
e042c668d5 Moved config app into the core app 2015-06-29 15:15:33 +02:00
Norman Jäckel
bcfe72fa8c Merge pull request #1578 from ostcar/remove_mptt_again 
Realy removed mptt
 2015-06-28 20:18:09 +02:00
Norman Jäckel
025c9c0b2a Merge pull request #1577 from ostcar/fix_mediafile_download_link 
Fixed link to download a file from the mediafileapp.
 2015-06-28 20:17:30 +02:00
Oskar Hahn
4dac4d1ca8 Realy removed mptt 2015-06-28 19:55:48 +02:00
Oskar Hahn
60e890a04e Fixed link to download a file from the mediafileapp 
Fixes #1575
 2015-06-28 19:44:25 +02:00
Norman Jäckel
06ead753dc Added and updated several projector elements (slides). 
Added list slides for motions and assignments.
Added detail slide for presentable files.
Updated list and detail slides for agenda items including slides for list of speakers.
 2015-06-28 19:22:57 +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
c22791d6c9 Merge pull request #1573 from emanuelschuetze/slides 
Agenda item slide template. Some template improvements.
 2015-06-27 09:48:02 +02:00
Emanuel Schuetze
f75516c7bb Agenda slide templates. Some template improvements. 
- User import
- show linebreaks for long text
- some style work
- item detail and agenda list slide
 2015-06-25 14:19:43 +02:00
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
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
Norman Jäckel
6b5ce5ae2f Added motion and assignment detail slide. 2015-06-24 22:12:06 +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
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
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
Norman Jäckel
e0188a149d Added view to create related assignment and motion items. Updated serializers. 2015-06-21 23:32:21 +02:00