Commit Graph

521 Commits

Author SHA1 Message Date
FinnStutzenstein 9247009f1c Csv export for IE (closes #2898) 2017-01-23 16:24:25 +01:00
FinnStutzenstein 2b8a1168e0 Removing unnecessary resolvers (closes #2869, closes #2892) 2017-01-20 11:52:27 +01:00
Emanuel Schütze b2dfc9b44e Fixed translation strings. 2017-01-19 10:42:26 +01:00
FinnStutzenstein bd0073d2f7 StartUp improvements 2017-01-16 14:32:10 +01:00
Norman Jäckel 0546639934 Merge pull request #2866 from FinnStutzenstein/Issue2843
smoothly scroll projector
2017-01-15 13:34:51 +01:00
Emanuel Schütze 4a7ffe9da9 Moved CKEDITOR_BASEPATH into openslides-libs.js (Fixed #2787) 2017-01-15 13:04:31 +01:00
Emanuel Schütze befff17969 Merge pull request #2873 from normanjaeckel/MotionCommentProtection
Fixed bug in relation for motion comment. Fixed #2568.
2017-01-15 12:27:17 +01:00
Emanuel Schütze 0eb4f67a48 Use always '/' at the end of projector url.
e.g. '/projector/1/' or '/real-projetor/1/'
2017-01-15 12:13:46 +01:00
FinnStutzenstein a3b7b92239 smoothly scroll projector 2017-01-15 10:56:26 +01:00
Norman Jäckel f086d055b6 Fixed bug in relation for motion comment. Fixed #2568. 2017-01-15 10:20:45 +01:00
Emanuel Schütze 624fcc663b Merge pull request #2863 from FinnStutzenstein/StartUp
Start up
2017-01-14 21:46:16 +01:00
FinnStutzenstein a6d1eeb9c3 Worked on startup process.
- fix group view on reload
2017-01-14 21:23:05 +01:00
Norman Jäckel 481a36501f Refactored WhoAmI view and startup process. 2017-01-14 21:22:40 +01:00
Norman Jäckel 8bb0918372 Merge pull request #2825 from FinnStutzenstein/CsvImports
New csv import for users and topics
2017-01-14 20:52:09 +01:00
FinnStutzenstein 397d659f0b New csv import for users and topics 2017-01-14 18:29:05 +01:00
FinnStutzenstein 794db79511 adding permission checks 2017-01-14 12:13:38 +01:00
Emanuel Schütze 962c06c85f Merge pull request #2820 from FinnStutzenstein/Issue2667
Change user import table
2017-01-10 21:22:39 +01:00
FinnStutzenstein a9fbbb522e Change user import table 2017-01-09 14:22:32 +01:00
Norman Jäckel 58d8f68cc5 Merge pull request #2814 from FinnStutzenstein/ConfigEditor
Use ckeditor in config
2017-01-09 14:19:32 +01:00
FinnStutzenstein e8fa488d60 Project change recommendations 2017-01-07 14:48:11 +01:00
FinnStutzenstein 4530a5faed Use ckeditor in config 2017-01-07 14:45:58 +01:00
Emanuel Schütze 11c0b0cc3f Merge pull request #2816 from FinnStutzenstein/Issue2127
Use ckeditor to edit projector messages
2017-01-06 21:28:48 +01:00
FinnStutzenstein c3fc7d0f1b Do not project more than one message 2017-01-06 19:48:37 +01:00
FinnStutzenstein 6e7321d2a3 disable edit button if it is not possible to edit 2017-01-06 14:51:27 +01:00
FinnStutzenstein f37ad0f6c3 Use ckeditor to edit projector messages 2017-01-06 12:45:30 +01:00
Maximilian Krambach a31ffd1009 print correct number of ballots (closes #2504) 2017-01-06 11:39:55 +01:00
Emanuel Schütze cc0c0bf0d4 Merge pull request #2783 from FinnStutzenstein/PapaParse
New csv import using PapaParse
2017-01-06 11:33:06 +01:00
FinnStutzenstein f5fa3575df New csv import using PapaParse 2017-01-06 10:50:03 +01:00
Emanuel Schütze 388e6353cc Show qr codes in access data pdf only if config fields are set.
Disable footer with page numbers.
2017-01-04 22:43:17 +01:00
Norman Jäckel 286643ddd2 Merge pull request #2797 from FinnStutzenstein/Issue2653
projector language (closes #2653)
2016-12-21 11:55:49 +01:00
FinnStutzenstein f9f64b3e31 projector language (closes #2653) 2016-12-21 10:41:06 +01:00
FinnStutzenstein 6454853bf6 Consistent time handling and generic time converter code 2016-12-21 10:09:27 +01:00
Emanuel Schütze ff444eaa5d Merge pull request #2795 from CatoTH/Issue2777-pdf-problems
Bugfix for PDF-export - fixes #2777
2016-12-19 19:46:44 +01:00
Tobias Hößl 159720b983 Bugfix for PDF-export - fixes #2777 2016-12-19 16:17:36 +01:00
FinnStutzenstein a24b4aed99 cookie handling on login 2016-12-19 14:14:46 +01:00
Emanuel Schütze 01ab52a637 Use Roboto Medium font for some more 'bold' classes. 2016-12-16 22:10:56 +01:00
Emanuel Schütze 82396a784d Fixing some remarks for CKEditor PR#2770 2016-12-16 21:43:19 +01:00
Maximilian Krambach 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
Norman Jäckel 4ebb8023e3 Merge pull request #2776 from CatoTH/Issue2770-pdfmake-bugfix
Bugfix for #2770
2016-12-16 20:32:54 +01:00
Emanuel Schütze cd89f72a17 Merge pull request #2778 from emanuelschuetze/inject-improvement
Speed up autoupdates
2016-12-16 19:12:45 +01:00
Emanuel Schütze 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
Norman Jäckel 75f4c55181 Removed viewpoint for Django url patterns. Fixed #1453. 2016-12-16 17:01:34 +01:00
Tobias Hößl 46cf26481e Bugfix for #2770 2016-12-14 22:28:44 +01:00
Maximilian Krambach 0e6324b252 Change the language selector to the languages' own names 2016-12-14 15:25:38 +01:00
Norman Jäckel 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
FinnStutzenstein dbdaa9748c More motion select mode options and layout changes for guests 2016-12-13 11:27:44 +01:00
Norman Jäckel 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 a9cc8fcb37 Some template style and translation fixes. 2016-12-12 20:30:50 +01:00
FinnStutzenstein 6bbbf30d94 rename mediafiles private flag to hidden 2016-12-12 16:23:31 +01:00
Norman Jäckel 99db9b71b7 Merge pull request #2760 from normanjaeckel/MotionTextIntro
Added global config for motion preamble.
2016-12-12 16:23:18 +01:00
Emanuel Schütze 32b7ddedce Template fixes for motion preamble (#2760). 2016-12-12 16:14:32 +01:00
Emanuel Schütze 8780c47fc1 Minor fixes (Fixes #2750)
- Use <ul> instead of <ol> for candidate lists.
- Fix sorting by assignment_related_users.length in list view (Fixes #2750).
- Apply category and motion block for new amendments.
2016-12-12 12:58:58 +01:00
Emanuel Schütze 116c3702f2 Updated German translations.
Added missing translation filter.
2016-12-11 13:37:26 +01:00
Emanuel Schütze 8289306569 Merge pull request #2746 from emanuelschuetze/fonts
Use Roboto font in all templates.
2016-12-09 22:26:38 +01:00
Emanuel Schütze 0bef3d751e Merge pull request #2742 from emanuelschuetze/missing-translations
Mark missing translation strings in table headers.
2016-12-09 15:22:03 +01:00
Norman Jäckel c2edf134e2 Merge pull request #2751 from FinnStutzenstein/Issue2747
Some stylistic changes and new motion filter option
2016-12-09 15:16:50 +01:00
Emanuel Schütze f6d01c1d17 Mark missing translation strings in table headers. 2016-12-09 15:13:35 +01:00
Emanuel Schütze fb7b265826 Use Roboto font in all templates.
- Only install needed font files for Roboto and Roboto Condensed
  which strongly reduced the directory size of 'static/font'.
- Make it easier to adjust custom font by using global css font definition
  in app.css and projector.css.
- Remove Open Sans font.
2016-12-09 15:10:31 +01:00
FinnStutzenstein f7fcb69cc2 Some stylistic changes and new motion filter option 2016-12-09 14:58:15 +01:00
FinnStutzenstein 36c8477c7f no nav underline glitch 2016-12-09 13:51:23 +01:00
sean b1f4def743 add precise text decoration (fixes #2576) 2016-12-07 21:41:55 +01:00
Norman Jäckel 4e5adb74e3 Merge pull request #2739 from CatoTH/Issue2561-pdf-line-numbering-in-lists
Attempt to mitigate the list / line number problem
2016-12-07 11:34:50 +01:00
Norman Jäckel b27a975075 Merge pull request #2737 from FinnStutzenstein/Issue2730
Use session cookies and store filter settings in sessionStorage
2016-12-07 11:25:06 +01:00
FinnStutzenstein acb5a6dcf9 Use session cookies and store filter settings in sessionStorage 2016-12-07 08:01:33 +01:00
Tobias Hößl 2cb1429c8d First attempt to mitigate the list / line number problem 2016-12-06 22:12:29 +01:00
FinnStutzenstein 29ae600194 Dynamic webpage title 2016-12-05 18:00:52 +01:00
Emanuel Schütze 486f0601eb Merge pull request #2721 from FinnStutzenstein/AgendaTable
Agenda table
2016-12-02 15:59:57 +01:00
FinnStutzenstein ee5adb8fd2 New AgendaTable 2016-12-02 15:18:32 +01:00
Norman Jäckel 926d04f610 Merge pull request #2723 from FinnStutzenstein/Clock
Fixing the clock
2016-12-02 14:46:43 +01:00
Norman Jäckel dc0559ef38 Merge pull request #2722 from FinnStutzenstein/Issue2126
Show countdown above messageoverlay (closes #2126)
2016-12-02 14:26:15 +01:00
FinnStutzenstein 7e18061e53 Fixing the clock 2016-12-02 14:17:37 +01:00
FinnStutzenstein cc8cf1ef7a Show countdown above messageoverlay (closes #2126) 2016-12-02 12:31:10 +01:00
FinnStutzenstein 0f89205038 Translate legal notice 2016-12-02 08:10:06 +01:00
Emanuel Schütze 9dd44edb9e Merge pull request #2698 from FinnStutzenstein/Issue2531
Translate default projector (closes #2531)
2016-12-01 11:02:02 +01:00
Norman Jäckel 6aa3ea0d63 Merge pull request #2627 from CatoTH/change-recommendations-inline-diff
Showing Diff inline
2016-12-01 10:24:18 +01:00
FinnStutzenstein b0c94888ce Translate default projector (closes #2531) 2016-12-01 07:48:26 +01:00
Emanuel Schütze 17c464bafa Merge pull request #2688 from FinnStutzenstein/AssignmentsTable
New assignment and mediafile tables and table generics
2016-11-30 14:29:13 +01:00
FinnStutzenstein 4f717b6610 New assignment and mediafile tables and table generics 2016-11-29 16:29:29 +01:00
Emanuel Schütze 5312d44235 Merge pull request #2651 from CatoTH/editing-change-recommendations
Editing change recommendations
2016-11-28 21:31:22 +01:00
Emanuel Schütze a30085f756 Merge pull request #2632 from CatoTH/explicitly-enter-change-recommendation-type
Allow to explicitly set the type of a change recommendation
2016-11-28 20:57:21 +01:00
Emanuel Schütze ddfafd327b Merge pull request #2655 from CatoTH/Issue2615-line-selection-improvements
A small tooltip after selecting the first line when creating a change recommendation
2016-11-28 20:45:07 +01:00
Emanuel Schütze e865cfe105 Improved forms in ng-dialogs.
- users: use form field in grid layout and add more option
  to reduce scrolling of long dialog.
- agenda/motions/assignment: show parent agenda item field for create
  dialog only (to prevent corrupt agenda by action 'set my child item as my new
  parent item')
- refactor ng dialog and formly code.
2016-11-27 22:57:56 +01:00
Tobias Hößl 2958a401ad Showing Diff inline 2016-11-26 16:50:32 +01:00
Tobias Hößl f380f63851 A proposition so mitigate #2615 2016-11-26 12:34:26 +01:00
Norman Jäckel 36dc957f19 Changed tooltips. 2016-11-24 00:07:50 +01:00
Tobias Hößl fd82ae348e Editing change recommendations 2016-11-23 23:42:24 +01:00
FinnStutzenstein 88537cf67e Some improvements for Multiprojector 2016-11-21 15:01:54 +01:00
FinnStutzenstein 0cc8a81320 countdown and message models (closes #2464) 2016-11-19 12:37:33 +01:00
Tobias Hößl 771f087ade Allow to explicitly set the type of a change recommendation 2016-11-19 11:57:54 +01:00
FinnStutzenstein e0f78b16a0 New table design for users 2016-11-18 09:42:29 +01:00
Emanuel Schütze f9f9934722 Fixed missplaced comma in pdf header (Fixed #2639) 2016-11-16 21:05:04 +01:00
Emanuel Schütze f8958e36a6 Fixed missing translations (Fixed #2616, fixed #2625) 2016-11-15 21:18:06 +01:00
Emanuel Schütze b9a325ba5d Merge pull request #2620 from FinnStutzenstein/Issue2590
Highlighting motions for multiprojector and move httpProvider (fixes …
2016-11-15 20:21:19 +01:00
FinnStutzenstein 4b8fc5fa19 Highlighting motions for multiprojector and move httpProvider (fixes #2590) 2016-11-15 13:09:56 +01:00
Emanuel Schütze 4e1fdc6b22 Updated PDF layout
- use default font for pdf from vfs_font.js
  remove base64 encoding function on server side
- use recommendation config value in motion detail template
2016-11-14 18:52:50 +01:00
Emanuel Schütze 18accc58ae Merge pull request #2610 from tsiegleauq/electionListPdfMake
ElectionList over PdfMake
2016-11-14 18:05:03 +01:00
Emanuel Schütze e49411250a Merge pull request #2558 from FinnStutzenstein/Issue2462
change all isProjected functions (closes #2462)
2016-11-11 15:57:56 +01:00
FinnStutzenstein af9755cb9a changed all project functions 2016-11-11 09:37:37 +01:00
Emanuel Schütze 3b41f99a6f Load angular-gettext language files from plugin (Fixed #2339)
Add new OpenSlidesPlugins provider where plugins can be registered.
2016-11-10 12:51:16 +01:00
Sean Engelhardt 7069326655 ElectionList over PdfMake 2016-11-09 20:23:01 +01:00
FinnStutzenstein 43d9733881 fixing current list of speakers 2016-11-08 13:00:50 +01:00
Emanuel Schütze b297bab5b5 Fix merge conflict in core/base.js 2016-11-02 22:05:07 +01:00
Emanuel Schütze ef36962221 Merge pull request #2580 from tsiegleauq/accessDataListPdfMake
Creates the access data list with PdfMake
2016-11-02 14:53:50 +01:00
Sean Engelhardt 34f74da58d Creates the access data list with PdfMake 2016-11-02 14:19:57 +01:00
Emanuel Schütze e315cbad89 Fix regression with projector loading.
Projector requires Editor provider in core/base.js instead of site.js
because MotionComments (in motions/base.js) uses now Editor factory.
2016-11-02 14:10:59 +01:00
Emanuel Schütze caf52094a4 Allow to resize tinymce editor (Fixes #2115) 2016-11-02 10:35:18 +01:00
Norman Jäckel 50868d1432 Merge pull request #2567 from emanuelschuetze/fix-translation-strings
Fixed translation issues.
2016-11-01 23:58:43 +01:00
Emanuel Schütze b08ca4be02 Merge pull request #2534 from tsiegleauq/electionsListPdfMake
Creates the Election documents using PdfMake
2016-11-01 23:40:42 +01:00
Emanuel Schütze 4b124a629b Fixed translation issues. 2016-11-01 23:32:39 +01:00
Sean Engelhardt 14ca655aa2 Creates the Election documents using PdfMake 2016-11-01 23:18:19 +01:00
FinnStutzenstein 58dd2f2b30 change all isProjected functions (closes #2462) 2016-11-01 10:31:28 +01:00
Tobias Hößl 03ef217c4e Colors / text-Decorations for insered / deleted text; hide line numbers in inserted text 2016-10-29 16:23:16 +02:00
FinnStutzenstein 111b9e3fd7 use check icon and no post request on deselect (fixes #2471) 2016-10-21 09:39:04 +02:00
Emanuel Schütze dc1c958e0f Merge pull request #2514 from FinnStutzenstein/Issue2494
Round corners for projectorbuttons (fixes #2494)
2016-10-18 13:01:49 +02:00
FinnStutzenstein 6ca3c07e1f Round corners for projectorbuttons (fixes #2494) 2016-10-18 12:48:19 +02:00
Emanuel Schütze 68139ff5be Merge pull request #2512 from FinnStutzenstein/Issue2470
key value switched in angular foreach (fixes #2470)
2016-10-17 22:05:55 +02:00
Norman Jäckel 676e783039 Merge pull request #2516 from FinnStutzenstein/Issue2502
Remove chat history
2016-10-17 21:48:34 +02:00
Norman Jäckel f2fa8de7be Merge pull request #2495 from normanjaeckel/MotionBlock
Motion block
2016-10-17 21:29:31 +02:00
Norman Jäckel 20f8875dcd Added view to follow recommendations.
for all motions of a motion block
2016-10-17 21:02:50 +02:00
Emanuel Schuetze 0270c31b32 Template improvements for motion blocks.
Fixed $stateProvider to allow camelCase in state name (Fixed #2479)
- Refactor generic templateUrl function.
- Rename MotionBlock templates.
- Rename MotionBlock controller.
2016-10-17 20:58:10 +02:00
Norman Jäckel 8d494ddef9 Merge pull request #2511 from FinnStutzenstein/Issue2465
Rename AdditionalId to arg (closes #2465)
2016-10-17 20:45:23 +02:00
Tobias Hößl 228abf5cee Change recommendations 2016-10-17 19:37:32 +02:00
Norman Jäckel e944f6368b Merge pull request #2509 from matakuka/majorities
Majorities (issue #2258)
2016-10-17 17:15:15 +02:00
Norman Jäckel 45aa4146da Refactored majority calculation. Added cache for MotionPollDetailCtrl. 2016-10-17 17:03:42 +02:00
Maximilian Krambach e5e1e3e8ba Majority test for motions 2016-10-17 17:03:31 +02:00
Norman Jäckel 639748bb3b Added view to clear the chatbox. 2016-10-17 16:56:19 +02:00
FinnStutzenstein 7965fd3fce Button for deleting chat history 2016-10-17 15:04:06 +02:00
Emanuel Schütze 208d94a91b Support https as websocket protocol (wss). 2016-10-17 11:31:27 +02:00
FinnStutzenstein 5272a3c1bb key value switched in angular foreach (fixes #2470) 2016-10-17 08:58:43 +02:00
FinnStutzenstein 7fcbed051c Rename AdditionalId to arg (closes #2465) 2016-10-17 08:10:52 +02:00
Norman Jäckel 447339ec33 Merge pull request #2508 from tsiegleauq/userListPdfMake
Create the user list over pdfmake
2016-10-14 11:50:31 +02:00
Sean Engelhardt 54fc500d04 Create the user list over pdfmake 2016-10-12 16:52:24 +02:00
Maximilian Krambach 88674da36a list-of-speakers overlay (fixes #2211) 2016-10-12 15:45:21 +02:00
Emanuel Schütze 6f70fb630c Merge pull request #2498 from tsiegleauq/agendaPDFmake
Generate agendas using pdfmake
2016-10-12 10:27:46 +02:00
Sean Engelhardt 345328357f Generate agendas using pdfmake 2016-10-11 18:10:33 +02:00
Emanuel Schuetze f7d10b417e Template fixes
- motion list: show category and tags dropdown for manager only
- manage projector: fix submenu buttons and css classes
2016-10-07 11:42:33 +02:00
FinnStutzenstein f1c58f98e8 Using a datetimepicker for agenda start time (closes #2413 and fixes #2440) 2016-10-06 22:12:51 +02:00
Sean Engelhardt 5040caba5c moves pdfmake related code in own files (fixes #2307) 2016-10-05 11:27:22 +02:00
Emanuel Schuetze d7a22c371e Minor changes
- Show workflow field in motion form only if more than one workflows
  exists.
- Reorder the fields category, tags and origin in motion detail.
- Fix translation string 'Line numbering'.
- Fix padding in motion list.
2016-10-04 15:06:50 +02:00
Emanuel Schuetze 4075c1aa3f Fixed translations strings. Updated template-en.pot. 2016-10-04 12:04:55 +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
Norman Jäckel 2e7555e720 Fixed broadcast. Fixed #2467. 2016-10-01 14:37:04 +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
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