ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,373 Commits 6 Branches 42 Tags 64 MiB
166d287a75
Commit Graph

786 Commits

Author SHA1 Message Date
Tobias Hößl
76fd094ddc OL Offsets - fixes #3643 2018-03-15 12:38:18 +01:00
Emanuel Schütze
b1d5fa21c9
Merge pull request #3652 from emanuelschuetze/numberingCategory 
Improved error handling of re-numbering motions of a category.
 2018-03-14 18:03:48 +01:00
Emanuel Schütze
79d69068f5 Improved error handling of re-numbering motions of a category. 2018-03-14 17:49:25 +01:00
Emanuel Schütze
bee73d3a28 Layout improvements for agenda and motions 
- Use more compact agenda on projector (reduce line height)
- Fixed sorting of motions and limit motion title lenght in recommendation dropdown menu.
- Improved CSS for using tables in topic text (site and projector).
 2018-03-14 12:06:26 +01:00
Tobias Hößl
b2043fa49d
Go to original view after deleting the Title CR, if it is the last one - fixes #3645 2018-03-11 18:28:16 +01:00
Tobias Hößl
611be75d95
Bugfix: Title change recommendations on the projector 2018-03-09 14:34:09 +01:00
Emanuel Schütze
6daf262c0e Some minor CSS improvements. 
- Projector: Use same line height in list elements as in content.
- Projector: Reduce indentation of ul/ol lists.
- Projector: Add more space between line numbers and motion text,
- Agenda list: Remove padding-left in item list view.
 2018-03-08 10:51:31 +01:00
