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

4823 Commits

Author SHA1 Message Date
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
Emanuel Schütze 7f20a7d358 Merge pull request #3324 from FinnStutzenstein/configvalue-for-id 
Configvalue for sequential number
 2017-07-27 13:45:19 +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
Emanuel Schütze 9dca7fa3b6 Merge pull request #3327 from FinnStutzenstein/configvalue-pdf-pagenumber-alignment 
Configvalue for pagenumber alignment in PDF
 2017-07-27 11:02:15 +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
Emanuel Schütze c0bd367342 Merge pull request #3328 from FinnStutzenstein/mediafile-type-fix 
Fixing mediafiles list view for medifiles without a type
 2017-07-27 09:54:30 +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
Emanuel Schütze c58f3071f2 Merge pull request #3321 from FinnStutzenstein/docx-comments-filter 
fixing wrong entered comments
 2017-07-26 14:33:04 +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
Emanuel Schütze 9c1d2319ac Merge pull request #3317 from normanjaeckel/Changelog 
Updated CHANGELOG.
 2017-07-07 11:28:34 +02:00
Norman Jäckel 41a70f40df Fixed error on category numbering. Fixed #3315. 2017-07-05 22:13:54 +02:00
Norman Jäckel e2d710a84c Updated CHANGELOG. 2017-07-05 21:30:16 +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
Norman Jäckel 1701fd72f2 Merge pull request #3314 from FinnStutzenstein/Bugfixes 
Minor Bugfixes (fixes #3312, fixes #3313)
 2017-06-29 10:45:13 +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
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