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

3821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schuetze
8c9f50e737 Does not use gulp 'production' flag for openslides.js. 
Comment out uglify function for openslides.js.
Added TODO that all OpenSlides js files needed rework before uglified code works correctly.
 2016-10-04 15:11:57 +02:00
Emanuel Schütze
d0f4b59413 Merge pull request #2483 from emanuelschuetze/update-de-translations 
Updated German tranlsations.
 2016-10-04 13:28:46 +02:00
Emanuel Schuetze
2b206a9e72 Updated German tranlsations. 2016-10-04 13:22:39 +02:00
Emanuel Schütze
80cd22f780 Merge pull request #2482 from emanuelschuetze/translation-resources-2 
Fixed translation strings. Updated template-en.pot.
 2016-10-04 12:13:51 +02:00
Emanuel Schuetze
4075c1aa3f Fixed translations strings. Updated template-en.pot. 2016-10-04 12:04:55 +02:00
Emanuel Schütze
0c42f0b972 Merge pull request #2481 from emanuelschuetze/translation-resources 
Updated translation resource files.
 2016-10-04 11:24:57 +02:00
Emanuel Schuetze
72651f5bbc Updated translation resource files. 2016-10-04 11:16:03 +02:00
Emanuel Schütze
e64a1bf19c Merge pull request #2478 from emanuelschuetze/ui-improvements 
UI improvements
 2016-10-04 10:59:21 +02:00
Emanuel Schuetze
bc72089973 UI improvements 
- item list: reorder buttons
- motion list:
  * move hover menu for edit/delete below submitters
  * limit submitters to one
- motion detail:
  * show ol flush left
  * use 2 or 3 columns in meta box
  * use small buttons for line numbering controls
  * group line number controls in grey tool bar.
  * Show motion comments div only if user is allowed.
- motion config:
  * Deativate comments by default.
  * Deactivate recommendations for motions by default.
- item detail: Show needed buttons only.
- assignment detail: Improve ballot tabs.
- general:
  * move pdf button to right
  * move 'back to overview' button to left
  * update label vor countdown option
 2016-10-04 10:51:19 +02:00
Oskar Hahn
c4f6477a4d Merge pull request #2475 from normanjaeckel/FixBroadcast 
Fixed broadcast. Fixed #2467.
 2016-10-01 15:49:07 +02:00
Oskar Hahn
45df53ab45 Merge pull request #2474 from ostcar/send_full_data_through_channel 
Send full_data through the channel.
 2016-10-01 15:44:34 +02:00
Norman Jäckel
2e7555e720 Fixed broadcast. Fixed #2467. 2016-10-01 14:37:04 +02:00
Oskar Hahn
962deca506 Send full_data through the channel. 
Saves db queries.
 2016-10-01 13:57:53 +02:00
Norman Jäckel
5879702354 Merge pull request #2473 from ostcar/fix_config_cache_key 
Fix config cache key.
 2016-10-01 13:02:48 +02:00
Oskar Hahn
97bd526dd7 Fix config cache key 2016-10-01 12:37:43 +02:00
Norman Jäckel
ab164e4e88 Merge pull request #2404 from ostcar/cache2 
Added caching system.
 2016-10-01 09:44:57 +02:00
Oskar Hahn
98bab9b358 Fix tests and remove old code. 2016-10-01 01:49:27 +02:00
Norman Jäckel
039795beb7 Refactored projector requirements system for autoupdate. 2016-10-01 01:49:17 +02:00
Oskar Hahn
ac9c9f4ec3 More tests, development instructions and small changes. 2016-10-01 01:48:30 +02:00
Norman Jäckel
7cd70a568c Added docstrings. Small changes. 2016-10-01 01:48:18 +02:00
Oskar Hahn
368873e738 Adds a cache system to the CollectionElement and add 
a Collection class that can be used to call a collection
used this for the list and receive rest api.
 2016-09-30 21:37:52 +02:00
Norman Jäckel
2a5bd6d94b Merge pull request #2379 from FinnStutzenstein/Multiprojector 
Multiprojector
 2016-09-30 21:26:43 +02:00
