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

4860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
e944f6368b Merge pull request #2509 from matakuka/majorities 
Majorities (issue #2258)
 2016-10-17 17:15:15 +02:00
Emanuel Schütze
7ada65a628 Optimized template and translation for majority feature. 2016-10-17 17:03:42 +02:00
Norman Jäckel
45aa4146da Refactored majority calculation. Added cache for MotionPollDetailCtrl. 2016-10-17 17:03:42 +02:00
Maximilian Krambach
e5e1e3e8ba Majority test for motions 2016-10-17 17:03:31 +02:00
Norman Jäckel
639748bb3b Added view to clear the chatbox. 2016-10-17 16:56:19 +02:00
FinnStutzenstein
7965fd3fce Button for deleting chat history 2016-10-17 15:04:06 +02:00
Norman Jäckel
d2ee235293 Merge pull request #2510 from emanuelschuetze/protocol 
Support https as websocket protocol (wss).
 2016-10-17 11:52:02 +02:00
Emanuel Schütze
208d94a91b Support https as websocket protocol (wss). 2016-10-17 11:31:27 +02:00
FinnStutzenstein
5272a3c1bb key value switched in angular foreach (fixes #2470) 2016-10-17 08:58:43 +02:00
FinnStutzenstein
7fcbed051c Rename AdditionalId to arg (closes #2465) 2016-10-17 08:10:52 +02:00
Emanuel Schütze
c2a1675e37 Merge pull request #2507 from boehlke/master 
password change command
 2016-10-14 16:41:22 +02:00
André Böhlke
cced97d9fb password change command 2016-10-14 16:01:46 +02:00
Norman Jäckel
447339ec33 Merge pull request #2508 from tsiegleauq/userListPdfMake 
Create the user list over pdfmake
 2016-10-14 11:50:31 +02:00
Emanuel Schütze
ac60fb53da Merge pull request #2489 from matakuka/issue2211-multiprojector 
list-of-speakers overlay (issue #2211, Version 4)
 2016-10-13 09:34:40 +02:00
Sean Engelhardt
54fc500d04 Create the user list over pdfmake 2016-10-12 16:52:24 +02:00
Maximilian Krambach
88674da36a list-of-speakers overlay (fixes #2211) 2016-10-12 15:45:21 +02:00
Norman Jäckel
1a54d1f4c6 Merge pull request #2505 from emanuelschuetze/fix-autoupdate-for-polls 
Fixed autoupdate for motion and assigment polls.
 2016-10-12 11:34:09 +02:00
Emanuel Schuetze
d2acbdda70 Fixed autoupdate for motion and assigment polls. 
Send autoupdate once only after all votes are saved. Disable
autoupdate for saving incompleted vote results.
 2016-10-12 11:23:53 +02:00
Emanuel Schütze
6f70fb630c Merge pull request #2498 from tsiegleauq/agendaPDFmake 
Generate agendas using pdfmake
 2016-10-12 10:27:46 +02:00
Emanuel Schütze
d06f1c5c83 Merge pull request #2503 from boehlke/master 
remove run.sh from Dockerfile
 2016-10-12 10:17:20 +02:00
André Böhlke
3622b62246 remove run.sh from Dockerfile 2016-10-12 09:58:06 +02:00
Sean Engelhardt
345328357f Generate agendas using pdfmake 2016-10-11 18:10:33 +02:00
Norman Jäckel
49a811d81e Merge pull request #2499 from ThomasJunk/authors 
authors edited
 2016-10-10 21:05:17 +02:00
Thomas Junk
0031530d1e authors edited 2016-10-10 16:31:13 +02:00
Norman Jäckel
1b218843ef Merge pull request #2491 from emanuelschuetze/template-fixes 
Template fixes
 2016-10-07 20:07:11 +02:00
Norman Jäckel
35106cda3b Merge pull request #2493 from emanuelschuetze/fix-2492 
Fixed typo in projector autoupdate (Fixes #2492)
 2016-10-07 18:30:37 +02:00
Emanuel Schuetze
af10c5aa3d Fixed typo in projector autoupdate (Fixes #2492) 2016-10-07 17:02:55 +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
Norman Jäckel
e644d1f14c Merge pull request #2445 from FinnStutzenstein/Issue2413 
Using a datetimepicker for agenda start time
 2016-10-06 22:30:22 +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 Schütze
ef7db04cdc Merge pull request #2490 from emanuelschuetze/update-de-translations-2 
Updated missing German translations.
 2016-10-06 22:02:18 +02:00
Emanuel Schuetze
0a2759c3ce Updated missing German translations. 2016-10-06 21:12:31 +02:00
Norman Jäckel
74b80bdb50 Merge pull request #2488 from tsiegleauq/evacuatePDF 
moves pdfmake related code in own files (fixes #2307)
 2016-10-05 15:38:08 +02:00
Sean Engelhardt
5040caba5c moves pdfmake related code in own files (fixes #2307) 2016-10-05 11:27:22 +02:00
Oskar Hahn
8f4b2511f0 Merge pull request #2477 from ostcar/send_many 
Support to send many objects through the autoupdate system
 2016-10-04 18:19:41 +02:00
Oskar Hahn
e209dd6dfe Support to send many objects through the autoupdate system 2016-10-04 18:10:04 +02:00
Norman Jäckel
a78cd7a9a1 Merge pull request #2485 from emanuelschuetze/minorFixes 
Minor changes
 2016-10-04 16:12:25 +02:00
Norman Jäckel
b743d8542f Merge pull request #2484 from emanuelschuetze/gulp-production-fix 
Does not use gulp 'production' flag for openslides.js.
 2016-10-04 16:11:03 +02:00
Emanuel Schuetze
8c9f50e737 Does not use gulp 'production' flag for openslides.js. 
Comment out uglify function for openslides.js.
Added TODO that all OpenSlides js files needed rework before uglified code works correctly.
 2016-10-04 15:11:57 +02:00
Emanuel Schuetze
d7a22c371e Minor changes 
- Show workflow field in motion form only if more than one workflows
  exists.
- Reorder the fields category, tags and origin in motion detail.
- Fix translation string 'Line numbering'.
- Fix padding in motion list.
 2016-10-04 15:06:50 +02:00
Emanuel Schütze
d0f4b59413 Merge pull request #2483 from emanuelschuetze/update-de-translations 
Updated German tranlsations.
 2016-10-04 13:28:46 +02:00
Emanuel Schuetze
2b206a9e72 Updated German tranlsations. 2016-10-04 13:22:39 +02:00
Emanuel Schütze
80cd22f780 Merge pull request #2482 from emanuelschuetze/translation-resources-2 
Fixed translation strings. Updated template-en.pot.
 2016-10-04 12:13:51 +02:00
Emanuel Schuetze
4075c1aa3f Fixed translations strings. Updated template-en.pot. 2016-10-04 12:04:55 +02:00
Emanuel Schütze
0c42f0b972 Merge pull request #2481 from emanuelschuetze/translation-resources 
Updated translation resource files.
 2016-10-04 11:24:57 +02:00
Emanuel Schuetze
72651f5bbc Updated translation resource files. 2016-10-04 11:16:03 +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
Oskar Hahn
c4f6477a4d Merge pull request #2475 from normanjaeckel/FixBroadcast 
Fixed broadcast. Fixed #2467.
 2016-10-01 15:49:07 +02:00
Oskar Hahn
45df53ab45 Merge pull request #2474 from ostcar/send_full_data_through_channel 
Send full_data through the channel.
 2016-10-01 15:44:34 +02:00