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

3039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
187cb0c42f Fixed blue line for active projector elements. 2015-09-16 23:59:20 +02:00
Oskar Hahn
ddafb6682a Merge pull request #1636 from normanjaeckel/AgendaTree 
Fixed agenda tree, fixed #1635.
 2015-09-16 14:57:11 +02:00
Norman Jäckel
2a23150b78 Fixed agenda tree, fixed #1635. 2015-09-14 22:18:55 +02:00
Norman Jäckel
b431f41b2c Merge pull request #1630 from normanjaeckel/ImportUser 
Removed imports from openslides.users in other apps
 2015-09-14 21:56:12 +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 Schütze
d79bad80f6 Merge pull request #1619 from emanuelschuetze/agenda-template 
Agenda item list: new multiselect delete mode
 2015-09-14 20:43:39 +02:00
Emanuel Schuetze
7f9c8b6a38 Agenda item list: new multiselect delete mode 
Remove action column.
 2015-09-14 20:35:24 +02:00
Emanuel Schütze
e5008c1f53 Merge pull request #1628 from normanjaeckel/FixProjector 
Fixed projector.
 2015-09-14 20:33:44 +02:00
Norman Jäckel
8c48d67df0 Fixed projector. 2015-09-14 20:30:37 +02:00
Oskar Hahn
4d14a1297d Merge pull request #1626 from normanjaeckel/Chat 
Added model, serializer and viewset for chat messages.
 2015-09-07 17:34:43 +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
da304ccc35 Merge pull request #1622 from normanjaeckel/User 
Fix docstrings.
 2015-09-06 13:29:16 +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
Norman Jäckel
063b6e5563 Merge pull request #1620 from ostcar/fix_operator_on_projector 
Fix the projector
 2015-09-06 10:30:35 +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
Norman Jäckel
1fa221e249 Merge pull request #1617 from ostcar/ospermslite 
Added osPermLite as alternative to osPerm.
 2015-09-05 19:24:14 +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
Norman Jäckel
7f90373176 Merge pull request #1615 from boehlke/master 
Fix javascript syntax.
 2015-09-05 16:19:16 +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
Emanuel Schütze
35fa5470d2 Merge pull request #1608 from emanuelschuetze/speakerscontrol 
Added manage controls for list of speakers of agenda items.
 2015-09-05 11:26:53 +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
Oskar Hahn
6acdb3c305 Merge pull request #1611 from emanuelschuetze/tags 
Use tags in agenda. Fix motions.js.
 2015-09-05 10:16:55 +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
Oskar Hahn
2618001ddd Merge pull request #1609 from normanjaeckel/Localhost 
Start browser at 'localhost:8000' in start script. Fixed #1534.
 2015-09-05 09:39:46 +02:00
Oskar Hahn
d8b0eca7f4 Merge pull request #1610 from normanjaeckel/GitAttributes 
Removed .gitattributes. Fixed #1422.
 2015-09-05 09:39:36 +02:00
Norman Jäckel
933318c19d Removed .gitattributes. Fixed #1422. 2015-09-05 09:36:47 +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
dfe0094661 Merge pull request #1596 from ostcar/js-data-update 
Updated js-data to 2.0
 2015-09-04 21:07:49 +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
ec50b6e67f Merge pull request #1602 from normanjaeckel/MotionPoll 
Added views to create, update and delete MotionPoll objects.
 2015-09-04 20:21:04 +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
6b747c8cef Merge pull request #1604 from normanjaeckel/OptionsPermissions 
Set permissions for OPTIONS requests.
 2015-09-04 15:51:43 +02:00