Commit Graph

4853 Commits

Author SHA1 Message Date
Emanuel Schütze
6b74bf635d Merge pull request #2993 from emanuelschuetze/motion-poll-log
Added motion log entry for creating polls.
2017-02-24 15:44:53 +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
Emanuel Schütze
4ebc238ea2 Added motion log entry for creating polls.
Use timezone support for motion log time.
2017-02-24 15:31:26 +01:00
Norman Jäckel
5b4ca84306 Removed restricted fields from PUT request where a users wants to update himself. Fixed #2986 and #2984. 2017-02-24 15:22:55 +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
Norman Jäckel
bebdcaf6b9 Merge pull request #3000 from emanuelschuetze/reject-change-recommendations
Added 'reject all change recommendations' button.
2017-02-24 09:58:03 +01:00
Emanuel Schütze
7de2f5c79c Reduced user profile form 2017-02-22 23:31:50 +01:00
Emanuel Schütze
bf0b5d5062 Added 'reject all change recommendations' button. 2017-02-22 23:08:46 +01:00
Emanuel Schütze
f69781b88b Merge pull request #2999 from emanuelschuetze/state-recommendation-name
Added extension for state and recommendation names in dropdown.
2017-02-22 21:52:41 +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
7f08a09497 Merge pull request #2992 from FinnStutzenstein/CleanUp
Collection name to CamelCase (fixes #2983)
2017-02-22 19:44:49 +01:00
FinnStutzenstein
5374b2f398 Collection name to CamelCase (fixes #2983) 2017-02-22 19:12:38 +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
7fb7bff7b1 Merge pull request #2989 from emanuelschuetze/users-csv-import
Allowed to export/import initial user password.
2017-02-22 16:57:43 +01:00
Emanuel Schütze
8ff247b555 Allowed to export/import initial user password. 2017-02-22 08:38:14 +01:00
Norman Jäckel
cac15db50a Merge pull request #2996 from emanuelschuetze/fixes
Minor fixes from previous pull request reviews.
2017-02-21 17:52:21 +01:00
Emanuel Schütze
e1075eb24d Minor fixes from previous pull request reviews. 2017-02-21 15:56:41 +01:00
Norman Jäckel
4d3a45c8fb Merge pull request #2991 from emanuelschuetze/css-fixes
CSS improvements for projector sidebar on small devices.
2017-02-20 20:39:22 +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
acf996a720 CSS improvements for projector sidebar on small devices. 2017-02-20 19:46:44 +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
0db900dc9f Merge pull request #2988 from emanuelschuetze/translations
Translations
2017-02-17 23:28:10 +01:00
Emanuel Schütze
a06d969dc3 Updated translation resources and German translations. 2017-02-17 23:21:54 +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
Emanuel Schütze
d478adaf94 Added CHANGELOG entry. 2017-02-17 22:14:11 +01:00
Norman Jäckel
e35e65b7d4 Merge pull request #2985 from normanjaeckel/AgendaSortCheck
Added check for hierarchical loops in agenda sort view. See #2972.
2017-02-17 22:08:23 +01:00
Emanuel Schütze
9ae1d7e59a Show allert in sort template if agenda sort request failed. 2017-02-17 21:59:13 +01:00
Norman Jäckel
582915a019 Merge pull request #2981 from emanuelschuetze/fix-motion-block-projector
Send also motion.state.workflow to motion block slide.
2017-02-17 21:44:56 +01:00
Emanuel Schütze
06e9ffc819 Send also motion.state.workflow to motion block slide.
to show recommendation names in slide template
2017-02-17 21:10:46 +01:00
Norman Jäckel
aa14ac99b3 Added check for hierarchical loops in agenda sort view. See #2972. 2017-02-17 17:20:30 +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
935a2a7245 Merge pull request #2980 from emanuelschuetze/pdf-worker-fix
Fixed placeholder replacement in pdf worker.
2017-02-17 16:29:09 +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
Emanuel Schütze
a804362e16 Fixed placeholder replacement in pdf worker.
Make it more dynamic by searching recursively.
2017-02-17 15:11:28 +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
Emanuel Schütze
9a1e45682c Merge pull request #2976 from FinnStutzenstein/templateFixes
Update mediafile form
2017-02-17 13:58:49 +01:00
FinnStutzenstein
0e401e7223 Fixing MotionBlock autoupdate and added projector button (fixes #2958) 2017-02-17 13:49:55 +01:00
Emanuel Schütze
0075c23225 Merge pull request #2977 from emanuelschuetze/issue2967
Fixed margin-top of motion change recommendation line tooltip.
2017-02-17 13:21:54 +01:00
Emanuel Schütze
09ae3c3425 Fixed margin-top of motion change recommendation tooltip (Fixed #2967). 2017-02-17 13:17:24 +01:00