Emanuel Schütze
|
3c747c01e2
|
Merge pull request #3331 from FinnStutzenstein/no-special-comments-in-export
Hide special comments in export
|
2017-07-27 14:36:04 +02:00 |
|
FinnStutzenstein
|
2e2d28288a
|
Hide special comments in export
|
2017-07-27 12:44:13 +02:00 |
|
FinnStutzenstein
|
c65976715e
|
configvalue for sequential number
|
2017-07-27 11:15:12 +02:00 |
|
FinnStutzenstein
|
1f59336e3e
|
Configvalue for pagenumber alignment in PDF
|
2017-07-27 10:55:40 +02:00 |
|
Emanuel Schütze
|
41ab706939
|
Merge pull request #3323 from FinnStutzenstein/hide-error-on-load
Delay the projector not loaded error.
|
2017-07-27 10:51:18 +02:00 |
|
Norman Jäckel
|
f806dc4017
|
Merge pull request #3329 from FinnStutzenstein/category-sort-in-export
Add the option to sort the categories different in the motion export
|
2017-07-27 10:41:02 +02:00 |
|
FinnStutzenstein
|
8560509ace
|
Delay the projector not loaded error.
|
2017-07-27 10:06:11 +02:00 |
|
FinnStutzenstein
|
a32b046fa5
|
Add the option to sort categories different in motion export.
|
2017-07-27 09:50:03 +02:00 |
|
FinnStutzenstein
|
6c5cc799ca
|
Fixing mediafiles list view for medifiles without a type
|
2017-07-26 15:46:14 +02:00 |
|
Emanuel Schütze
|
5644e99b43
|
Merge pull request #3319 from FinnStutzenstein/docx-text-missing
fixing docx parser missing text
|
2017-07-26 15:03:27 +02:00 |
|
Emanuel Schütze
|
a44b84e836
|
Merge pull request #3318 from normanjaeckel/CategorySortError
Fixed error on category numbering. Fixed #3315.
|
2017-07-26 14:41:27 +02:00 |
|
FinnStutzenstein
|
9c0a10df63
|
fixing wrong entered comments
|
2017-07-20 14:43:58 +02:00 |
|
FinnStutzenstein
|
615327f64d
|
fixing docx parser missing text
|
2017-07-19 13:08:31 +02:00 |
|
Norman Jäckel
|
41a70f40df
|
Fixed error on category numbering. Fixed #3315.
|
2017-07-05 22:13:54 +02:00 |
|
Norman Jäckel
|
77a321894b
|
Merge pull request #3306 from FinnStutzenstein/Issue2862
Remove OPTION request to query permissions (fixes #2862)
|
2017-07-05 21:26:08 +02:00 |
|
Emanuel Schütze
|
3006cb388f
|
Merge pull request #3304 from CatoTH/Issue3298-PreventCollidingChangeRecommendations
Prevent colliding change recommendations - fixes #3298
|
2017-06-29 18:18:36 +02:00 |
|
Tobias Hößl
|
65d5bbccd6
|
Prevent colliding change recommendations - fixes #3298
|
2017-06-29 18:03:58 +02:00 |
|
FinnStutzenstein
|
90af3e6d1d
|
remove OPTION request to query permissions (fixes #2862)
|
2017-06-29 13:25:52 +02:00 |
|
FinnStutzenstein
|
37eec7d99b
|
Minor Bugfixes (fixes #3312, fixes #3313)
|
2017-06-29 08:59:41 +02:00 |
|
Emanuel Schütze
|
574d815397
|
Merge pull request #3311 from FinnStutzenstein/projector-size
Projectorsize selection with slider
|
2017-06-28 12:43:42 +02:00 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
b48c850e79
|
Removed empty <span> tags in ckeditor.
|
2017-05-31 21:35:32 +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 |
|
Emanuel Schütze
|
1b6dd93e6e
|
Merge pull request #3268 from emanuelschuetze/pdf-issue
Fixed formatting errors in motion pdf (Fixed #3228).
|
2017-05-23 22:52:31 +02:00 |
|
Emanuel Schütze
|
eee0e0fc06
|
Fixed formatting errors in motion pdf (Fixed #3228).
for diff view
|
2017-05-23 22:42:14 +02:00 |
|
Emanuel Schütze
|
b9a115d3b8
|
Merge pull request #3266 from normanjaeckel/RenameFunction
Renamed is_user_data_required to required_users. Fixed #3238.
|
2017-05-23 22:31:28 +02:00 |
|
Norman Jäckel
|
913bec3e53
|
Renamed is_user_data_required to required_users. Fixed #3238.
|
2017-05-22 16:08:52 +02:00 |
|
Norman Jäckel
|
f4c30da4a2
|
Removed old poll code snippets. Fixed #3179.
|
2017-05-22 15:51:55 +02:00 |
|
Emanuel Schütze
|
32610e552c
|
Changed PdfImageConverter to ImageConverter (Fixed #3263).
|
2017-05-21 22:20:57 +02:00 |
|
FinnStutzenstein
|
e7da35398d
|
Export personal note and comments in PDFs.
|
2017-05-19 14:31:58 +02:00 |
|
Emanuel Schütze
|
8abfe91853
|
Merge pull request #3258 from FinnStutzenstein/docx
Rework docx parser, add comments to docx
|
2017-05-19 14:02:29 +02:00 |
|
FinnStutzenstein
|
f4c4f2553b
|
Rework docx parser, add comments to docx
|
2017-05-19 13:55:09 +02:00 |
|
FinnStutzenstein
|
e396347e00
|
Also notify users when they inline edit a motion (fixes #2360)
|
2017-05-19 13:21:19 +02:00 |
|
Emanuel Schütze
|
3b2c7634f0
|
Merge pull request #3256 from FinnStutzenstein/Issue3243
extending the color parser (fixes #3243)
|
2017-05-19 08:46:32 +02:00 |
|
Norman Jäckel
|
94aceeffab
|
Merge pull request #3237 from tsiegleauq/issue3180-scale-images
enables pdf image scaling for CKEditor
|
2017-05-18 21:34:06 +02:00 |
|
Tobias Hößl
|
7109c75246
|
Remove color styles insert .insert/.delete-Paragraphs - fixes #3247
|
2017-05-17 21:38:35 +02:00 |
|
FinnStutzenstein
|
a23e263dcb
|
extending the color parser (fixes #3243)
|
2017-05-17 09:13:10 +02:00 |
|
FinnStutzenstein
|
91882f1d13
|
Improve zip creation and fixing page numbers
|
2017-05-17 07:54:35 +02:00 |
|
Emanuel Schütze
|
6eec735c8e
|
Merge pull request #3252 from FinnStutzenstein/PdfZipFilenames
Fixing PDF filenames on zip export if no identifier is given
|
2017-05-16 20:58:28 +02:00 |
|
Emanuel Schütze
|
d5b9a5c590
|
Merge pull request #3244 from normanjaeckel/Fix3242
Removed default permissions for personal note. Updated Yarn lock. Fix…
|
2017-05-16 20:26:01 +02:00 |
|
Emanuel Schütze
|
c2a271c422
|
Merge pull request #3254 from emanuelschuetze/Issue3229-Broken-HTML
Detect broken HTML after diff (Fixed #3229)
|
2017-05-16 14:25:00 +02:00 |
|
Tobias Hößl
|
b340256541
|
Detect broken HTML after diff (Fixed #3229)
|
2017-05-16 12:19:18 +02:00 |
|
Emanuel Schütze
|
f46ad742e3
|
Merge pull request #3230 from FinnStutzenstein/Issue3219
Cleanup MotionUpdateCtrl (fixes #3219)
|
2017-05-15 14:17:55 +02:00 |
|
Emanuel Schütze
|
e0661e7343
|
Merge pull request #3248 from FinnStutzenstein/ExportDialogFilename
Fixing error when downloading
|
2017-05-15 13:45:07 +02:00 |
|
Emanuel Schütze
|
601e2ea2b5
|
Merge pull request #3249 from FinnStutzenstein/MediafilePdfPageFix
Fixing page controls in mediafiles list view
|
2017-05-15 13:41:50 +02:00 |
|
FinnStutzenstein
|
d1f0b69d35
|
Fixing PDF filenames on zip export if no identifier is given
|
2017-05-12 12:02:01 +02:00 |
|
FinnStutzenstein
|
8f070ffaa1
|
Fixing user list pdf
|
2017-05-11 12:47:01 +02:00 |
|
sean
|
eb259dc5e2
|
enables pdf image scaling for CKEditor
|
2017-05-10 13:50:52 +02:00 |
|
FinnStutzenstein
|
90c8ce5bf0
|
Fixing page controls in mediafiles list view
|
2017-05-10 09:26:31 +02:00 |
|
FinnStutzenstein
|
17d9615631
|
Fixing error when downloading
|
2017-05-10 09:04:19 +02:00 |
|
Norman Jäckel
|
754116cdca
|
Removed default permissions for personal note. Updated Yarn lock. Fixed #3242.
|
2017-05-09 13:49:56 +02:00 |
|
Norman Jäckel
|
2833341867
|
Merge pull request #3235 from tsiegleauq/issue3231-long-lines-in-lists
fix long lines in pdf list (fixes #3231)
|
2017-05-08 13:06:48 +02:00 |
|
Norman Jäckel
|
db1d087aa0
|
Merge pull request #3236 from CatoTH/Issue3226-WhitespacesDisturbingLineExtraction
Bugfix: whitespaces were disturbing line extraction - fixes #3226
|
2017-05-08 13:06:13 +02:00 |
|
sean
|
37b96bb0bc
|
fix long lines in pdf list (fixes #3231)
|
2017-05-07 22:01:50 +02:00 |
|
FinnStutzenstein
|
118cff6964
|
Fixing wrong err call
|
2017-05-05 17:25:34 +02:00 |
|
Norman Jäckel
|
ebabc291c5
|
Refactoring of data parsing for startup and autoupdate.
|
2017-05-03 08:58:29 +02:00 |
|
Oskar Hahn
|
4963bfa7bf
|
Changed restricted data parsing. Cached full data on startup.
|
2017-05-01 21:52:16 +02:00 |
|
Tobias Hößl
|
b0a569fdf3
|
Bugfix: whitespaces were disturbing line extraction
|
2017-05-01 15:55:51 +02:00 |
|
FinnStutzenstein
|
adb5185fcc
|
Cleanup MotionUpdateCtrl (fixes #3219)
|
2017-04-28 14:18:29 +02:00 |
|
FinnStutzenstein
|
239d56f350
|
Fixing PDF in IE11 (fixes #3206, fixes #3217)
|
2017-04-28 13:16:46 +02:00 |
|
Emanuel Schütze
|
c7c7bfca9c
|
Merge pull request #3222 from emanuelschuetze/translations
Updated German translations.
|
2017-04-27 15:38:10 +02:00 |
|
Emanuel Schütze
|
dd99be5e69
|
Merge pull request #3221 from normanjaeckel/ChangeKeyError
Fixed error for internal function get_model_from_collection_string.
|
2017-04-27 15:34:39 +02:00 |
|
Emanuel Schütze
|
a77a4edb75
|
Merge pull request #3220 from normanjaeckel/CleanUp
Removed unused lines.
|
2017-04-27 15:33:42 +02:00 |
|
Emanuel Schütze
|
0cc4b0c578
|
Updated German translations.
|
2017-04-27 15:26:35 +02:00 |
|
Norman Jäckel
|
4bdb06bd9b
|
Fixed error for internal function get_model_from_collection_string.
|
2017-04-27 15:16:07 +02:00 |
|
Norman Jäckel
|
9781c0b73b
|
Removed unused lines.
|
2017-04-27 15:09:42 +02:00 |
|
Emanuel Schütze
|
941ac8809e
|
Merge pull request #3208 from tsiegleauq/logos-in-pdf
add logos in PDF
|
2017-04-27 15:08:36 +02:00 |
|
Emanuel Schütze
|
9387f83f8a
|
Merge pull request #3212 from normanjaeckel/Notify
Added notify system.
|
2017-04-27 15:07:15 +02:00 |
|
Emanuel Schütze
|
11aacc71b6
|
Merge pull request #3216 from ostcar/early_websocket_open
Open websocket connections immediately
|
2017-04-27 13:13:00 +02:00 |
|