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

150 Commits

Author SHA1 Message Date
FinnStutzenstein
e8fa488d60 Project change recommendations 2017-01-07 14:48:11 +01:00
Emanuel Schütze
11c0b0cc3f Merge pull request #2816 from FinnStutzenstein/Issue2127 
Use ckeditor to edit projector messages
 2017-01-06 21:28:48 +01:00
FinnStutzenstein
c3fc7d0f1b Do not project more than one message 2017-01-06 19:48:37 +01:00
FinnStutzenstein
6e7321d2a3 disable edit button if it is not possible to edit 2017-01-06 14:51:27 +01:00
FinnStutzenstein
f37ad0f6c3 Use ckeditor to edit projector messages 2017-01-06 12:45:30 +01:00
FinnStutzenstein
f5fa3575df New csv import using PapaParse 2017-01-06 10:50:03 +01:00
FinnStutzenstein
f9f64b3e31 projector language (closes #2653) 2016-12-21 10:41:06 +01:00
FinnStutzenstein
a24b4aed99 cookie handling on login 2016-12-19 14:14:46 +01:00
Emanuel Schütze
82396a784d Fixing some remarks for CKEditor PR#2770 2016-12-16 21:43:19 +01:00
Maximilian Krambach
58b8066249 Going back from TinyMCE to CKEditor 
- Update CKEditor toolbar
- CKEditor: new formating options and stripping empty paragraphs from imports
- fix for other clipboard html cases not beginning with 'p' tag
- Added RemoveFormat button to ckditor toolbar.
- Reorder bower.json
- inline editor and working on line numbers and language setting
- line numbering in inline edit
- changed allowed content, line number display, editor toggling
- included "justify" in ckeditor
- reload original text after ckeditor is disabled
- Reorder and extend ckeditor toolbar.
- fixed save button trigger and inserted a revert button
- set language on editor load (works for inline case only)
 2016-12-16 21:43:19 +01:00
Emanuel Schütze
116c3702f2 Updated German translations. 
Added missing translation filter.
 2016-12-11 13:37:26 +01:00
FinnStutzenstein
f7fcb69cc2 Some stylistic changes and new motion filter option 2016-12-09 14:58:15 +01:00
FinnStutzenstein
29ae600194 Dynamic webpage title 2016-12-05 18:00:52 +01:00
FinnStutzenstein
0f89205038 Translate legal notice 2016-12-02 08:10:06 +01:00
FinnStutzenstein
b0c94888ce Translate default projector (closes #2531) 2016-12-01 07:48:26 +01:00
Emanuel Schütze
a30085f756 Merge pull request #2632 from CatoTH/explicitly-enter-change-recommendation-type 
Allow to explicitly set the type of a change recommendation
 2016-11-28 20:57:21 +01:00
Norman Jäckel
36dc957f19 Changed tooltips. 2016-11-24 00:07:50 +01:00
FinnStutzenstein
88537cf67e Some improvements for Multiprojector 2016-11-21 15:01:54 +01:00
FinnStutzenstein
0cc8a81320 countdown and message models (closes #2464) 2016-11-19 12:37:33 +01:00
Tobias Hößl
771f087ade Allow to explicitly set the type of a change recommendation 2016-11-19 11:57:54 +01:00
Emanuel Schütze
e49411250a Merge pull request #2558 from FinnStutzenstein/Issue2462 
change all isProjected functions (closes #2462)
 2016-11-11 15:57:56 +01:00
Emanuel Schütze
4b124a629b Fixed translation issues. 2016-11-01 23:32:39 +01:00
FinnStutzenstein
58dd2f2b30 change all isProjected functions (closes #2462) 2016-11-01 10:31:28 +01:00
FinnStutzenstein
111b9e3fd7 use check icon and no post request on deselect (fixes #2471) 2016-10-21 09:39:04 +02:00
Emanuel Schütze
dc1c958e0f Merge pull request #2514 from FinnStutzenstein/Issue2494 
Round corners for projectorbuttons (fixes #2494)
 2016-10-18 13:01:49 +02:00
FinnStutzenstein
6ca3c07e1f Round corners for projectorbuttons (fixes #2494) 2016-10-18 12:48:19 +02:00
Norman Jäckel
676e783039 Merge pull request #2516 from FinnStutzenstein/Issue2502 
Remove chat history
 2016-10-17 21:48:34 +02:00
FinnStutzenstein
7965fd3fce Button for deleting chat history 2016-10-17 15:04:06 +02:00
FinnStutzenstein
7fcbed051c Rename AdditionalId to arg (closes #2465) 2016-10-17 08:10:52 +02:00
Maximilian Krambach
88674da36a list-of-speakers overlay (fixes #2211) 2016-10-12 15:45:21 +02:00
Emanuel Schuetze
f7d10b417e Template fixes 
- motion list: show category and tags dropdown for manager only
- manage projector: fix submenu buttons and css classes
 2016-10-07 11:42:33 +02:00
FinnStutzenstein
f1c58f98e8 Using a datetimepicker for agenda start time (closes #2413 and fixes #2440) 2016-10-06 22:12:51 +02:00
Emanuel Schuetze
4075c1aa3f Fixed translations strings. Updated template-en.pot. 2016-10-04 12:04:55 +02:00
Emanuel Schütze
e64a1bf19c Merge pull request #2478 from emanuelschuetze/ui-improvements 
UI improvements
 2016-10-04 10:59:21 +02:00
Emanuel Schuetze
bc72089973 UI improvements 
- item list: reorder buttons
- motion list:
  * move hover menu for edit/delete below submitters
  * limit submitters to one
- motion detail:
  * show ol flush left
  * use 2 or 3 columns in meta box
  * use small buttons for line numbering controls
  * group line number controls in grey tool bar.
  * Show motion comments div only if user is allowed.
- motion config:
  * Deativate comments by default.
  * Deactivate recommendations for motions by default.
- item detail: Show needed buttons only.
- assignment detail: Improve ballot tabs.
- general:
  * move pdf button to right
  * move 'back to overview' button to left
  * update label vor countdown option
 2016-10-04 10:51:19 +02:00
Norman Jäckel
2e7555e720 Fixed broadcast. Fixed #2467. 2016-10-01 14:37:04 +02:00
Norman Jäckel
8427ffd816 Small changes for multiple projector feature. 2016-09-30 19:11:33 +02:00
Finn Stutzenstein
e6b9b21d41 Added support for multiple projectors. 2016-09-30 18:58:59 +02:00
Emanuel Schuetze
148e7f6a9b Updated German translations. Fixed some translation strings. 2016-09-26 15:33:40 +02:00
Finn Stutzenstein
d13e11beb1 New ui element for comments in config (closes #2348) 2016-09-23 14:37:13 +02:00
Erik Steenman
514eea2105 Add support for image and video files. 2016-09-22 19:03:27 +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
Finn Stutzenstein
a06806c33b Highlighting and jumping to lines in motions (closes #2347) 2016-09-21 13:58:39 +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
Emanuel Schuetze
a7f5d4dd3c Fixed syntax of all uib-alerts. 
Required after ui-bootstrap upgrade.
 2016-09-18 21:09:37 +02:00
Norman Jäckel
76250c5851 Changed loading of JavaScript files. 2016-09-18 11:23:51 +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
Emanuel Schuetze
d7b092300d Fixed missing translation and form errors. 2016-09-05 23:13:07 +02:00
Norman Jäckel
c87111e81d Merge pull request #2318 from FinnStutzenstein/projectorSize 
Control the resolution of the projector
 2016-09-01 14:59:53 +02:00