Tobias Hößl
9f8dce6e34
Change recommendations for titles 2018-03-07 16:36:30 +01:00
FinnStutzenstein
1949a00ee7 Moved image sources to the virtual filesystem 2018-03-05 11:51:35 +01:00
Norman Jäckel
a30a30d72f
Merge pull request #3617 from emanuelschuetze/issue3614 
Improved motion import/export (Fix #3614).
 2018-03-04 20:59:24 +01:00
Emanuel Schütze
a733f2edb4 Improved motion import/export (Fix #3614). 
- Fix motion import if names of paricipants are sorted by surname.
- Support multiple submitters in motion export csv.
 2018-03-01 11:21:23 +01:00
Emanuel Schütze
0899bc5e22 Adapt motion csv import example file (Fix #3613). 2018-03-01 10:22:16 +01:00
Emanuel Schütze
4067a52dda Updated German translations. 2018-02-16 16:41:55 +01:00
Emanuel Schütze
1d49121cb6
Merge pull request #3581 from FinnStutzenstein/li-space 
Add space between list elements in motion text and pdf
 2018-02-16 15:30:48 +01:00
Emanuel Schütze
d22a2c3c58
Merge pull request #3567 from FinnStutzenstein/layoutChanges 
Collapsable agenda, one panel for each motion comment and hide closed…
 2018-02-16 14:55:05 +01:00
FinnStutzenstein
1c62f7510b Add space between list elements in motion text and pdf 2018-02-16 14:54:19 +01:00
FinnStutzenstein
44fcfb447e Collapsable agenda, one panel for each motion comment and hide closed agenda items in the item slide. 2018-02-16 14:30:03 +01:00
FinnStutzenstein
ca8ee3edd6 Splitup comment see and manage permissions for motion comments 2018-02-16 14:09:32 +01:00
Emanuel Schütze
8042beda60
Merge pull request #3577 from CatoTH/Issue3563-Escaping-Ampersands 
Escape Ampersands - fixes #3563
 2018-02-15 08:23:54 +01:00
FinnStutzenstein
3ba39c37c1 Agenda DOCX export, motion log message when comment edited, motion sequential number in detail view and PDF, save pagination state to session storage (fixes #3558). 2018-02-14 10:25:51 +01:00
Tobias Hößl
a345815b57 Escape Ampersands - fixes #3563 2018-02-13 16:43:07 +01:00
Emanuel Schütze
a6cdb75093
Merge pull request #3564 from FinnStutzenstein/improvements 
Fixed email translations, motion sorting, undefined in DOCX, reduced …
 2018-02-11 20:12:25 +01:00
FinnStutzenstein
dea62c8394 Fixed wrong css hierachy 2018-02-06 15:53:24 +01:00
FinnStutzenstein
0b04b7478f Fixed email translations, motion sorting, undefined in DOCX, reduced motion search 2018-02-02 12:48:01 +01:00
FinnStutzenstein
39e49f7226 Finally removed AgendaAutoupdate 2018-01-29 09:18:15 +01:00
Norman Jäckel
4aad16db4f Enhance setup of new agenda items for topics, motions and motion blocks. 2018-01-29 09:18:07 +01:00
Norman Jäckel
4a78298f94 Supported server side setup of new agenda items (type and parent). 2018-01-25 23:14:26 +01:00
FinnStutzenstein
60b6ef1415 Repair the master 2018-01-23 14:02:16 +01:00
Tobias Hößl
c7729a6619 Diff-Bugfix: Whitespace was inserted after <br> 2018-01-22 09:12:36 +01:00
Tobias Hößl
e4da7905ca Fixes an edge case in the diff 2018-01-21 10:21:22 +01:00
Jochen Saalfeld
612924c087
save language selection to session storage 
and adding @FinnStutzenstein remarks

adding changelog entry
 2018-01-20 20:57:53 +01:00
Tobias Hößl
b574502a37 Bugfix: Diff and Line breaks at dashes 2018-01-20 11:48:46 +01:00
Finn Stutzenstein
cfefd1c7b7
Merge pull request #3507 from FinnStutzenstein/css 
split up css classes
 2018-01-16 09:41:08 +01:00
FinnStutzenstein
cc75452691 split up css classes using sass 2018-01-16 08:38:11 +01:00
FinnStutzenstein
264b6f7d34 Hide identifier field in motion update form if the user is delegate (fixes #3528) 2018-01-12 08:08:01 +01:00
FinnStutzenstein
5cf82e5921 fixed ValidationError 2018-01-08 10:41:09 +01:00
Emanuel Schütze
3271ff368c
Merge pull request #3516 from FinnStutzenstein/delegateDelete 
Allow to delete own motions
 2017-12-15 10:41:16 +01:00
FinnStutzenstein
a934ab3845 Allow to delete own motions. 2017-12-15 10:20:40 +01:00
Emanuel Schütze
2fe1218fbb
Merge pull request #3503 from FinnStutzenstein/emailTest 
Send invitation emails
 2017-12-15 08:29:09 +01:00
FinnStutzenstein
2220112d27 Send invitation emails with OpenSlides login. 2017-12-15 08:16:29 +01:00
Emanuel Schütze
3d264683ff Assignment improvements 
- Use ckeditor for assignment description field (e.g. for candidatures
  using html).
- Use 2 decimal places for percentage of voting results (motions/assignments)
- Allow css style attributes 'float' and 'padding'.
- Remove progress bar in election result slide to get more space (height)
  for candidate rows.
 2017-12-05 14:04:35 +01:00
Emanuel Schütze
95be44e7f7 Updated German translations. 2017-12-01 12:07:50 +01:00
Emanuel Schütze
a34ad1485a
Merge pull request #3490 from FinnStutzenstein/followRecommendation 
Reduce autoupdates by adding a follow_recommendation view (fixes #348…
 2017-12-01 09:34:56 +01:00
FinnStutzenstein
b6a2530618 Reduce autoupdates by adding a follow_recommendation view (fixes #3488, fixes #3489) 2017-12-01 09:17:50 +01:00
FinnStutzenstein
34ac4a347c Added is amendment filter, fixed ckeditor image browser logo, changed motion table header layout 2017-12-01 09:16:48 +01:00
FinnStutzenstein
2a0a0049b0 New change recommendation type other 2017-11-24 13:30:19 +01:00
Norman Jäckel
3161bdaa05
Merge pull request #3498 from FinnStutzenstein/MotionHref 
Give motions by id in state and recommendation.
 2017-11-21 20:41:47 +01:00
FinnStutzenstein
2bdaf85b67 Give motions by id in state and recommendation. 2017-11-21 16:56:52 +01:00
FinnStutzenstein
79e6e31229 Extended motion export dialog (fixes #3493) 
- Cleanup formfield types
- Remove complete columns in the csv
 2017-11-21 16:27:05 +01:00
Emanuel Schütze
de47da646b
Merge pull request #3492 from emanuelschuetze/templateImprovements 
Template improvements for motions and projector
 2017-11-15 12:08:24 +01:00
Emanuel Schütze
702b452b6e Template improvements for motions and projector 
- Use same title layout for (current) list of speakers slide.
- Set default choose for current list of speakers slide to 'project as slide'
  if more than one projectors available.
- Remove additional control bottons in list of speakers view to stop/end current/next speech.
  (User should better use the start/stop buttons behind the speaker names.)
- Fix typo in projection defaults.
- Set sidebox in motion slide to fix position (should not scroll).
- Fix order of amendments in motion detail template.
- Increase font size of motion block items on slide.
 2017-11-12 17:23:05 +01:00
FinnStutzenstein
db9e132e08 Fix the motion detail template 2017-11-10 17:27:39 +01:00
Emanuel Schütze
b76fd2303c Do not show identifier in motion detail template twice. 2017-11-03 17:02:55 +01:00
FinnStutzenstein
b7da8cf7ec Do not show identifier in motion slide twice 2017-11-03 13:06:51 +01:00
Emanuel Schütze
bed42b5c66
Merge pull request #3472 from FinnStutzenstein/templateChanges 
Template changes and IE fix
 2017-11-03 12:55:17 +01:00
FinnStutzenstein
9e46924c77 Template changes and IE fix 
- Fix IE11 that projector shows JS error if 'startsWith' is used.
  Projector was updated very slowly.
- Hide the valid/invalid/casted ballot rows on projector if empty.
- Use 80% width for motion reason in PDF.
 2017-11-03 12:36:03 +01:00
Emanuel Schütze
432ab9068d
Merge pull request #3473 from FinnStutzenstein/zoomcontent 
Do not zoom slideheaders
 2017-11-03 12:33:42 +01:00
FinnStutzenstein
323534700c Do not zoom slideheaders 2017-11-03 12:17:29 +01:00
FinnStutzenstein
1236fee7ee Showing the number of next speakers in motion list view 2017-11-03 10:29:34 +01:00
Tobias Hößl
e18f22f200 Break lines in nodes that have already been parsed 2017-11-02 09:16:36 +01:00
Emanuel Schütze
c40ae6e9d1
Merge pull request #3465 from CatoTH/Bugfix-More-Tolerant-Diff 
Better handling of inserted paragraphs
 2017-11-02 09:11:28 +01:00
FinnStutzenstein
5e8662e470 Motion optimizations 2017-11-02 08:50:33 +01:00
Tobias Hößl
6891471c45 Better handling of inserted paragraphs 2017-11-01 10:29:18 +01:00
Emanuel Schütze
a8ff32bbb1
Merge pull request #3442 from FinnStutzenstein/MotionIdentifierInTitle 
Show motion identifier in (current) list of speakers
 2017-11-01 10:23:19 +01:00
FinnStutzenstein
39bd6653f0 Show motion identifier in (current) list of speakers 2017-11-01 09:58:22 +01:00
Norman Jäckel
6767dbc40a
Merge pull request #3457 from CatoTH/Bugfix-Fail-Less-Dramatically-With-Inconsistent-Data2 
try/catch for inconsistent data
 2017-10-29 17:59:18 +01:00
Norman Jäckel
e259e10202
Merge pull request #3461 from FinnStutzenstein/followRecommendationAutoCopy 
Update state field when following a recommendation
 2017-10-29 17:53:30 +01:00
Emanuel Schütze
b50d5e10ee Added '!' as new split separator for better motion diff view. 2017-10-27 14:50:38 +02:00
FinnStutzenstein
1c508765fa Update state field when following a recommendation 2017-10-27 12:36:31 +02:00
Tobias Hößl
5fd8741fdb try/catch for inconsistent data 2017-10-24 20:06:04 +02:00
Norman Jäckel
73407133bd Merge pull request #3444 from FinnStutzenstein/ScrollTopOnPageChange 
Go to top on a page change
 2017-10-22 15:35:12 +02:00
Norman Jäckel
d175e4a200 Merge pull request #3452 from FinnStutzenstein/Plugin 
Added TemplateHooks for the protocol plugin.
 2017-10-19 21:21:49 +02:00
FinnStutzenstein
9c657016e3 Added TemplateHooks for the protocol plugin. 2017-10-18 11:35:22 +02:00
Emanuel Schütze
4ff7d0b7dc Merge pull request #3450 from CatoTH/Bugfix-Disable-Change-Ratio 
Disable change ratio detection / Fix marking unchanged dangling line as changed
 2017-10-16 13:05:35 +02:00
Tobias Hößl
e651c124e4 Disable change ratio detection / Fix for marking unchanged line as changed 2017-10-16 12:27:44 +02:00
Emanuel Schütze
5eda3131a8 Merge pull request #3449 from emanuelschuetze/motionTemplateImprovements 
Motion template improvements (Fixed #3303)
 2017-10-16 12:10:00 +02:00
Emanuel Schütze
c02f00da7d Merge pull request #3446 from FinnStutzenstein/Identifier 
New motion identifier behavior
 2017-10-16 12:08:53 +02:00
Emanuel Schütze
17959bd9c5 Motion template improvements (Fixed #3303) 
- Sort categories drop downs by config value (name or prefix) (fixed #3303).
- Show comment fiels in pdf without "Comment" as prefix.
- Improved heading style in web and pdf.
- Added motion block to motion pdf.
 2017-10-16 09:35:06 +02:00
Emanuel Schütze
721064700a Merge pull request #3441 from FinnStutzenstein/CommentsFilterMove 
Move comments filter behind motion block filter
 2017-10-13 23:38:45 +02:00
Norman Jäckel
611776d38c Merge pull request #3445 from FinnStutzenstein/MotionTextFullWidth 
Limit the reason display width
 2017-10-13 18:35:47 +02:00
Norman Jäckel
9b64bd5646 Merge pull request #3438 from FinnStutzenstein/PDF 
Fixing multiline headers in PDF
 2017-10-13 18:21:34 +02:00
FinnStutzenstein
5b9933e930 Move comments filter behind motion block filter 2017-10-13 14:25:31 +02:00
FinnStutzenstein
1da34f744f New motion identifier behavior 2017-10-13 14:06:01 +02:00
FinnStutzenstein
96cd3405aa Go to top on a page change 2017-10-13 11:46:41 +02:00
FinnStutzenstein
6584c7b035 Limit the reason display width 2017-10-13 11:16:01 +02:00
Norman Jäckel
3c9ae628e8 Merge pull request #3439 from FinnStutzenstein/PdfInsertFix 
Fixed indention of inserted paragraphes
 2017-10-12 20:29:41 +02:00
Tobias Hößl
a09a12c55c Diff: use comma as a word separator 2017-10-11 22:15:12 +02:00
FinnStutzenstein
fc185e2eeb Fixing multiline headers in PDF 2017-10-11 14:21:35 +02:00
FinnStutzenstein
b8e23e6a4f Fixed indention of inserted paragraphes 2017-10-11 14:04:31 +02:00
Emanuel Schütze
18d138ebf1 Merge pull request #3433 from emanuelschuetze/layoutIssues 
Fixed minor layout issues on projector and pdf.
 2017-10-05 13:29:38 +02:00
Emanuel Schütze
02857bdbf1 Fixed minor layout issues on projector and pdf. 
Especially for motion diff view.
 2017-10-05 13:05:49 +02:00
Emanuel Schütze
0a04ee0716 Added new motion configs to hide reason/recommendation on projector. 2017-10-05 12:54:40 +02:00
Emanuel Schütze
0b10933d67 Merge pull request #3417 from FinnStutzenstein/HidePassword 
Hide password in change password view
 2017-09-27 10:52:09 +02:00
FinnStutzenstein
6f33c8a866 Fixing motion comments (fixes #3420) 2017-09-27 09:20:07 +02:00
FinnStutzenstein
ab08708ec1 Hide password in change password view 2017-09-26 09:03:05 +02:00
FinnStutzenstein
aa13e5ddd0 Fixing special comments fields, reconnect timeout, minor things. 2017-09-22 13:45:52 +02:00
Emanuel Schütze
6f3e2a74f8 Merge pull request #3410 from CatoTH/Issue3409-Workaround-For-Newlines 
Line break algorithm should not be distracted by newline characters
 2017-09-21 16:35:14 +02:00
Emanuel Schütze
c68688c2ff Merge pull request #3414 from FinnStutzenstein/Fixes 
Motion comments fix and close open dialogs if a relogin is necessary
 2017-09-21 16:29:32 +02:00
Tobias Hößl
ee37cfed9c Line break algorithm should not be distracted by newline characters 
- Cancel out newlines inserted when inline-editing motions
- Bugfix for newlines after BRs
 2017-09-21 16:24:54 +02:00
FinnStutzenstein
a4ae174a94 Fixing motion access permissions 2017-09-21 12:43:07 +02:00