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

4132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
82b68f4387 Merge pull request #2773 from tsiegleauq/issue2709-special-values-election-pdf 
add special voting values for missed options (fixes #2709)
 2016-12-14 16:37:19 +01:00
Norman Jäckel
1e23999925 Merge pull request #2772 from emanuelschuetze/gulp 
Readded woff2 to gulp's font filter.
 2016-12-14 16:36:44 +01:00
Sean Engelhardt
41ceb4ef9d add special voting values for missed options (fixes #2709) 2016-12-14 14:05:03 +01:00
Emanuel Schütze
e38203d751 Readded woff2 to gulp's font filter. 
Chrome and Firefox loads woff2 of fontawesome.
 2016-12-14 12:32:02 +01:00
Emanuel Schütze
7cbc0d4bfe Merge pull request #2771 from tsiegleauq/issue2769-new-pdfmake-source 
return to original pdfmake (fixes #2769)
 2016-12-14 12:28:01 +01:00
Sean Engelhardt
5e3b52661e return to original pdfmake (fixes #2769) 2016-12-14 11:50:15 +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
ac00278f0f Merge pull request #2767 from emanuelschuetze/new-translations 
Updated EN+DE translations.
 2016-12-13 13:13:42 +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
Norman Jäckel
4aba663540 Merge pull request #2766 from emanuelschuetze/template-fixes 
Some template style and translation fixes.
 2016-12-13 11:09:04 +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
Norman Jäckel
3853797011 Merge pull request #2761 from emanuelschuetze/minorfixes 
Minor fixes (Fixes #2750)
 2016-12-12 13:08:28 +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
5cc820d6d2 Merge pull request #2759 from emanuelschuetze/de-translation 
Updated German translations.
 2016-12-11 13:48:15 +01:00
Emanuel Schütze
116c3702f2 Updated German translations. 
Added missing translation filter.
 2016-12-11 13:37:26 +01:00
Emanuel Schütze
8ca2a836f3 Merge pull request #2757 from emanuelschuetze/translations 
Updated EN translation file.
 2016-12-10 11:31:38 +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
12b21e2ebb Merge pull request #2756 from normanjaeckel/UpdateTravis 
Updated .travis file.
 2016-12-09 22:20:56 +01:00
Norman Jäckel
bb3bc0b8ae Updated .travis file. 2016-12-09 18:38:40 +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
Norman Jäckel
bec91b87f0 Merge pull request #2753 from FinnStutzenstein/NoUnderline 
no nav underline glitch
 2016-12-09 14:32:25 +01:00
FinnStutzenstein
36c8477c7f no nav underline glitch 2016-12-09 13:51:23 +01:00
Emanuel Schütze
fe0801c671 Merge pull request #2738 from FinnStutzenstein/Issue2728 
Moving csv exports in seperate files (closes #2728)
 2016-12-09 10:49:29 +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
Norman Jäckel
264f342076 Merge pull request #2745 from emanuelschuetze/assignment-slide 
Remove sidebox from assignment slide
 2016-12-07 21:14:21 +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
Norman Jäckel
77fdfd558f Merge pull request #2743 from emanuelschuetze/issue2564 
Rename first/last name to given name/surname (Fixes #2564).
 2016-12-07 20:26:06 +01:00
Emanuel Schütze
8bd03bafdb Rename first/last name to given name/surname (Fixes #2564). 2016-12-07 19:49:25 +01:00