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

3800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
17ddef67f7 Merge pull request #2410 from FinnStutzenstein/projectorScale 
Allow to scale the projector in the projectorcontainer greater than 100%
 2016-09-22 22:01:28 +02:00
Norman Jäckel
349a078f20 Merge pull request #2411 from FinnStutzenstein/Issue2293 
Updating lodash (fixes #2293)
 2016-09-22 22:00:50 +02:00
Norman Jäckel
926516ac65 Small style changes. 2016-09-22 21:59:36 +02:00
FinnStutzenstein
970f42cacb Agenda duration and estimated time (closes #2109) 2016-09-22 21:59:35 +02:00
Norman Jäckel
a4226f5965 Merge pull request #2414 from boehlke/master 
Add Dockerfile
 2016-09-22 21:34:23 +02:00
Erik Steenman
514eea2105 Add support for image and video files. 2016-09-22 19:03:27 +02:00
André Böhlke
093054222e Add Dockerfile 2016-09-22 17:53:27 +02:00
FinnStutzenstein
ceb9e70f6e Updating lodash (fixes #2293) 2016-09-22 12:34:53 +02:00
FinnStutzenstein
457f8735d0 Allow to scale the projector in the projectorcontainer greater than 100% 2016-09-22 11:26:42 +02:00
Emanuel Schütze
8770395274 Merge pull request #2406 from normanjaeckel/MoveCustomSlides 
Moved custom slides to own app topics. Renamed them to Topic. Fixed #…
 2016-09-21 20:19:59 +02:00
Norman Jäckel
cab53f0434 Moved custom slides to own app topics for better app structure. 
Renamed model to Topic. Added migrations file. Fixed #2402.
 2016-09-21 15:00:23 +02:00
Norman Jäckel
53c4932171 Merge pull request #2360 from FinnStutzenstein/Issue2347 
Highlighting and jumping to lines
 2016-09-21 14:58:08 +02:00
Norman Jäckel
ed7c9926b5 Merge pull request #2409 from FinnStutzenstein/Issue2399 
Confirm multiple deletions (fixes #2399)
 2016-09-21 14:56:19 +02:00
FinnStutzenstein
c3e511628f Confirm multiple deletions (fixes #2399) 2016-09-21 14:43:46 +02:00
Finn Stutzenstein
a06806c33b Highlighting and jumping to lines in motions (closes #2347) 2016-09-21 13:58:39 +02:00
Norman Jäckel
2d15bd54a1 Merge pull request #2386 from FinnStutzenstein/sidebarScroll 
First attempt to scroll the projector sidebar
 2016-09-21 12:40:13 +02:00
Norman Jäckel
96b4fb9fd9 Merge pull request #2376 from tsiegleauq/issue2300-pdf-line-numbers 
Add line numbers to pdf (fixes #2300)
 2016-09-20 21:15:25 +02:00
Emanuel Schuetze
875b7b2ddd Reduced font-size of outline numbers. 2016-09-20 16:57:57 +02:00
Sean Engelhardt
cc5ff21005 Add line numbers to pdf (fixes #2300) 2016-09-20 11:34:19 +02:00
FinnStutzenstein
9347a78d56 Make the sidebar scroll and one typofix 2016-09-19 09:05:55 +02:00
Norman Jäckel
858f4a2b43 Merge pull request #2405 from emanuelschuetze/fixAlerts 
Fixed syntax of all uib-alerts.
 2016-09-18 22:54:29 +02:00
Norman Jäckel
916857d735 Merge pull request #2407 from emanuelschuetze/disableProjectorReload 
Disable projector auto reload after 5 minutes.
 2016-09-18 22:53:50 +02:00
Emanuel Schuetze
2a825adde4 Disable projector auto reload after 5 minutes. 
Auto reload no longer used because client gets all required data
after reconnection via websocket.
 2016-09-18 22:34:54 +02:00
Emanuel Schuetze
a7f5d4dd3c Fixed syntax of all uib-alerts. 
Required after ui-bootstrap upgrade.
 2016-09-18 21:09:37 +02:00
Erik Steenman
b48a99f21b Add a 'private' flag to mediafiles. 
Only users with the 'mediafiles.can_see_private' permission can create
and view these private mediafiles.
 2016-09-18 15:45:54 +02:00
Emanuel Schütze
346dfd6b57 Merge pull request #2401 from normanjaeckel/ChangeConfigManagementCommand 
Added management command to change config values. Fixed #2400.
 2016-09-18 15:42:07 +02:00
Norman Jäckel
00913a6333 Added management command to change config values. Fixed #2400. 2016-09-18 13:17:21 +02:00
Emanuel Schütze
3bfa055aed Merge pull request #2385 from FinnStutzenstein/Issue2384 
Confirm multiple deletions (fixes #2384)
 2016-09-18 12:26:45 +02:00
Emanuel Schütze
f288cb4967 Merge pull request #2374 from normanjaeckel/LoadJavaScript 
Changed loading of JavaScript files.
 2016-09-18 12:24:40 +02:00
Norman Jäckel
3d8d7bb695 Merge pull request #2398 from emanuelschuetze/upgrade-requirements 
Upgraded requirements.
 2016-09-18 12:15:49 +02:00
Norman Jäckel
76250c5851 Changed loading of JavaScript files. 2016-09-18 11:23:51 +02:00
Emanuel Schütze
cdf6b79a36 Updated confirm message. 2016-09-18 11:03:30 +02:00
Emanuel Schuetze
b936976f37 Upgraded requirements. 
Use twisted<16.4 for easier install (without compiling).
Use lowercase name 'openslides' in bower.jspon and packages.json to
prevent warning.
 2016-09-18 10:51:47 +02:00
Norman Jäckel
edf997524e Merge pull request #2397 from emanuelschuetze/upgrade-js-libs 
Upgraded a lot of javascript libs.
 2016-09-18 10:41:11 +02:00
Emanuel Schuetze
852b175f3e Upgraded a lot of javascript libs. 
Some template fixes required for upgrading ui-bootstrap.
 2016-09-18 00:45:00 +02:00
Oskar Hahn
6abb0976c2 Change system for autoupdate on the projector (#2394) 
* Second websocket channel for the projector

* Removed use of projector requirements for REST API requests.

Refactored data serializing for projector websocket connection.

* Refactor the way that the projector autoupdate get its data.

* Fixed missing assignment slide title for hidden items.

* Release all items for item list slide and list of speakers slide. Fixed error with motion workflow.

* Created CollectionElement class which helps to handle autoupdate.
 2016-09-17 22:26:23 +02:00
Norman Jäckel
6ade5630ff Merge pull request #2395 from emanuelschuetze/fix2069 
Fixed motion form to save form with default text (Fixes #2069).
 2016-09-17 17:00:59 +02:00
Emanuel Schuetze
d1458dcca1 Fixed motion form to save form with default text (Fixes #2069). 
Use workaround: Added 'novalidate' to motion form. Otherwise user
can't save form if text editor field contains default value.
 2016-09-17 15:45:59 +02:00
Emanuel Schütze
4b0594a83b Merge pull request #2393 from normanjaeckel/FixAutoupdateConnction 
Reconnect autoupdate after some migrations. Fixed #2377.
 2016-09-17 13:42:51 +02:00
Norman Jäckel
5f65830d47 Reconnect autoupdate after some migrations. Fixed #2377. 2016-09-17 13:36:32 +02:00
Norman Jäckel
27223c35d9 Merge pull request #2364 from CatoTH/motion-detail-behaviour-services 
Move inline editing methods into a separate service
 2016-09-17 12:17:31 +02:00
Norman Jäckel
7998df03a3 Merge pull request #2382 from FinnStutzenstein/2350 
Option to generate multiple new passwords (closes #2350)
 2016-09-17 12:05:30 +02:00
Norman Jäckel
e0f8dd9e29 Merge pull request #2392 from emanuelschuetze/ui-sref 
Use ui-sref instead of ng-click (with $state.go).
 2016-09-17 12:02:15 +02:00
Emanuel Schuetze
8e3463b1df Use ui-sref instead of ng-click (with $state.go). 
For agenda item list and detail template.
 2016-09-17 11:44:33 +02:00
Norman Jäckel
1e87bdca4b Merge pull request #2391 from emanuelschuetze/issue2238 
Upgraded to tinymce 4.4.x and tinymce-ui 0.0.17 (Fixes #2238).
 2016-09-17 11:19:24 +02:00
Norman Jäckel
ca9c946b6f Merge pull request #2390 from emanuelschuetze/agend-item-check 
Template checks if user has no permission to see agenda items.
 2016-09-17 11:00:53 +02:00
Norman Jäckel
f8610dad96 Merge pull request #2389 from emanuelschuetze/motionCommentFixes2 
Motion comment permission fixes on server and client.
 2016-09-17 10:58:36 +02:00
Norman Jäckel
429fdb31fa Merge pull request #2383 from FinnStutzenstein/Issue2335 
Unprivileged users don't see ban icon (fixes #2335)
 2016-09-17 10:57:04 +02:00
Emanuel Schuetze
028dd71608 Upgraded to tinymce 4.4.x and tinymce-ui 0.0.17 (Fixes #2238). 2016-09-17 10:47:11 +02:00
Emanuel Schuetze
c55e55e91b Template checks if user has no permission to see agenda items. 2016-09-17 10:17:40 +02:00