Commit Graph

4271 Commits

Author SHA1 Message Date
Emanuel Schütze
35a69254af Updated EN translation resources. 2016-10-17 22:07:25 +02:00
Emanuel Schütze
68139ff5be Merge pull request #2512 from FinnStutzenstein/Issue2470
key value switched in angular foreach (fixes #2470)
2016-10-17 22:05:55 +02:00
Norman Jäckel
676e783039 Merge pull request #2516 from FinnStutzenstein/Issue2502
Remove chat history
2016-10-17 21:48:34 +02:00
Norman Jäckel
f2fa8de7be Merge pull request #2495 from normanjaeckel/MotionBlock
Motion block
2016-10-17 21:29:31 +02:00
Emanuel Schütze
29638cc702 Recreated migrations file for motionBlock.
Minor template fixes for motionBlock.
2016-10-17 21:18:31 +02:00
Norman Jäckel
20f8875dcd Added view to follow recommendations.
for all motions of a motion block
2016-10-17 21:02:50 +02:00
Emanuel Schuetze
0270c31b32 Template improvements for motion blocks.
Fixed $stateProvider to allow camelCase in state name (Fixed #2479)
- Refactor generic templateUrl function.
- Rename MotionBlock templates.
- Rename MotionBlock controller.
2016-10-17 20:58:10 +02:00
Norman Jäckel
700c86a24c New feature blocks for motions.
- Added ListView, DetailView, UpdateForm and connection to
  agenda item for MotionBlock.
- Added slide and projection default.
- Added custom manager for motion blocks.
- Enabled current list of speakers slide and overlay for motion block.
2016-10-17 20:54:26 +02:00
Norman Jäckel
8d494ddef9 Merge pull request #2511 from FinnStutzenstein/Issue2465
Rename AdditionalId to arg (closes #2465)
2016-10-17 20:45:23 +02:00
Emanuel Schütze
34b074faec Merge pull request #2501 from CatoTH/change-recommendations-pr
Change recommendations (WIP)
2016-10-17 20:06:01 +02:00
Tobias Hößl
228abf5cee Change recommendations 2016-10-17 19:37:32 +02:00
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