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

379 Commits

Author SHA1 Message Date
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
16743cd9b8 Merge pull request #3044 from CatoTH/Issue3027-LineNumberingBugfix 
Handle STRIKE-tags correctly in line numbering - fixes #3027
 2017-03-05 20:22:59 +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
Norman Jäckel
a33d504c6b Merge pull request #3040 from CatoTH/Issue3024-Escaping-of-HTML-elements 
Bugfix for #3024 - escaping HTML tags
 2017-03-05 20:19:24 +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
Tobias Hößl
c8006588c5 Handle STRIKE-tags correctly in line numbering 2017-03-04 16:17:48 +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
Tobias Hößl
e698d81f9f Bugfix for #3024 - escaping HTML tags 2017-03-04 15:51:33 +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
Emanuel Schütze
95c19159f8 Merge pull request #3026 from CatoTH/bugfix-line-numbering-diff 
Several bug fixes in the diff
 2017-03-03 15:26:44 +01:00
Tobias Hößl
74f40395d9 Several bug fixes in the diff 2017-03-03 15:16:51 +01:00
Emanuel Schütze
91cb124918 Merge pull request #3018 from FinnStutzenstein/ErrorMessages 
Error messages and global messaging service (closes #2949)
 2017-03-03 14:52:00 +01:00
FinnStutzenstein
9c89f4d59c Error messages and global messaging service (fixes #2949, fixes #1774) 2017-03-03 14:36:31 +01:00
Norman Jäckel
4744e1ca99 Merge pull request #3034 from FinnStutzenstein/TemplateFixes 
Small template improvements
 2017-03-03 14:23:05 +01:00
FinnStutzenstein
606c17ef43 Small template improvements 2017-03-03 11:53:33 +01:00
Norman Jäckel
5a821ecf49 Fixed use of PATCH and PUT. Fixed #1871. 2017-02-27 17:20:57 +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
e67d67a07f Merge pull request #3006 from FinnStutzenstein/Issue2894 
hide 'show as agenda item' for non authorized users (fixes #2894)
 2017-02-24 15:44:25 +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
FinnStutzenstein
1c1a2bef09 hide 'show as agenda item' for non authorized users (fixes #2894) 2017-02-24 10:15:28 +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
Emanuel Schütze
60ebac9f8b Merge pull request #2994 from FinnStutzenstein/Improvements 
Usability improvements
 2017-02-22 19:03:42 +01:00
FinnStutzenstein
da89bf5a83 Usability improvements 2017-02-22 16:58:52 +01:00
Emanuel Schütze
e1075eb24d Minor fixes from previous pull request reviews. 2017-02-21 15:56:41 +01:00
Norman Jäckel
ebf9278b79 Merge pull request #2990 from emanuelschuetze/fixProjection 
Fix motion projection.
 2017-02-20 20:38:59 +01:00
Emanuel Schütze
d79cea9a8b Fix motion projection. 2017-02-20 18:44:37 +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
Norman Jäckel
ee66ee3d72 Merge pull request #2979 from FinnStutzenstein/Issue2951 
fixing #2951
 2017-02-17 16:28:26 +01:00
Norman Jäckel
8adbb1218f Merge pull request #2978 from FinnStutzenstein/MotionBlockAutoupdate 
Fixing MotionBlock autoupdate and added projector button (fixes #2958)
 2017-02-17 16:27:22 +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
a5398a491c fixing #2951 2017-02-17 14:54:32 +01:00
FinnStutzenstein
0e401e7223 Fixing MotionBlock autoupdate and added projector button (fixes #2958) 2017-02-17 13:49:55 +01:00
Norman Jäckel
28a5c9ecaf Merge pull request #2974 from emanuelschuetze/pdf-layout 
Motion PDF improvements
 2017-02-17 13:11:15 +01:00
Emanuel Schütze
46f6bbb907 Motion PDF improvements 
* Use consistent lineheight (1.25) in PDF (also for lists).
* set default value of motions_line_length config to 90.
* Reduce footer height.
* Use identifier in filename only if available.

Added missing translation string.
 2017-02-17 10:48:27 +01:00
Norman Jäckel
0319799aff Merge pull request #2891 from normanjaeckel/CamelCase 
Added support for CamelCase to RESTModelMixin. See #2480.
 2017-02-16 21:09:13 +01:00
Norman Jäckel
89192236fc Added support for CamelCase to RESTModelMixin. See #2480. 2017-02-16 13:31:57 +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
Tobias Hößl
afff1f35f8 Solving two bugs in the diff 2017-02-15 20:23:29 +01:00
Sean Engelhardt
4eefde839b pdf w.o linen numbers and change rec. (fixes #2962) 2017-02-15 14:23:28 +01:00