Emanuel Schuetze
720c7e76a5 Hot fix for broadcast (will improved later). 2016-09-30 21:20:30 +02:00
Emanuel Schuetze
6f2a509ebf Fix mediafile control buttons for fullscreen and play. 2016-09-30 19:59:53 +02:00
Norman Jäckel
8427ffd816 Small changes for multiple projector feature. 2016-09-30 19:11:33 +02:00
Finn Stutzenstein
e6b9b21d41 Added support for multiple projectors. 2016-09-30 18:58:59 +02:00
Emanuel Schütze
447d475321 Merge pull request #2461 from FinnStutzenstein/minorFixes 
some minor fixes
 2016-09-30 17:37:27 +02:00
Norman Jäckel
188f605973 Merge pull request #2446 from tsiegleauq/issue2441-LineNumberBlankText 
PDF line numbers for new linenumbering.js (fixes #2441)
 2016-09-30 17:35:53 +02:00
Emanuel Schuetze
8f24039493 Remark for PR#2446: Check if 'highlight' is undefined. 2016-09-29 14:46:32 +02:00
FinnStutzenstein
84cd3dbc77 little fixes 2016-09-28 19:27:40 +02:00
Norman Jäckel
f4c6c35584 Merge pull request #2449 from emanuelschuetze/fixTranslations 
Minor fixes
 2016-09-28 13:17:59 +02:00
Emanuel Schuetze
4732c64617 Minor fixes 
- Fix translation strings.
- Fix dropdown style in motion table.
 2016-09-27 15:21:52 +02:00
sean
7ea1a7e481 PDF line numbers for new linenumbering.js (fixes #2441) 2016-09-27 12:59:21 +02:00
Emanuel Schütze
4a5aea0b81 Merge pull request #2444 from FinnStutzenstein/Issue2442 
Hotfix for issue #2442
 2016-09-27 12:03:32 +02:00
Norman Jäckel
6595e838ed Merge pull request #2443 from FinnStutzenstein/lodashfix 
renamed contains to includes
 2016-09-27 11:58:13 +02:00
Norman Jäckel
420090552b Merge pull request #2439 from emanuelschuetze/fix-tinymce-gulp-task 
Fixed tinymce gulp task
 2016-09-27 11:57:36 +02:00
FinnStutzenstein
673ee1da18 hotfix 2016-09-27 11:47:57 +02:00
FinnStutzenstein
54989601a1 renamed contains to includes 2016-09-27 11:39:13 +02:00
Emanuel Schuetze
0cb2c659d8 Fixed tinymce gulp task 2016-09-27 10:50:00 +02:00
Norman Jäckel
a02a39e7ae Merge pull request #2438 from emanuelschuetze/fixAssignmentPollSlide 
Fix to show invalid/valid/casted votes on assignment slide.
 2016-09-26 20:51:47 +02:00
Norman Jäckel
8398e3abf0 Merge pull request #2436 from tsiegleauq/issue2433-PdfInvalidHTML 
Repairs invalid HTML during PDF generation (fixes #2433)
 2016-09-26 20:51:04 +02:00
Norman Jäckel
4a1cad2988 Merge pull request #2437 from emanuelschuetze/fix2435 
Fixed AttributeError in MotionAccessPermissions (Fixed #2435)
 2016-09-26 20:49:48 +02:00
Emanuel Schuetze
841ec00b22 Fix to show invalid/valid/casted votes on assignment slide. 2016-09-26 20:41:42 +02:00
Emanuel Schuetze
31361f9f54 Fixed AttributeError in MotionAccessPermissions (Fixed #2435) 2016-09-26 20:26:59 +02:00
sean
d1addf4df6 Repairs invalid HTML during PDF generation (fixes #2433) 2016-09-26 18:53:59 +02:00
Emanuel Schütze
223b168441 Merge pull request #2434 from emanuelschuetze/update-translations 
Updated German translations. Fixed some translation strings.
 2016-09-26 15:46:38 +02:00
Emanuel Schuetze
148e7f6a9b Updated German translations. Fixed some translation strings. 2016-09-26 15:33:40 +02:00
Emanuel Schütze
f305d19856 Merge pull request #2430 from tsiegleauq/issue2299-motion-katalog 
Add motion catalog over pdfmake (fixes #2299)
 2016-09-26 14:20:46 +02:00
Sean Engelhardt
d4c4f944fe Add motion catalog over pdfmake (fixes #2299) 2016-09-26 13:25:58 +02:00
Norman Jäckel
ebd8e2680f Merge pull request #2432 from emanuelschuetze/update-translation-resources 
Updated translation resources.
 2016-09-26 13:10:25 +02:00