Oskar Hahn
08c31a6b09
Merge pull request #1666 from normanjaeckel/Mediafile
...
Fixed serializer and template. Fixed #1650 .
2015-11-07 07:14:39 +01:00
Oskar Hahn
4e8566904a
Merge pull request #1667 from normanjaeckel/Logo
...
Updated logo help text.
2015-11-07 07:13:43 +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
fb4a261cc5
Merge pull request #1659 from ostcar/related_items
...
Related items
2015-10-29 15:47:56 +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
Oskar Hahn
d3a6c05a68
Merge pull request #1658 from normanjaeckel/RemoveBleach
...
Removed bleach.
2015-10-27 13:25:09 +01:00
Norman Jäckel
2dacdc8e87
Removed bleach.
2015-10-26 20:58:22 +01:00
Norman Jäckel
09a3f22fda
Merge pull request #1657 from ostcar/fix_for_python_3.5
...
Update beautifulsoup4 to support python 3.5
2015-10-25 21:51:51 +01:00
Oskar Hahn
b6b371d39a
Update beautifulsoup4 to support python 3.5
2015-10-25 21:42:46 +01:00
Oskar Hahn
3533a41520
Merge pull request #1656 from normanjaeckel/Cleanup
...
Split and cleaned up JS files.
2015-10-24 16:14:02 +02: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
c812d9746e
Merge pull request #1654 from normanjaeckel/NewGulp
...
Added JSHint to Gulp. Split up JS-Code in users app.
2015-10-21 22:50:59 +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
Oskar Hahn
baaa3f5a7c
Merge pull request #1649 from emanuelschuetze/users-templates
...
Added multiselection delete mode for users list view.
2015-10-16 00:58:03 +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
Oskar Hahn
719330e6f6
Merge pull request #1644 from emanuelschuetze/fixAgendaSlide
...
Fix agenda slide and agendaIsProjected function.
2015-09-24 21:52:52 +02:00
Emanuel Schuetze
4559ffb882
Fix agenda slide and agendaIsProjected function.
2015-09-24 21:43:37 +02:00
Oskar Hahn
0c9d4b2627
Merge pull request #1647 from normanjaeckel/ServerTime
...
Added API view for server time.
2015-09-24 21:35:55 +02:00
Norman Jäckel
30e390dcfb
Added API view for server time.
2015-09-24 21:28:30 +02:00
Norman Jäckel
9599e4c022
Merge pull request #1642 from normanjaeckel/CleanupUsers
...
Cleaned up users app.
2015-09-21 16:46:33 +02:00
Norman Jäckel
1e08e9411a
Cleaned up users app.
2015-09-21 16:23:47 +02:00
Norman Jäckel
d7fd61e979
Merge pull request #1637 from normanjaeckel/ProjectorScaleScroll
...
Added scale and scroll. Fixed #1633 .
2015-09-18 10:36:28 +02:00
Norman Jäckel
e646cce91e
Added scale and scroll, up, down and reset. Fixed #1633 .
2015-09-18 10:31:22 +02:00
Oskar Hahn
7860345116
Merge pull request #1641 from normanjaeckel/1629
...
Cleaned up mediafiles app. Fixed #1629 .
2015-09-18 08:33:56 +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
04fc25ffd0
Merge pull request #1638 from ostcar/projector-js-data-replace
...
Configure js-data for projector elements to "replace" on inject.
2015-09-17 12:16: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
Oskar Hahn
9302b61918
Merge pull request #1639 from normanjaeckel/FixActiveElementLine
...
Fixed blue line for active projector elements.
2015-09-17 11:58:42 +02:00
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
