Commit Graph

5046 Commits

Author SHA1 Message Date
FinnStutzenstein
2d35b9e371 Projectorsize selection with slider 2017-06-28 09:23:40 +02:00
Emanuel Schütze
b1d98ca33a Merge pull request #3308 from FinnStutzenstein/agenda-project
call the own project method from a content object of an agenda item
2017-06-27 12:53:02 +02:00
Norman Jäckel
029366de5f Merge pull request #3301 from FinnStutzenstein/related-projected
Highlight objects in list view, if related objects are projected
2017-06-21 22:56:15 +02:00
Norman Jäckel
e72af0101c Merge pull request #3309 from FinnStutzenstein/Issue3307
fix not supported 'startsWith' function in IE11 (fixes #3307)
2017-06-21 21:45:15 +02:00
Norman Jäckel
79b48e7054 Merge pull request #3305 from FinnStutzenstein/projector-is-stuck
fix projector reconnecting if websocket is closed
2017-06-21 21:44:49 +02:00
FinnStutzenstein
f42b6f0d37 fix not supported 'startsWith' function in IE11 (fixes #3307) 2017-06-21 15:28:43 +02:00
FinnStutzenstein
ef60f5ea44 call the own project method from a content object of an agenda item 2017-06-21 15:09:38 +02:00
FinnStutzenstein
0a1ea46b8d fix projector reconnecting if websocket is closed 2017-06-21 13:18:06 +02:00
FinnStutzenstein
2536b35c0e Highlight objects in list view, if related objects are projected 2017-06-21 07:52:10 +02:00
Emanuel Schütze
573fc4da57 Merge pull request #3267 from normanjaeckel/NewPersonalNote
Rework on personal notes.
2017-06-16 12:38:40 +02:00
Emanuel Schütze
72aaac169e Merge pull request #3300 from emanuelschuetze/translations
Updated js pot file and German translations.
2017-06-16 12:38:20 +02:00
Emanuel Schütze
45a2e3bbc4 Updated js pot file and German translations. 2017-06-16 12:24:11 +02:00
Emanuel Schütze
bef986630e Merge pull request #3297 from FinnStutzenstein/Issue3295
improved reconnect handling if the server was flushed (fixed #3295)
2017-06-16 07:56:30 +02:00
Emanuel Schütze
a3a401ec80 Merge pull request #3299 from FinnStutzenstein/improvements
Some small changes and bugfixes
2017-06-16 07:51:57 +02:00
FinnStutzenstein
4387a56fb1 Improved reconnect handling if the server was flushed (fixed #3295).
just ping with whoami request
2017-06-16 07:47:17 +02:00
FinnStutzenstein
2e898275cb Some small changes and bugfixes 2017-06-15 14:25:55 +02:00
Emanuel Schütze
4810177b37 Merge pull request #3296 from normanjaeckel/FixCollectionRemoveHotfix
Fixed get_projector_data impementation. Closed #3282.
2017-06-15 12:25:15 +02:00
Norman Jäckel
eaebeb8f06 Fixed get_projector_data impementation. Closed #3282. 2017-06-13 22:21:56 +02:00
FinnStutzenstein
c80b0abc82 Personal note: client rework 2017-06-13 20:58:17 +02:00
Norman Jäckel
91d365e386 Rework on personal notes. Fixed #3262. 2017-06-13 20:58:17 +02:00
Norman Jäckel
7947f2ed34 Merge pull request #3293 from ostcar/no_anonymous_no_cry
Block anonymous from websocket, if they are deactivated
2017-06-13 11:34:02 +02:00
Norman Jäckel
260cd5cd16 Merge pull request #3290 from FinnStutzenstein/Issue1533-neu
Massimport for users
2017-06-12 22:07:32 +02:00
Norman Jäckel
d1c86e8b0d Merge pull request #3291 from FinnStutzenstein/userImportFix
Fix import on not full populated csv files
2017-06-12 22:04:56 +02:00
Oskar Hahn
8920ffac66 Block anonymous from websocket, if they are deactivated 2017-06-10 09:25:27 +02:00
FinnStutzenstein
8cb6342e73 Fix import on not full populated csv files 2017-06-09 14:57:06 +02:00
FinnStutzenstein
433cdc42fa Massimport for users 2017-06-08 14:40:29 +02:00
Emanuel Schütze
fb56215a26 Merge pull request #3233 from normanjaeckel/FixFreeUserAgenda
Fixes autoupdate bug for a user without user.can_see_name permission …
2017-06-07 21:00:12 +02:00
Norman Jäckel
ea50971ae6 Fixes autoupdate bug for a user without user.can_see_name permission. 2017-06-07 20:55:00 +02:00
Emanuel Schütze
5a945c3a71 Merge pull request #3287 from CatoTH/diff-bugfix
Fix a bug where a single moved word was not highlighted in the diff
2017-06-07 20:15:48 +02:00
Emanuel Schütze
3f1aa959b5 Merge pull request #3286 from FinnStutzenstein/PdfFix
Fixes some PDF issues
2017-06-07 12:08:19 +02:00
FinnStutzenstein
9448beb903 Fixes some PDF issues 2017-06-07 07:55:49 +02:00
Tobias Hößl
029ca0b8e3 Fix a bug where a single moved word was not highlighted in the diff 2017-06-06 19:28:52 +02:00
Emanuel Schütze
c5be76ace2 Merge pull request #3285 from emanuelschuetze/pdfmake
Updated to pdfmake 0.1.30.
2017-06-02 07:41:35 +02:00
Emanuel Schütze
58cb34c0c4 Updated to pdfmake 0.1.30. 2017-06-02 07:33:40 +02:00
Emanuel Schütze
074559ba23 Merge pull request #3279 from FinnStutzenstein/Issue3273
Fixing linenumbers on page break (fixes #3273)
2017-06-01 15:31:36 +02:00
Emanuel Schütze
53d50242b6 Merge pull request #3274 from FinnStutzenstein/Issue3259
Do not reload all projector elements on every autoupdate (fixes #3259).
2017-06-01 15:24:02 +02:00
FinnStutzenstein
a83cd5b947 Fixing linenumbers on page break (fixes #3273) 2017-06-01 15:22:52 +02:00
Emanuel Schütze
59a21c6cbc Merge pull request #3283 from emanuelschuetze/issue3282
Hotfix for issue #3282.
2017-06-01 15:20:53 +02:00
Emanuel Schütze
c361bb5a02 Merge pull request #3278 from emanuelschuetze/pdfmake
Updated pdfmake to 0.1.29
2017-06-01 15:20:08 +02:00
FinnStutzenstein
678a56db08 Do not reload all projector elements on every autoupdate (fixes #3259). 2017-06-01 15:01:24 +02:00
Emanuel Schütze
2994f7713b Hotfix for issue #3282.
(projector autoupdate problem by deleting projected object)
2017-06-01 14:57:33 +02:00
Emanuel Schütze
5e8a508890 Updated pdfmake to 0.1.29
Improved performance to pdf generation significantly!
2017-06-01 14:57:12 +02:00
Emanuel Schütze
5771eab820 Merge pull request #3284 from emanuelschuetze/isort
Set isort to 4.2.5 in requirements.txt (see #3281).
2017-06-01 14:56:46 +02:00
Emanuel Schütze
c5db2fa4e7 Set isort to 4.2.5 in requirements.txt (see #3281). 2017-06-01 14:51:00 +02:00
Norman Jäckel
400273dfa6 Merge pull request #3277 from emanuelschuetze/empty-span
Removed empty <span> tags in ckeditor.
2017-05-31 22:10:12 +02:00
Norman Jäckel
364c3e59a9 Merge pull request #3276 from CatoTH/Yarn-Test-Runner-Shortcut
Add a easier command to run the karma-tests
2017-05-31 22:09:46 +02:00
Emanuel Schütze
b48c850e79 Removed empty <span> tags in ckeditor. 2017-05-31 21:35:32 +02:00
Tobias Hößl
769f9af4bd Add a easier command to run the karma-tests 2017-05-31 20:17:58 +02:00
Norman Jäckel
d20945bcb6 Merge pull request #3272 from FinnStutzenstein/tracker14
Fixed missing styles of headings in motion pdf.
2017-05-31 10:08:02 +02:00
FinnStutzenstein
8cd22daff3 Fixed missing styles of headings in motion pdf.
Also some refactoring/clean up of pdf code.
2017-05-29 13:03:12 +02:00