ff444eaa5d
Merge pull request #2795 from CatoTH/Issue2777-pdf-problems
...
Bugfix for PDF-export - fixes #2777
2016-12-19 19:46:44 +01:00
159720b983
Bugfix for PDF-export - fixes #2777
2016-12-19 16:17:36 +01:00
3b1ab265eb
Sort candidates in assignments
2016-12-19 16:03:45 +01:00
447fd35f53
Merge pull request #2798 from FinnStutzenstein/Issue2654
...
Cookie handling on login
2016-12-19 15:52:41 +01:00
a24b4aed99
cookie handling on login
2016-12-19 14:14:46 +01:00
8e4bf47169
Merge pull request #2791 from normanjaeckel/Release2.1b1
...
Release2.1b1
2016-12-17 00:12:13 +01:00
655a1b8f71
Update version to 2.1b2-dev
2016-12-16 23:54:23 +01:00
789a3c308b
Release 2.1b1
2016-12-16 23:54:23 +01:00
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
de6676f74f
Fix JS error by using pdfmake.js instead of pdfmake.min.js.
2016-12-16 23:47:53 +01:00
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
709e2ada4b
Merge pull request #2790 from emanuelschuetze/changelog-update
...
Updated CHANGELOG for 2.1b1.
2016-12-16 23:05:26 +01:00
6002c3806a
Use twisted<16.4 for easier install (without compiling).
...
see also #2398
2016-12-16 23:03:45 +01:00
5b02c03266
Updated CHANGELOG for 2.1b1.
2016-12-16 22:51:15 +01:00
f74cba98e1
Merge pull request #2789 from normanjaeckel/Metadata
...
Updated deps.
2016-12-16 22:42:42 +01:00
87e386afc4
Updated deps.
2016-12-16 22:24:59 +01:00
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
01ab52a637
Use Roboto Medium font for some more 'bold' classes.
2016-12-16 22:10:56 +01:00
27c93690c0
Merge pull request #2720 from matakuka/ckeditor
...
Going back from tinymce to ckeditor
2016-12-16 22:08:52 +01:00
82396a784d
Fixing some remarks for CKEditor PR#2770
2016-12-16 21:43:19 +01:00
08cb6a3d1b
Bugfix for line numbering with CKeditor
2016-12-16 21:43:19 +01:00
58b8066249
Going back from TinyMCE to CKEditor
...
- Update CKEditor toolbar
- CKEditor: new formating options and stripping empty paragraphs from imports
- fix for other clipboard html cases not beginning with 'p' tag
- Added RemoveFormat button to ckditor toolbar.
- Reorder bower.json
- inline editor and working on line numbers and language setting
- line numbering in inline edit
- changed allowed content, line number display, editor toggling
- included "justify" in ckeditor
- reload original text after ckeditor is disabled
- Reorder and extend ckeditor toolbar.
- fixed save button trigger and inserted a revert button
- set language on editor load (works for inline case only)
2016-12-16 21:43:19 +01:00
4ebb8023e3
Merge pull request #2776 from CatoTH/Issue2770-pdfmake-bugfix
...
Bugfix for #2770
2016-12-16 20:32:54 +01:00
abe6c0f589
Merge pull request #2786 from normanjaeckel/PatchInMediafile
...
Changed PATCH to PUT for mediafile update. See #1871 .
2016-12-16 19:15:25 +01:00
cd89f72a17
Merge pull request #2778 from emanuelschuetze/inject-improvement
...
Speed up autoupdates
2016-12-16 19:12:45 +01:00
4a4f5622f4
Merge pull request #2785 from normanjaeckel/RemoveDjangoUrlPatternsView
...
Removed viewpoint for Django url patterns. Fixed #1453 .
2016-12-16 19:12:25 +01:00
4b9be816b3
Speed up autoupdates
...
Use 'bulk mode' for DS.inject by calling inject
only once per each collection.
2016-12-16 18:55:24 +01:00
75f4c55181
Removed viewpoint for Django url patterns. Fixed #1453 .
2016-12-16 17:01:34 +01:00
11e39e4ed8
Changed PATCH to PUT for mediafile update. See #1871 .
2016-12-16 16:58:31 +01:00
3fa42f0661
Merge pull request #2781 from emanuelschuetze/pdfmake-speedup
...
Update pdfmake to speeed up pdf generation.
2016-12-16 12:19:36 +01:00
b7ed2f4ff0
Update pdfmake to speeed up pdf generation.
2016-12-16 09:38:52 +01:00
c9d36db1aa
Merge pull request #2611 from normanjaeckel/MediafileRework
...
Rearrange JavaScript files for mediafile app.
2016-12-15 16:26:17 +01:00
46cf26481e
Bugfix for #2770
2016-12-14 22:28:44 +01:00
1221ef4f02
Rearrange client mediafile app.
2016-12-14 17:16:42 +01:00
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
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
1e23999925
Merge pull request #2772 from emanuelschuetze/gulp
...
Readded woff2 to gulp's font filter.
2016-12-14 16:36:44 +01:00
0e6324b252
Change the language selector to the languages' own names
2016-12-14 15:25:38 +01:00
41ceb4ef9d
add special voting values for missed options ( fixes #2709 )
2016-12-14 14:05:03 +01:00
e38203d751
Readded woff2 to gulp's font filter.
...
Chrome and Firefox loads woff2 of fontawesome.
2016-12-14 12:32:02 +01:00
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
5e3b52661e
return to original pdfmake ( fixes #2769 )
2016-12-14 11:50:15 +01:00
cebfbf5b8d
Merge pull request #2633 from normanjaeckel/SquishMigrations
...
Prepare migrations for 2.1b1.
2016-12-13 23:28:56 +01:00
218b4bc7f4
Remove old countdowns and messages in core migrations.
2016-12-13 17:04:25 +01:00
ac00278f0f
Merge pull request #2767 from emanuelschuetze/new-translations
...
Updated EN+DE translations.
2016-12-13 13:13:42 +01:00
78361308aa
Updated EN+DE translations.
2016-12-13 12:20:14 +01:00
3096958ba9
Prepare migrations for 2.1b1.
...
Agenda, Assignments, Core, Mediafiles, Motions, Users.
Topics are already done.
2016-12-13 11:58:36 +01:00
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
dbdaa9748c
More motion select mode options and layout changes for guests
2016-12-13 11:27:44 +01:00
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