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

4393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
2a36a0e84e Use version 2.1-dev. 2016-10-27 14:10:20 +02:00
Emanuel Schütze
4d48f2d8a5 Merge pull request #2533 from normanjaeckel/FixHelpText 
Fixed error in README and help texts of start script. Fixed #2532.
 2016-10-26 15:08:29 +02:00
Norman Jäckel
632fd68564 Fixed error in README and help texts of start script. Fixed #2532. 2016-10-26 14:58:46 +02:00
Norman Jäckel
ee235309ed Merge pull request #2523 from FinnStutzenstein/Issue2517 
change dropdown for project agenda (closes #2517)
 2016-10-26 14:56:18 +02:00
Norman Jäckel
f5b37c1b84 Merge pull request #2530 from emanuelschuetze/pagination 
Fix pagination and indentation of lists in import views.
 2016-10-26 14:55:44 +02:00
Emanuel Schütze
4646cebe55 Merge pull request #2526 from FinnStutzenstein/Issue2448 
Adding sortingoptions for creation date and last modified (closes #2448)
 2016-10-25 14:53:58 +02:00
Emanuel Schütze
147e4ab219 Merge pull request #2527 from FinnStutzenstein/Issue2522 
fixing topics import (closes #2522)
 2016-10-25 14:46:12 +02:00
Emanuel Schütze
435e333bbb Fix pagination and indentation of lists in import views. 2016-10-25 13:45:54 +02:00
Norman Jäckel
12f7f20d8c Merge pull request #2528 from emanuelschuetze/fix-assignment-detail 
Fix to show election results without ng-init.
 2016-10-25 11:21:07 +02:00
Emanuel Schütze
21e6903368 Fix to show election results without ng-init. 
ng-init does not watch for autoupdates.
 2016-10-25 10:44:17 +02:00
FinnStutzenstein
fc21713bb4 Adding sortingoptions for creationdate and last modified (closes #2448) 2016-10-25 10:03:01 +02:00
Emanuel Schütze
6a1fc01a38 Merge pull request #2524 from normanjaeckel/FixMigrations 
Fixed migrations by skipping autoupdate.
 2016-10-24 19:22:49 +02:00
FinnStutzenstein
e267784173 fixing topics import (closes #2522) 2016-10-24 16:38:43 +02:00
Norman Jäckel
9ca15fd0b8 Fixed migrations by skipping autoupdate. 2016-10-24 10:42:34 +02:00
FinnStutzenstein
2f03777d56 change dropdown for project agenda (closes #2517) 2016-10-21 13:11:25 +02:00
Emanuel Schütze
f8be521bf5 Merge pull request #2513 from FinnStutzenstein/Issue2471 
use check icon and no post request on deselect (fixes #2471)
 2016-10-21 10:06:39 +02: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
Emanuel Schütze
578f458191 Merge pull request #2519 from emanuelschuetze/de-translation 
Updated translation resource. Updated German translations.
 2016-10-17 23:54:24 +02:00
Emanuel Schütze
8172984a4d Updated translation resource. Updated German translations. 
Fixed translation strings.
 2016-10-17 23:30:18 +02:00
Emanuel Schütze
7fb65df086 Merge pull request #2518 from emanuelschuetze/translation-en-update 
Updated EN translation resources.
 2016-10-17 22:43:17 +02:00
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