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

301 Commits

Author SHA1 Message Date
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
FinnStutzenstein
5e8662e470 Motion optimizations 2017-11-02 08:50:33 +01:00
FinnStutzenstein
1c508765fa Update state field when following a recommendation 2017-10-27 12:36:31 +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
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
FinnStutzenstein
5b9933e930 Move comments filter behind motion block filter 2017-10-13 14:25:31 +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
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
FinnStutzenstein
aa13e5ddd0 Fixing special comments fields, reconnect timeout, minor things. 2017-09-22 13:45:52 +02:00
FinnStutzenstein
31708df436 Motion comments fix and close open dialogs if a relogin is necessary 2017-09-20 07:34:57 +02:00
FinnStutzenstein
c580ee4c8d Goto top link, improved title, stylistic changes, and more 2017-09-15 11:06:19 +02:00
Emanuel Schütze
2c4a1d5a6c Merge pull request #3376 from FinnStutzenstein/MotionCommentsRework 
Rework on motion comments.
 2017-09-15 10:59:02 +02:00
FinnStutzenstein
288a706d01 Rework on motion comments (fixes #3350). 2017-09-12 14:58:43 +02:00
Emanuel Schütze
29f60fc6aa Fixed motion detail style issues 
- margin in motion diff view
- personal note box
 2017-09-08 18:25:48 +02:00
FinnStutzenstein
02428eb8f0 Pin personal note. 2017-09-05 08:24:16 +02:00
FinnStutzenstein
7d333d4f3b Multiselect filter for motion comments, filter and sorting fixes (fixes #3365, fixes #3367) 2017-08-29 11:36:00 +02:00
FinnStutzenstein
0f6d2d431c Inline editing for motion reason 2017-08-23 09:42:10 +02:00
FinnStutzenstein
a12440ed2c Exclude special comments in comment field settings; fixing the inline editiing 2017-08-16 09:09:22 +02:00
FinnStutzenstein
c65976715e configvalue for sequential number 2017-07-27 11:15:12 +02:00
FinnStutzenstein
2536b35c0e Highlight objects in list view, if related objects are projected 2017-06-21 07:52:10 +02:00
FinnStutzenstein
e7da35398d Export personal note and comments in PDFs. 2017-05-19 14:31:58 +02:00
Emanuel Schütze
8abfe91853 Merge pull request #3258 from FinnStutzenstein/docx 
Rework docx parser, add comments to docx
 2017-05-19 14:02:29 +02:00
FinnStutzenstein
f4c4f2553b Rework docx parser, add comments to docx 2017-05-19 13:55:09 +02:00
FinnStutzenstein
e396347e00 Also notify users when they inline edit a motion (fixes #2360) 2017-05-19 13:21:19 +02:00
FinnStutzenstein
96899f63cc Personal note (client side) 2017-04-27 09:10:46 +02:00
FinnStutzenstein
c68d3f0e4a Export dialog for motions 2017-04-07 15:00:21 +02:00
Emanuel Schütze
e5028f7ef2 Merge pull request #3127 from emanuelschuetze/issue3112 
Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112, #3038)
 2017-03-22 15:54:38 +01:00
Emanuel Schütze
2571d83195 Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112, fixed #3038). 
- Provided csv header fields as meta data while csv import (#3038).
- Consolidate (already translated) strings for motion poll.
- Fixed typos for MotionPoll model.
 2017-03-22 15:37:08 +01:00
Emanuel Schütze
b6e1b3fc67 Updated translations (Fixed #2955) 2017-03-22 12:52:11 +01:00
Emanuel Schütze
af9559d036 Fixed hidden tooltip content in motion toolbar. 2017-03-22 10:38:22 +01:00
Emanuel Schütze
869105dc40 Minor fixes 
- Added motion change recommendations to full text search.
- Show csv/docx export entries in list views for manager only.
 2017-03-22 08:47:32 +01:00
Emanuel Schütze
70de0a6e4b Hide change recommendation diff-box in diff version for normal users. 2017-03-21 20:47:58 +01:00
Norman Jäckel
a412ff9eb3 Merge pull request #3094 from FinnStutzenstein/Issue3092 
Fixes #3092, fixes #2453 and fixed motion projection bug
 2017-03-21 17:20:49 +01:00
FinnStutzenstein
4f84a9f752 Fixes #3092, fixes #2453 and fixed motion projection bug 2017-03-21 14:29:06 +01:00
FinnStutzenstein
a638b05538 Let users with comments management perms edit them (fixes #3036), fixes #3090 2017-03-21 09:59:49 +01:00
Emanuel Schütze
b53843c17e Several template fixes 
- Motions catalog pdf: Show categories of filtered motions only.
- Fixed permission for "reject all change recommendations" button
- Use color for yes/no/abstain for progress bars in assignment detail.
 2017-03-10 22:46:01 +01:00
Norman Jäckel
4c2b13a142 Merge pull request #3052 from emanuelschuetze/mobile-theme 
Responsive design improvements
 2017-03-05 20:34:50 +01:00
Norman Jäckel
0ca8fa57ed Merge pull request #3046 from CatoTH/Projector-Diff-View-Line-Numbers 
Bugfix for missing line numbers in diff view in the projector
 2017-03-05 20:23:35 +01:00
Norman Jäckel
659c7858eb Merge pull request #3043 from emanuelschuetze/category-sort-template 
Added motion detail links to category sort view.
 2017-03-05 20:22:40 +01:00
Norman Jäckel
1fdb3a4f2a Merge pull request #3042 from emanuelschuetze/3028 
Improved go to line number tooltip/popup. (#3028)
 2017-03-05 20:20:25 +01:00
Emanuel Schütze
f67afd1823 Responsive design improvements 
- Reduce search bar on small devices.
- Use separate projector sidebar for small devices.
- motion detail toolbar: show line number mode and change recommendation
  controls as dropdown (for small/extra small devices) or as
  button group (for medium/large devices).
 2017-03-05 00:30:00 +01:00
Tobias Hößl
0022df2aff Bugfix for missing line numbers in diff view in the projector 2017-03-04 16:42:02 +01:00
Emanuel Schütze
fa395d6cc2 Added motion detail links to category sort view. 2017-03-04 16:07:05 +01:00
Emanuel Schütze
a9144b6d5b Improved go to line number tooltip/popup. (#3028) 2017-03-04 16:00:54 +01:00
Emanuel Schütze
3903be5d6b Fixed switching between motion versions (Fixed #2363) 
- Show correct text and reason for selected version.
- Disable inline editing after save (otherwise inline mode is still
  active when user change version)
 2017-03-03 17:03:32 +01:00
FinnStutzenstein
606c17ef43 Small template improvements 2017-03-03 11:53:33 +01:00
Emanuel Schütze
65fcd8e9d6 Fixed forms (added missing operator). 
Also:
- Move motion state filter to 2nd filter position (as in detail view).
- Open dropdown filter of state and recommendation on left side.
 2017-02-27 10:02:43 +01:00
Emanuel Schütze
045c65de49 Merge pull request #3008 from FinnStutzenstein/Issue2636 
Remove scrolling to a line on projector (closes #2636)
 2017-02-24 15:38:18 +01:00
Emanuel Schütze
5d38ca8c68 Merge pull request #3005 from FinnStutzenstein/Issue3004 
Fixing create view for amendments (fixing #3004)
 2017-02-24 15:37:46 +01:00
FinnStutzenstein
8a8755f22d Fixing create view for amendments (fixing #3004) 2017-02-24 15:16:12 +01:00
FinnStutzenstein
803f9dba96 Remove scrolling to a line on projector (closes #2636) 2017-02-24 10:31:48 +01:00
Emanuel Schütze
bf0b5d5062 Added 'reject all change recommendations' button. 2017-02-22 23:08:46 +01:00
Emanuel Schütze
4168153ba3 Added extension for state and recommendation names in dropdown. 2017-02-22 21:31:47 +01:00
FinnStutzenstein
da89bf5a83 Usability improvements 2017-02-22 16:58:52 +01:00
Norman Jäckel
1e9c7273ae Merge pull request #2987 from emanuelschuetze/issue2963 
Fixed placement of 'back' button in motion block view (Fixed #2963).
 2017-02-18 00:06:00 +01:00
Emanuel Schütze
58f499283f Fixed translation strings. 2017-02-17 23:21:50 +01:00
Emanuel Schütze
e4bd44082d Fixed placement of 'back' button in motion block view (Fixed #2963). 2017-02-17 22:32:17 +01:00
Emanuel Schütze
6bad8e8cc6 Merge pull request #2973 from FinnStutzenstein/Dialogs 
Dialogs for some views
 2017-02-17 22:20:59 +01:00
Norman Jäckel
56420aa0f5 Merge pull request #2982 from emanuelschuetze/recommendation-config 
Added new config for default change recommendation view.
 2017-02-17 16:33:36 +01:00
Emanuel Schütze
768ee9236a Added new config for default change recommendation view. 
Use this default view for motion catalog pdf and motion detail view.
 2017-02-17 16:03:00 +01:00
FinnStutzenstein
735dbcf109 Better dialog handling. Many fixes. 2017-02-17 14:58:35 +01:00
FinnStutzenstein
0e401e7223 Fixing MotionBlock autoupdate and added projector button (fixes #2958) 2017-02-17 13:49:55 +01:00
Emanuel Schütze
7a73b30189 More layout fixes for motion diff view slide. 
- Fixed wrong text order.
- Improved change summary box.
 2017-02-15 22:40:18 +01:00
FinnStutzenstein
b73c50a4f9 Fixed missing <p> tags for motion import and some improvements. 2017-02-10 09:11:45 +01:00
Emanuel Schütze
e7ee8fbc07 Fixed some minor template styles. 
Use always css class 'btn-sm' for buttons and 'input-sm' for inputs in
list and detail templates for consistent appearance.
 2017-02-03 12:50:57 +01:00
Emanuel Schütze
df3e691734 Used better pagination for agenda, motions and users. 
to increase the browser performance while switching between apps.
 2017-01-25 19:51:51 +01:00
Emanuel Schütze
b2dfc9b44e Fixed translation strings. 2017-01-19 10:42:26 +01:00
Norman Jäckel
9250055e35 Merge pull request #2876 from emanuelschuetze/issue2763 
Adapted motion DOCX template.
 2017-01-15 12:21:27 +01:00
Emanuel Schütze
986e8cc4f6 Adapted motion DOCX template (Fixed #2763). 2017-01-15 10:59:09 +01:00
Norman Jäckel
8bb0918372 Merge pull request #2825 from FinnStutzenstein/CsvImports 
New csv import for users and topics
 2017-01-14 20:52:09 +01:00
FinnStutzenstein
397d659f0b New csv import for users and topics 2017-01-14 18:29:05 +01:00
Emanuel Schütze
35a5d4fe3b Merge pull request #2839 from FinnStutzenstein/Issue2838 
Fixing #2838
 2017-01-14 10:40:57 +01:00
FinnStutzenstein
76e6bac422 Fixing #2838 2017-01-14 10:21:14 +01:00
Meinert Leinigen
d133199a73 Removed Recommendation motion summary 2017-01-13 21:28:03 +01:00
FinnStutzenstein
b44b58393d Motion comments inline editing 2017-01-11 20:59:50 +01:00
Emanuel Schütze
41124a53ca Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS. 
Set settings value to False to disable new amendment button in motion detail
template. Default: True.
 2017-01-09 14:25:28 +01:00
FinnStutzenstein
e8fa488d60 Project change recommendations 2017-01-07 14:48:11 +01:00
FinnStutzenstein
f5fa3575df New csv import using PapaParse 2017-01-06 10:50:03 +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
78361308aa Updated EN+DE translations. 2016-12-13 12:20:14 +01:00
Norman Jäckel
c1d4927a9b Merge pull request #2764 from FinnStutzenstein/Issue2754 
More motion select mode options and layout changes for guests
 2016-12-13 11:57:51 +01:00
FinnStutzenstein
dbdaa9748c More motion select mode options and layout changes for guests 2016-12-13 11:27:44 +01:00
Emanuel Schütze
a9cc8fcb37 Some template style and translation fixes. 2016-12-12 20:30:50 +01:00
Norman Jäckel
7772f60bd4 Added global config for motion preamble. 2016-12-12 12:51:27 +01:00
Emanuel Schütze
43cdfd3836 Merge pull request #2752 from FinnStutzenstein/MotionState 
Adding 'done' option in motion state filter
 2016-12-09 22:36:32 +01:00
Emanuel Schütze
8289306569 Merge pull request #2746 from emanuelschuetze/fonts 
Use Roboto font in all templates.
 2016-12-09 22:26:38 +01:00
FinnStutzenstein
efaa00483c Adding 'done' option in motion state filter 2016-12-09 15:18:35 +01:00
Norman Jäckel
c2edf134e2 Merge pull request #2751 from FinnStutzenstein/Issue2747 
Some stylistic changes and new motion filter option
 2016-12-09 15:16:50 +01:00
Emanuel Schütze
fb7b265826 Use Roboto font in all templates. 
- Only install needed font files for Roboto and Roboto Condensed
  which strongly reduced the directory size of 'static/font'.
- Make it easier to adjust custom font by using global css font definition
  in app.css and projector.css.
- Remove Open Sans font.
 2016-12-09 15:10:31 +01:00
FinnStutzenstein
acba95f8a4 changing user import (closes #2666) 2016-12-09 15:02:32 +01:00
FinnStutzenstein
f7fcb69cc2 Some stylistic changes and new motion filter option 2016-12-09 14:58:15 +01:00
FinnStutzenstein
eca93594d7 Moving csv exports in seperate files (closes #2728) 2016-12-09 08:08:38 +01:00