FinnStutzenstein
|
f37ad0f6c3
|
Use ckeditor to edit projector messages
|
2017-01-06 12:45:30 +01:00 |
|
Emanuel Schütze
|
01f3cf903a
|
Updated license to 2017
|
2017-01-06 12:06:27 +01:00 |
|
Emanuel Schütze
|
f146e11354
|
Merge pull request #2808 from matakuka/ballot_count
print correct number of ballots (closes #2504)
|
2017-01-06 11:56:29 +01:00 |
|
Maximilian Krambach
|
a31ffd1009
|
print correct number of ballots (closes #2504)
|
2017-01-06 11:39:55 +01:00 |
|
Emanuel Schütze
|
f865ba91b5
|
Merge pull request #2815 from emanuelschuetze/missing-ckeditor-plugins
Install missing plugins for ckeditor.
|
2017-01-06 11:36:29 +01:00 |
|
Emanuel Schütze
|
cc0c0bf0d4
|
Merge pull request #2783 from FinnStutzenstein/PapaParse
New csv import using PapaParse
|
2017-01-06 11:33:06 +01:00 |
|
Emanuel Schütze
|
df4aeb4518
|
Install missing plugins for ckeditor.
|
2017-01-06 11:08:32 +01:00 |
|
Norman Jäckel
|
c12d985ab6
|
Merge pull request #2810 from tsiegleauq/issue2665-qr-code-pdf
Add QR code in user access list pdf (fixes #2665)
|
2017-01-06 11:08:22 +01:00 |
|
Norman Jäckel
|
85298554a3
|
Merge pull request #2807 from matakuka/mediafile_project_2706
Bind mediafile to projector scope (fixes #2706)
|
2017-01-06 11:05:33 +01:00 |
|
FinnStutzenstein
|
f5fa3575df
|
New csv import using PapaParse
|
2017-01-06 10:50:03 +01:00 |
|
Emanuel Schütze
|
388e6353cc
|
Show qr codes in access data pdf only if config fields are set.
Disable footer with page numbers.
|
2017-01-04 22:43:17 +01:00 |
|
Sean Engelhardt
|
9abf9d5d57
|
Add QR codes to access data list (fixes #2665)
|
2017-01-04 15:50:20 +01:00 |
|
Emanuel Schütze
|
85c70b27f5
|
Merge pull request #2809 from tsiegleauq/pdfmake-0.1.23
use pdfmake release 0.1.23
|
2017-01-04 15:38:21 +01:00 |
|
Sean Engelhardt
|
c16a533da7
|
use pdfmake release 0.1.23
|
2017-01-04 12:01:29 +01:00 |
|
Maximilian Krambach
|
912dc1af8f
|
Bind mediafile to projector scope (fixes #2706)
|
2016-12-29 11:37:56 +01:00 |
|
Norman Jäckel
|
5fe902afed
|
Merge pull request #2806 from fwolfst/README-IMPROVEMENTS
Minor README improvements / typo fixes.
|
2016-12-27 13:04:21 +01:00 |
|
Felix Wolfsteller
|
41a9424966
|
Minor README improvements / typo fixes.
|
2016-12-27 11:18:23 +01:00 |
|
Norman Jäckel
|
900ddaabb3
|
Merge pull request #2803 from emanuelschuetze/participant-number2
Added "No." for participant number in get_full_name().
|
2016-12-21 12:33:12 +01:00 |
|
Emanuel Schütze
|
c79e779934
|
Added "No." for participant number in get_full_name().
|
2016-12-21 12:08:37 +01:00 |
|
Norman Jäckel
|
7b0dca84d2
|
Merge pull request #2801 from FinnStutzenstein/Issue2754
More select mode options for users
|
2016-12-21 11:57:20 +01:00 |
|
Norman Jäckel
|
286643ddd2
|
Merge pull request #2797 from FinnStutzenstein/Issue2653
projector language (closes #2653)
|
2016-12-21 11:55:49 +01:00 |
|
Norman Jäckel
|
bfa0b4b3fe
|
Merge pull request #2800 from FinnStutzenstein/Issue2748
Consistent time handling and generic time converter code
|
2016-12-21 11:52:47 +01:00 |
|
FinnStutzenstein
|
365c122edd
|
More select mode options for users
|
2016-12-21 10:42:34 +01:00 |
|
FinnStutzenstein
|
f9f64b3e31
|
projector language (closes #2653)
|
2016-12-21 10:41:06 +01:00 |
|
Norman Jäckel
|
7d64ad98a4
|
Merge pull request #2802 from emanuelschuetze/participant-number
Move participant number to the end of get_full_name().
|
2016-12-21 10:33:45 +01:00 |
|
FinnStutzenstein
|
6454853bf6
|
Consistent time handling and generic time converter code
|
2016-12-21 10:09:27 +01:00 |
|
Emanuel Schütze
|
be66a26353
|
Move participant number to the end of get_full_name().
|
2016-12-21 08:59:50 +01:00 |
|
Emanuel Schütze
|
c6fb710fb9
|
Merge pull request #2799 from normanjaeckel/ChangeChangelog
Updated CHANGELOG.
|
2016-12-20 08:48:42 +01:00 |
|
Norman Jäckel
|
3abb6aaaa0
|
Updated CHANGELOG.
|
2016-12-19 23:35:00 +01:00 |
|
Emanuel Schütze
|
16ff9200a9
|
Merge pull request #2782 from FinnStutzenstein/AssignmentSort
Sort candidates in assignments
|
2016-12-19 19:47:38 +01:00 |
|
Emanuel Schütze
|
ff444eaa5d
|
Merge pull request #2795 from CatoTH/Issue2777-pdf-problems
Bugfix for PDF-export - fixes #2777
|
2016-12-19 19:46:44 +01:00 |
|
Tobias Hößl
|
159720b983
|
Bugfix for PDF-export - fixes #2777
|
2016-12-19 16:17:36 +01:00 |
|
FinnStutzenstein
|
3b1ab265eb
|
Sort candidates in assignments
|
2016-12-19 16:03:45 +01:00 |
|
Norman Jäckel
|
447fd35f53
|
Merge pull request #2798 from FinnStutzenstein/Issue2654
Cookie handling on login
|
2016-12-19 15:52:41 +01:00 |
|
FinnStutzenstein
|
a24b4aed99
|
cookie handling on login
|
2016-12-19 14:14:46 +01:00 |
|
Norman Jäckel
|
8e4bf47169
|
Merge pull request #2791 from normanjaeckel/Release2.1b1
Release2.1b1
|
2016-12-17 00:12:13 +01:00 |
|
Norman Jäckel
|
655a1b8f71
|
Update version to 2.1b2-dev
|
2016-12-16 23:54:23 +01:00 |
|
Norman Jäckel
|
789a3c308b
|
Release 2.1b1
|
2016-12-16 23:54:23 +01:00 |
|
Norman Jäckel
|
2d34fda1e5
|
Merge pull request #2793 from emanuelschuetze/pdfmake.min
Fix JS error by using pdfmake.js instead of pdfmake.min.js.
|
2016-12-16 23:54:03 +01:00 |
|
Emanuel Schütze
|
de6676f74f
|
Fix JS error by using pdfmake.js instead of pdfmake.min.js.
|
2016-12-16 23:47:53 +01:00 |
|
Norman Jäckel
|
b871742584
|
Merge pull request #2792 from emanuelschuetze/twisted
Use twisted<16.4 for easier install (without compiling).
|
2016-12-16 23:09:53 +01:00 |
|
Norman Jäckel
|
709e2ada4b
|
Merge pull request #2790 from emanuelschuetze/changelog-update
Updated CHANGELOG for 2.1b1.
|
2016-12-16 23:05:26 +01:00 |
|
Emanuel Schütze
|
6002c3806a
|
Use twisted<16.4 for easier install (without compiling).
see also #2398
|
2016-12-16 23:03:45 +01:00 |
|
Emanuel Schütze
|
5b02c03266
|
Updated CHANGELOG for 2.1b1.
|
2016-12-16 22:51:15 +01:00 |
|
Norman Jäckel
|
f74cba98e1
|
Merge pull request #2789 from normanjaeckel/Metadata
Updated deps.
|
2016-12-16 22:42:42 +01:00 |
|
Norman Jäckel
|
87e386afc4
|
Updated deps.
|
2016-12-16 22:24:59 +01:00 |
|
Norman Jäckel
|
affc6997f4
|
Merge pull request #2788 from emanuelschuetze/font-fixes
Use Roboto Medium font for some more 'bold' classes.
|
2016-12-16 22:17:00 +01:00 |
|
Emanuel Schütze
|
01ab52a637
|
Use Roboto Medium font for some more 'bold' classes.
|
2016-12-16 22:10:56 +01:00 |
|
Norman Jäckel
|
27c93690c0
|
Merge pull request #2720 from matakuka/ckeditor
Going back from tinymce to ckeditor
|
2016-12-16 22:08:52 +01:00 |
|
Emanuel Schütze
|
82396a784d
|
Fixing some remarks for CKEditor PR#2770
|
2016-12-16 21:43:19 +01:00 |
|