Commit Graph

2960 Commits

Author SHA1 Message Date
Tobias Hößl
46cf26481e Bugfix for #2770 2016-12-14 22:28:44 +01:00
Norman Jäckel
1221ef4f02 Rearrange client mediafile app. 2016-12-14 17:16:42 +01:00
Norman Jäckel
deb5c5f4b3 Merge pull request #2774 from matakuka/language
Change the language selector to the languages' own names
2016-12-14 16:38:24 +01:00
Maximilian Krambach
0e6324b252 Change the language selector to the languages' own names 2016-12-14 15:25:38 +01:00
Sean Engelhardt
41ceb4ef9d add special voting values for missed options (fixes #2709) 2016-12-14 14:05:03 +01:00
Norman Jäckel
cebfbf5b8d Merge pull request #2633 from normanjaeckel/SquishMigrations
Prepare migrations for 2.1b1.
2016-12-13 23:28:56 +01:00
Emanuel Schütze
218b4bc7f4 Remove old countdowns and messages in core migrations. 2016-12-13 17:04:25 +01:00
Emanuel Schütze
78361308aa Updated EN+DE translations. 2016-12-13 12:20:14 +01:00
Norman Jäckel
3096958ba9 Prepare migrations for 2.1b1.
Agenda, Assignments, Core, Mediafiles, Motions, Users.

Topics are already done.
2016-12-13 11:58:36 +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
Norman Jäckel
6a58174e25 Merge pull request #2765 from FinnStutzenstein/Issue2451
rename mediafiles private flag to hidden
2016-12-13 11:15:53 +01:00
Emanuel Schütze
a9cc8fcb37 Some template style and translation fixes. 2016-12-12 20:30:50 +01:00
FinnStutzenstein
6bbbf30d94 rename mediafiles private flag to hidden 2016-12-12 16:23:31 +01:00
Norman Jäckel
99db9b71b7 Merge pull request #2760 from normanjaeckel/MotionTextIntro
Added global config for motion preamble.
2016-12-12 16:23:18 +01:00
Emanuel Schütze
32b7ddedce Template fixes for motion preamble (#2760). 2016-12-12 16:14:32 +01:00
Emanuel Schütze
2bf1b3d827 Merge pull request #2755 from normanjaeckel/StatePermission
Fixed state flag required permission to see.
2016-12-12 13:49:07 +01:00
Emanuel Schütze
8780c47fc1 Minor fixes (Fixes #2750)
- Use <ul> instead of <ol> for candidate lists.
- Fix sorting by assignment_related_users.length in list view (Fixes #2750).
- Apply category and motion block for new amendments.
2016-12-12 12:58:58 +01:00
Norman Jäckel
7772f60bd4 Added global config for motion preamble. 2016-12-12 12:51:27 +01:00
Norman Jäckel
6dc598800d Fixed state flag required permission to see. 2016-12-11 22:02:16 +01:00
Emanuel Schütze
116c3702f2 Updated German translations.
Added missing translation filter.
2016-12-11 13:37:26 +01:00
Emanuel Schütze
cd08f02949 Updated EN translation file. 2016-12-10 11:14:08 +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
Emanuel Schütze
0bef3d751e Merge pull request #2742 from emanuelschuetze/missing-translations
Mark missing translation strings in table headers.
2016-12-09 15:22:03 +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
358fd59d3c Merge pull request #2749 from FinnStutzenstein/Issue2666
changing user import (closes #2666)
2016-12-09 15:14:42 +01:00
Emanuel Schütze
f6d01c1d17 Mark missing translation strings in table headers. 2016-12-09 15:13:35 +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
36c8477c7f no nav underline glitch 2016-12-09 13:51:23 +01:00
FinnStutzenstein
eca93594d7 Moving csv exports in seperate files (closes #2728) 2016-12-09 08:08:38 +01:00
Norman Jäckel
787805efa6 Merge pull request #2744 from tsiegleauq/issue2576-parsing-does-not-end
add precise text decoration (fixes #2576)
2016-12-07 22:14:49 +01:00
sean
b1f4def743 add precise text decoration (fixes #2576) 2016-12-07 21:41:55 +01:00
Emanuel Schütze
c363fff3ba Remove sidebox from assignment slide
Feedback from serveral users: open posts and state are not very
useful on slide and should be removed.
2016-12-07 21:00:13 +01:00
Emanuel Schütze
8bd03bafdb Rename first/last name to given name/surname (Fixes #2564). 2016-12-07 19:49:25 +01:00
Norman Jäckel
4e5adb74e3 Merge pull request #2739 from CatoTH/Issue2561-pdf-line-numbering-in-lists
Attempt to mitigate the list / line number problem
2016-12-07 11:34:50 +01:00
Norman Jäckel
b27a975075 Merge pull request #2737 from FinnStutzenstein/Issue2730
Use session cookies and store filter settings in sessionStorage
2016-12-07 11:25:06 +01:00
FinnStutzenstein
acb5a6dcf9 Use session cookies and store filter settings in sessionStorage 2016-12-07 08:01:33 +01:00
Tobias Hößl
2cb1429c8d First attempt to mitigate the list / line number problem 2016-12-06 22:12:29 +01:00
FinnStutzenstein
29ae600194 Dynamic webpage title 2016-12-05 18:00:52 +01:00
Emanuel Schütze
a716910b63 Merge pull request #2734 from emanuelschuetze/issue2727
Hot fix for cache update while user import (Fixes #2727).
2016-12-05 13:25:11 +01:00
Emanuel Schütze
405fb1b9d1 Merge pull request #2733 from normanjaeckel/CategorySort
Category sort
2016-12-05 13:24:45 +01:00
Emanuel Schütze
b36560bffb Hot fix for cache update while user import (Fixes #2727). 2016-12-05 13:17:35 +01:00
Emanuel Schütze
3888632e14 Merge pull request #2735 from normanjaeckel/FixStatus
Fixed typo.
2016-12-05 13:09:25 +01:00
Norman Jäckel
e180b1df29 Fixed sorting of motions in a category. Changed identifiers of amendments during sorting. Fixed #2701. 2016-12-05 12:59:46 +01:00
Norman Jäckel
8b6844675e Merge pull request #2732 from CatoTH/bugfix-typo-in-variable-name
Typo in variable name
2016-12-05 12:58:56 +01:00
Norman Jäckel
d8c7eda587 Fixed typo. 2016-12-05 12:40:28 +01:00
Norman Jäckel
d0ed0cea23 Improved speed of motion numbering. 2016-12-03 20:57:00 +01:00
Tobias Hößl
940fb14ad6 Typo in variable name 2016-12-03 14:50:39 +01:00
Emanuel Schütze
9009c9e2e9 Updated translations for EN/DE. Fix translation string. 2016-12-02 16:30:03 +01:00
Emanuel Schütze
486f0601eb Merge pull request #2721 from FinnStutzenstein/AgendaTable
Agenda table
2016-12-02 15:59:57 +01:00
Emanuel Schütze
0698327427 Fix minor remarks for #2271. 2016-12-02 15:49:21 +01:00
Emanuel Schütze
4c37fd8e62 Merge pull request #2726 from normanjaeckel/FollowRecommendationButton
Added button to motion detail view to follow recommendation. Closed #…
2016-12-02 15:40:33 +01:00
FinnStutzenstein
ee5adb8fd2 New AgendaTable 2016-12-02 15:18:32 +01:00
Norman Jäckel
49dca65640 Added button to motion detail view to follow recommendation. Closed #2700. 2016-12-02 14:57:45 +01:00
Norman Jäckel
4d288ec9b2 Merge pull request #2724 from emanuelschuetze/posts
Rename 'posts' to 'persons' in assigment templates.
2016-12-02 14:47:11 +01:00
Norman Jäckel
926d04f610 Merge pull request #2723 from FinnStutzenstein/Clock
Fixing the clock
2016-12-02 14:46:43 +01:00
Emanuel Schütze
65337ae2d2 Rename 'posts' to 'persons' in assigment templates. 2016-12-02 14:41:34 +01:00
Norman Jäckel
dc0559ef38 Merge pull request #2722 from FinnStutzenstein/Issue2126
Show countdown above messageoverlay (closes #2126)
2016-12-02 14:26:15 +01:00
Norman Jäckel
1ca0b7f291 Merge pull request #2719 from FinnStutzenstein/Issue2693
Translate legal notice
2016-12-02 14:25:51 +01:00
FinnStutzenstein
7e18061e53 Fixing the clock 2016-12-02 14:17:37 +01:00
FinnStutzenstein
cc8cf1ef7a Show countdown above messageoverlay (closes #2126) 2016-12-02 12:31:10 +01:00
Emanuel Schütze
7fa5d3b9bb Merge pull request #2713 from normanjaeckel/SettingsForClient
Added settings for client to basic JavaScript code on client startup.…
2016-12-02 10:38:18 +01:00
Emanuel Schütze
a1e33b99d4 Merge pull request #2718 from normanjaeckel/ApplyMotionText
Changed config to apply motion text for new amendmend. Closed #2714.
2016-12-02 08:51:46 +01:00
FinnStutzenstein
0f89205038 Translate legal notice 2016-12-02 08:10:06 +01:00
Norman Jäckel
81a01156c1 Changed config to apply motion text for new amendmend. Closed #2714. 2016-12-02 00:12:37 +01:00
Emanuel Schütze
52b9c651bb Fixed motion pdf layout
for voting result and summary change recommendations
2016-12-01 22:56:42 +01:00
Norman Jäckel
526a5478f7 Added settings for client to basic JavaScript code on client startup. Closed #2697. 2016-12-01 15:21:11 +01:00
Norman Jäckel
cdc37b4dd5 Merge pull request #2703 from normanjaeckel/LeadingZero
Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696.
2016-12-01 14:46:15 +01:00
Norman Jäckel
59599bfba0 Merge pull request #2712 from emanuelschuetze/fixes
Minor fixes (Fixes #2710)
2016-12-01 14:42:56 +01:00
Norman Jäckel
ad651300d9 Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696. 2016-12-01 14:41:12 +01:00
Norman Jäckel
639978a5dc Refactor motion ans assignment percent and majority calculation. 2016-12-01 14:35:35 +01:00
Maximilian Krambach
32aaaf5b9e Majority calculation for assignments.
Majorities when config YN(A) and simple voting method.
2016-12-01 14:35:35 +01:00
Emanuel Schütze
670251fba9 Minor fixes (Fixes #2710)
- motion form: show supporters field
- motion block slide: show motion identifiers in columns
- item list: show open link for motion blocks
- use right pdfmake-dist name in bower.json
2016-12-01 14:29:31 +01:00
Emanuel Schütze
9440842e6a Merge pull request #2708 from emanuelschuetze/issue2626
Improved wording for recommendation config (Fixes #2626)
2016-12-01 11:29:29 +01:00
Emanuel Schütze
80f4cf8f2d Improved wording for recommendation config (Fixes #2626)
- updated config label and helptext
- added recommendation also to motion slide
2016-12-01 11:05:11 +01:00
Emanuel Schütze
9dd44edb9e Merge pull request #2698 from FinnStutzenstein/Issue2531
Translate default projector (closes #2531)
2016-12-01 11:02:02 +01:00
Norman Jäckel
510d60ef0f Merge pull request #2702 from tsiegleauq/assignmentImprove2559
improves the assignments (fixes #2559)
2016-12-01 10:25:57 +01:00
Norman Jäckel
de00e35064 Merge pull request #2704 from tsiegleauq/motionDiffBox
Adds the diff-summary box for motions
2016-12-01 10:25:05 +01:00
Norman Jäckel
6aa3ea0d63 Merge pull request #2627 from CatoTH/change-recommendations-inline-diff
Showing Diff inline
2016-12-01 10:24:18 +01:00
FinnStutzenstein
b0c94888ce Translate default projector (closes #2531) 2016-12-01 07:48:26 +01:00
Emanuel Schütze
bc312efbb9 Fix JS error after project pdf file. 2016-11-30 22:26:11 +01:00
Emanuel Schütze
5ab8b3172b Merge pull request #2699 from normanjaeckel/TrivialChange
Fixed trivial change (disable versioning) checkboxes.
2016-11-30 21:39:50 +01:00
Emanuel Schütze
c466af760c Motion PDF: Fix line numbers and style in summary box. 2016-11-30 21:13:12 +01:00
Emanuel Schütze
17c464bafa Merge pull request #2688 from FinnStutzenstein/AssignmentsTable
New assignment and mediafile tables and table generics
2016-11-30 14:29:13 +01:00
Sean Engelhardt
8f0c419c3e Adds the diff-summary box for motions 2016-11-30 14:29:09 +01:00
Sean Engelhardt
2bb440b2aa improves the assignments (fixes #2559) 2016-11-30 10:57:51 +01:00
Norman Jäckel
e601ee8e24 Fixed trivial change (disable versioning) checkboxes. 2016-11-29 16:39:54 +01:00
FinnStutzenstein
4f717b6610 New assignment and mediafile tables and table generics 2016-11-29 16:29:29 +01:00
Norman Jäckel
0605395da2 Merge pull request #2687 from FinnStutzenstein/Issue2341
Use plugin verbose name in permission matrix (fixes #2341)
2016-11-29 12:52:30 +01:00
FinnStutzenstein
0446855920 Use pugin verbose name in permission matrix (fixes #2341) 2016-11-29 11:17:50 +01:00
Emanuel Schütze
5312d44235 Merge pull request #2651 from CatoTH/editing-change-recommendations
Editing change recommendations
2016-11-28 21:31:22 +01:00
Emanuel Schütze
b11463fc60 Merge pull request #2690 from CatoTH/bugfix-incorrectly-merging-words
Bugfix for merging change recommendations
2016-11-28 21:28:38 +01:00
Emanuel Schütze
a30085f756 Merge pull request #2632 from CatoTH/explicitly-enter-change-recommendation-type
Allow to explicitly set the type of a change recommendation
2016-11-28 20:57:21 +01:00
Emanuel Schütze
ddfafd327b Merge pull request #2655 from CatoTH/Issue2615-line-selection-improvements
A small tooltip after selecting the first line when creating a change recommendation
2016-11-28 20:45:07 +01:00
Emanuel Schütze
b971c8db54 Merge pull request #2691 from emanuelschuetze/dialog-improvements
Improved forms in ng-dialogs.
2016-11-28 20:41:20 +01:00
Norman Jäckel
7e45e8a9a5 Merge pull request #2689 from FinnStutzenstein/lineNumberFix
Missing changes from PR 2678
2016-11-28 20:37:05 +01:00