Tobias Hößl
c888419527
Make line highlighting and 'Goto'-Feature available on all modes
2016-11-20 21:55:03 +01:00
Tobias Hößl
ec635d97ee
Bugfix: Affected lines were selectable right after creating a change recommendation
2016-11-19 13:33:06 +01:00
Tobias Hößl
f9325069cf
Bugfix: Calling editing dialog during inline editing
2016-11-19 13:19:08 +01:00
Norman Jäckel
28059698c7
Fixed projector broadcast if projector is deleted. Fixed #2646 .
2016-11-19 13:04:24 +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
Emanuel Schütze
707029c1c3
Updated translation files
...
- EN resources for django and angular-gettext
- DE translations
- PT translations
2016-11-18 11:24:09 +01:00
Norman Jäckel
a6ec032590
Merge pull request #2642 from emanuelschuetze/cleanup-pdf
...
Remove unused serverside pdf file from users app.
2016-11-18 11:03:23 +01:00
Emanuel Schütze
9c58efbdae
Remove unused serverside pdf file from users app.
2016-11-18 10:50:56 +01:00
Norman Jäckel
9375727f1f
Merge pull request #2631 from CatoTH/change-change-recommendation-views
...
Overhaul change recommendation statuses
2016-11-18 10:49:38 +01:00
Norman Jäckel
9b6fe6e3a2
Merge pull request #2641 from FinnStutzenstein/Issue2609
...
check if pdf is encrypted (closes #2609 )
2016-11-18 10:33:46 +01:00
FinnStutzenstein
e0f78b16a0
New table design for users
2016-11-18 09:42:29 +01:00
FinnStutzenstein
975a76daf4
check if pdf is encrypted
2016-11-18 09:40:36 +01:00
Tobias Hößl
32d3d804b1
Overhaul change recommendation statuses
2016-11-16 22:42:22 +01:00
Emanuel Schütze
f9f9934722
Fixed missplaced comma in pdf header ( Fixed #2639 )
2016-11-16 21:05:04 +01:00
Norman Jäckel
e8bf67b185
Merge pull request #2637 from emanuelschuetze/fix-translations
...
Fixed missing translations (Fixed #2616 , fixed #2625 )
2016-11-15 23:27:02 +01:00
Norman Jäckel
35e54eecbd
Merge pull request #2629 from CatoTH/Issue2617-switch-back-to-original-view
...
Switch back to original view after deleting last change recommendation (Closes #2617 )
2016-11-15 23:14:03 +01:00
Norman Jäckel
5899c41840
Merge pull request #2628 from CatoTH/bugfix-wrong-caching-of-extracted-lines
...
Bugfix: Caching of extracted line numbers was invalid…
2016-11-15 23:13:13 +01:00
Emanuel Schütze
f8958e36a6
Fixed missing translations ( Fixed #2616 , fixed #2625 )
2016-11-15 21:18:06 +01:00
Emanuel Schütze
2399a8121a
Merge pull request #2634 from normanjaeckel/FixMotionComment
...
Fixed motion projector if comment field is None. Fixed #2614 .
2016-11-15 21:01:24 +01:00
Emanuel Schütze
bbdb273a01
Merge pull request #2630 from CatoTH/translation-bugfix
...
Translation Bugfix - Missing line number in german translation
2016-11-15 20:35:20 +01:00
Emanuel Schütze
4d54a2b575
Merge pull request #2622 from FinnStutzenstein/Issue2566
...
Hotfix for Issue #2566
2016-11-15 20:24:47 +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
FinnStutzenstein
1ca390876b
Hotfix for Issue #2566
2016-11-15 11:40:59 +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
ff359ea629
Improved assignments and motions pdf.
...
Load all users in pdfmake function - not in state resolver of
assignment list.
2016-11-14 17:55:50 +01:00
Norman Jäckel
5a78f1c510
Fixed motion projector if comment field is None. Fixed #2614 .
2016-11-14 13:16:34 +01:00
Tobias Hößl
2fe1940802
Translation Bugfix
2016-11-13 11:51:27 +01:00
Tobias Hößl
fca2605a2b
Switch back to original view after deleting last change recommendation
2016-11-13 11:45:22 +01:00
Tobias Hößl
4ac7f48bec
Bugfix: Caching of extracted line numbers was invalid when a fragment was passed as an argument
2016-11-13 10:20:00 +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
Norman Jäckel
67aa92a7ac
Merge pull request #2619 from FinnStutzenstein/Issue2573
...
No overrun of identifier col in motion table (closes #2573 )
2016-11-11 13:21:25 +01:00
FinnStutzenstein
133d0c3a0f
fixing motion block list layout
2016-11-11 10:59:38 +01:00
FinnStutzenstein
fbeacd97f8
No overrun of identifier col in motion table ( closes #2573 )
2016-11-11 09:40:30 +01:00
FinnStutzenstein
af9755cb9a
changed all project functions
2016-11-11 09:37:37 +01:00
Emanuel Schütze
22ab7a15a3
Merge pull request #2608 from emanuelschuetze/issue-2339
...
Load angular-gettext language files from plugin (Fixed #2339 )
2016-11-10 13:00:53 +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
Norman Jäckel
9a51bbe663
Update createopenslidesuser.py
2016-11-10 11:11:27 +01:00
André Böhlke
01e27c5713
add command for creating an openslides user
2016-11-10 09:15:21 +01:00
Sean Engelhardt
7069326655
ElectionList over PdfMake
2016-11-09 20:23:01 +01:00
Norman Jäckel
bc321bd714
Merge pull request #2605 from ostcar/fix_permission
...
Fixes user permissions
2016-11-08 23:50:39 +01:00
Oskar Hahn
a47e30c8f1
Fixes user permissions
...
Fix #2597
2016-11-08 23:13:15 +01:00
Emanuel Schütze
fbc4344ab9
Merge pull request #2604 from normanjaeckel/FixGroupUpdate
...
Fixed group update method. Fixed #2541 .
2016-11-08 22:45:38 +01:00
Norman Jäckel
7aa110aca6
Merge pull request #2599 from FinnStutzenstein/Issue2118
...
check for cookies (closes #2118 )
2016-11-08 22:39:40 +01:00
Norman Jäckel
2fae952edd
Fixed group update method. Fixed #2541 .
2016-11-08 22:36:57 +01:00
Norman Jäckel
4d80914b8a
Fixed zoom and scroll, fixed #2547 .
2016-11-08 21:29:26 +01:00
Norman Jäckel
db38e5e075
Merge pull request #2476 from ostcar/remove_serverside_pdf
...
Removed old code needed be the server to serve pdf
2016-11-08 15:12:45 +01:00
Norman Jäckel
8f099114bb
Merge pull request #2587 from FinnStutzenstein/Issue2544
...
Block deleting of the last group with user manage permissions
2016-11-08 15:04:24 +01:00
Norman Jäckel
30fd55409b
Merge pull request #2598 from emanuelschuetze/template-fixes
...
Template fixes.
2016-11-08 14:45:28 +01:00
Emanuel Schütze
4eecd59e52
Updated German translations.
2016-11-08 14:37:12 +01:00
FinnStutzenstein
43d9733881
fixing current list of speakers
2016-11-08 13:00:50 +01:00
FinnStutzenstein
410ac00a44
check for cookies ( closes #2118 )
2016-11-08 12:46:19 +01:00
FinnStutzenstein
8d4742ed29
Style fix in current list of speakers template
2016-11-08 12:21:53 +01:00
Emanuel Schütze
92a9a36188
Template fixes.
...
- Improved motion majority calculation form.
- Show special values without percentage.
- Fix JS errors.
2016-11-08 12:14:24 +01:00
Emanuel Schütze
55a8c4e33a
Removed unused python user functions ( Fixed #2594 ).
...
Now get_short_name() and get_full_name() are used on client side only.
2016-11-07 15:58:20 +01:00
Oskar Hahn
7281aa57b8
Removed old code needed be the server to serve pdf
2016-11-07 15:54:29 +01:00
Emanuel Schütze
2824a6b3d2
Merge pull request #2591 from emanuelschuetze/users-import
...
Improve importing and sorting of users
2016-11-07 15:17:30 +01:00
Emanuel Schütze
5b544ceed2
Improve importing and sorting of users
...
* Add is_present field for csv import of users.
* Refactor JS functions get_full_name and get_short_name (Fixes #2136 ).
- Show participant number in get_full_name() output.
- Sort users by first or last name.
- Extend config option to sort users.
- Mark unused Python methods get_short_name and get_full_name.
2016-11-07 15:04:30 +01:00
Emanuel Schütze
8c07884746
Merge pull request #2586 from FinnStutzenstein/Issue2543
...
Just protect default group (fixes #2543 )
2016-11-04 15:51:40 +01:00
Emanuel Schütze
3225cdd1a9
Merge pull request #2589 from normanjaeckel/ConfigLabelHelpText
...
Changed label and help text of assignment config for 100-%-base.
2016-11-04 15:45:19 +01:00
Norman Jäckel
19a76f5d3d
Changed label and help text of assignment config for 100-%-base.
2016-11-04 12:02:16 +01:00
FinnStutzenstein
4a1df35a50
Block deleting of the last group with user manage permissions ( closes #2544 )
2016-11-04 10:04:21 +01:00
FinnStutzenstein
67f3a1294d
Just protect default group ( fixes #2543 )
2016-11-04 08:30:58 +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
Norman Jäckel
8c4a69dfb2
Merge pull request #2570 from emanuelschuetze/fix-inmemory-cache
...
Fix updating of motion comments for inmemory cache.
2016-11-02 14:24:30 +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
2c09b409d7
Fix updating of motion comments for inmemory cache.
...
get_restricted_data() has to use deepcopy(full_data) instead of
full_data.copy().
2016-11-02 14:07:24 +01:00
Norman Jäckel
8ec6681e81
Merge pull request #2578 from emanuelschuetze/fix-2115
...
Allow to resize tinymce editor (Fixes #2115 )
2016-11-02 13:30:49 +01:00
Emanuel Schütze
caf52094a4
Allow to resize tinymce editor ( Fixes #2115 )
2016-11-02 10:35:18 +01:00
Emanuel Schütze
c5ffa13436
Updated German translations.
2016-11-02 09:06:55 +01:00
Emanuel Schütze
259189c280
Updated template-en.po resource.
2016-11-02 00:22:13 +01:00
Emanuel Schütze
7ce479a511
Merge pull request #2535 from emanuelschuetze/state-recommendation-extra-fields
...
Added new motion state flags to show an additional fields
2016-11-02 00:19:32 +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
befb8083bf
Merge pull request #2537 from CatoTH/line-number-and-diff-caching
...
Caching results of insertLineNumbers and extractRangeByLineNumbers
2016-11-01 23:41:29 +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
78765ae9ed
Added new motion state flags to show an additional fields
...
... to extend state name and recommendation label.
Hide forState and forRecommendation fields in motion form and detail
view (comment section).
2016-11-01 23:37:39 +01:00
Emanuel Schütze
4b124a629b
Fixed translation issues.
2016-11-01 23:32:39 +01:00
Tobias Hößl
36e519a798
Caching results of insertLineNumbers and extractRangeByLineNumbers
2016-11-01 23:29:32 +01:00
Sean Engelhardt
14ca655aa2
Creates the Election documents using PdfMake
2016-11-01 23:18:19 +01:00
Norman Jäckel
b0ff8375a8
Merge pull request #2539 from CatoTH/bugfix-open-motions-in-original-view
...
Bugfix: Always open motions in original view
2016-11-01 22:56:33 +01:00
Norman Jäckel
3c48df1245
Merge pull request #2540 from CatoTH/diff-formattings-in-pdf
...
Colors / text-Decorations for insered / deleted text
2016-11-01 22:55:25 +01:00
Norman Jäckel
378fb46fb2
Merge pull request #2562 from emanuelschuetze/comments-editor
...
Use tinymce editor for motion comment fields.
2016-11-01 22:54:58 +01:00
Emanuel Schütze
41a4e35592
Use tinymce editor for motion comment fields.
2016-11-01 17:37:32 +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
Tobias Hößl
efe90c4e4d
Always open motions in original view
2016-10-29 14:30:25 +02:00
Emanuel Schütze
2a36a0e84e
Use version 2.1-dev.
2016-10-27 14:10:20 +02:00
Norman Jäckel
632fd68564
Fixed error in README and help texts of start script. Fixed #2532 .
2016-10-26 14:58:46 +02:00
Norman Jäckel
ee235309ed
Merge pull request #2523 from FinnStutzenstein/Issue2517
...
change dropdown for project agenda (closes #2517 )
2016-10-26 14:56:18 +02:00
Norman Jäckel
f5b37c1b84
Merge pull request #2530 from emanuelschuetze/pagination
...
Fix pagination and indentation of lists in import views.
2016-10-26 14:55:44 +02:00
Emanuel Schütze
4646cebe55
Merge pull request #2526 from FinnStutzenstein/Issue2448
...
Adding sortingoptions for creation date and last modified (closes #2448 )
2016-10-25 14:53:58 +02:00
Emanuel Schütze
147e4ab219
Merge pull request #2527 from FinnStutzenstein/Issue2522
...
fixing topics import (closes #2522 )
2016-10-25 14:46:12 +02:00
Emanuel Schütze
435e333bbb
Fix pagination and indentation of lists in import views.
2016-10-25 13:45:54 +02:00
Emanuel Schütze
21e6903368
Fix to show election results without ng-init.
...
ng-init does not watch for autoupdates.
2016-10-25 10:44:17 +02:00
FinnStutzenstein
fc21713bb4
Adding sortingoptions for creationdate and last modified ( closes #2448 )
2016-10-25 10:03:01 +02:00
FinnStutzenstein
e267784173
fixing topics import ( closes #2522 )
2016-10-24 16:38:43 +02:00
Norman Jäckel
9ca15fd0b8
Fixed migrations by skipping autoupdate.
2016-10-24 10:42:34 +02:00
FinnStutzenstein
2f03777d56
change dropdown for project agenda ( closes #2517 )
2016-10-21 13:11:25 +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
8172984a4d
Updated translation resource. Updated German translations.
...
Fixed translation strings.
2016-10-17 23:30:18 +02:00
Emanuel Schütze
35a69254af
Updated EN translation resources.
2016-10-17 22:07:25 +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
Emanuel Schütze
29638cc702
Recreated migrations file for motionBlock.
...
Minor template fixes for motionBlock.
2016-10-17 21:18: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
700c86a24c
New feature blocks for motions.
...
- Added ListView, DetailView, UpdateForm and connection to
agenda item for MotionBlock.
- Added slide and projection default.
- Added custom manager for motion blocks.
- Enabled current list of speakers slide and overlay for motion block.
2016-10-17 20:54:26 +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
Emanuel Schütze
7ada65a628
Optimized template and translation for majority feature.
2016-10-17 17:03:42 +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
André Böhlke
cced97d9fb
password change command
2016-10-14 16:01:46 +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
Norman Jäckel
1a54d1f4c6
Merge pull request #2505 from emanuelschuetze/fix-autoupdate-for-polls
...
Fixed autoupdate for motion and assigment polls.
2016-10-12 11:34:09 +02:00
Emanuel Schuetze
d2acbdda70
Fixed autoupdate for motion and assigment polls.
...
Send autoupdate once only after all votes are saved. Disable
autoupdate for saving incompleted vote results.
2016-10-12 11:23:53 +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
Norman Jäckel
1b218843ef
Merge pull request #2491 from emanuelschuetze/template-fixes
...
Template fixes
2016-10-07 20:07:11 +02:00
Emanuel Schuetze
af10c5aa3d
Fixed typo in projector autoupdate ( Fixes #2492 )
2016-10-07 17:02:55 +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
Emanuel Schuetze
0a2759c3ce
Updated missing German translations.
2016-10-06 21:12:31 +02:00
Sean Engelhardt
5040caba5c
moves pdfmake related code in own files ( fixes #2307 )
2016-10-05 11:27:22 +02:00
Oskar Hahn
e209dd6dfe
Support to send many objects through the autoupdate system
2016-10-04 18:10:04 +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
2b206a9e72
Updated German tranlsations.
2016-10-04 13:22:39 +02:00
Emanuel Schuetze
4075c1aa3f
Fixed translations strings. Updated template-en.pot.
2016-10-04 12:04:55 +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
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
Oskar Hahn
97bd526dd7
Fix config cache key
2016-10-01 12:37:43 +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
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
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
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
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
Emanuel Schuetze
05326cf706
Updated translation resources.
...
Fixed some translation strings.
2016-09-26 12:44:23 +02:00
Emanuel Schütze
fb2593b5a7
Merge pull request #2429 from normanjaeckel/CheckAssignmentPollSlide
...
Updated server logic for assignment detail and poll slide. Fixed #2422 .
2016-09-24 13:40:59 +02:00
Emanuel Schütze
4363c3498a
Merge pull request #2428 from FinnStutzenstein/Issue2425
...
Removing PDF paragraph numbering (fixes #2425 )
2016-09-24 13:39:06 +02:00
Emanuel Schütze
50f5d0a33a
Merge pull request #2380 from FinnStutzenstein/Issue2348
...
New ui element for comments in config (closes #2348 )
2016-09-24 13:34:08 +02:00
Norman Jäckel
495ddb7d2d
Updated server logic for assignment detail and poll slide. Fixed #2422 .
2016-09-23 22:09:38 +02:00
Norman Jäckel
e340d83777
Merge pull request #2319 from matakuka/assignment_withoutabstains
...
Calculate assignment without abstains (if one candidate) (issue #2182 )
2016-09-23 16:01:04 +02:00
Norman Jäckel
117489c57e
Merge pull request #2427 from FinnStutzenstein/Issue2424
...
Adding TypeError(fixes #2424 )
2016-09-23 15:55:56 +02:00
Norman Jäckel
256a8d9203
Small style changes.
2016-09-23 15:53:04 +02:00
FinnStutzenstein
0966ad82e1
Removing PDF paragraph numbering ( fixes #2425 )
2016-09-23 15:06:47 +02:00
Emanuel Schütze
5a70125922
Merge pull request #2423 from normanjaeckel/NeedFullUpdate
...
Implemented need_full_update check. Fixed #2396 .
2016-09-23 15:00:17 +02:00
FinnStutzenstein
956cd05119
Adding TypeError( fixes #2424 )
2016-09-23 14:50:21 +02:00
Maximilian Krambach
e8fa0eca5a
New calculate percentage options (fixes issue #2182 )
2016-09-23 14:45:49 +02:00
Norman Jäckel
26f615fed4
Merge pull request #2426 from FinnStutzenstein/Issue2420
...
Fixing the projector sidebar on firefox (closes #2420 )
2016-09-23 14:45:25 +02:00
Finn Stutzenstein
d13e11beb1
New ui element for comments in config ( closes #2348 )
2016-09-23 14:37:13 +02:00
Norman Jäckel
dc404d21f6
Implemented need_full_update check. Fixed #2396 .
2016-09-23 14:36:26 +02:00
FinnStutzenstein
8a73ce1be5
Fixing the projector sidebar on firefox ( closes #2420 )
2016-09-23 14:34:31 +02:00
FinnStutzenstein
448756f17a
Docx export with docxtemplater
2016-09-23 14:20:07 +02:00
Norman Jäckel
53ac7c2348
Merge pull request #2117 from lesteenman/extendedMediaFileSupport
...
Initial attempt at support for image and video files.
2016-09-22 23:28:00 +02:00
Norman Jäckel
7ee80074c8
Merge pull request #2128 from lesteenman/privateMediafiles
...
Add a 'private' flag to mediafiles.
2016-09-22 23:16:50 +02:00
Emanuel Schütze
2495d7dd7f
Merge pull request #2412 from FinnStutzenstein/Issue2109
...
Agenda duration and estimated time (closes #2109 )
2016-09-22 22:40:23 +02:00
Norman Jäckel
17ddef67f7
Merge pull request #2410 from FinnStutzenstein/projectorScale
...
Allow to scale the projector in the projectorcontainer greater than 100%
2016-09-22 22:01:28 +02:00
Norman Jäckel
926516ac65
Small style changes.
2016-09-22 21:59:36 +02:00
FinnStutzenstein
970f42cacb
Agenda duration and estimated time ( closes #2109 )
2016-09-22 21:59:35 +02:00
Erik Steenman
514eea2105
Add support for image and video files.
2016-09-22 19:03:27 +02:00
FinnStutzenstein
ceb9e70f6e
Updating lodash ( fixes #2293 )
2016-09-22 12:34:53 +02:00
FinnStutzenstein
457f8735d0
Allow to scale the projector in the projectorcontainer greater than 100%
2016-09-22 11:26:42 +02:00
Norman Jäckel
cab53f0434
Moved custom slides to own app topics for better app structure.
...
Renamed model to Topic. Added migrations file. Fixed #2402 .
2016-09-21 15:00:23 +02:00
Norman Jäckel
53c4932171
Merge pull request #2360 from FinnStutzenstein/Issue2347
...
Highlighting and jumping to lines
2016-09-21 14:58:08 +02:00
FinnStutzenstein
c3e511628f
Confirm multiple deletions ( fixes #2399 )
2016-09-21 14:43:46 +02:00
Finn Stutzenstein
a06806c33b
Highlighting and jumping to lines in motions ( closes #2347 )
2016-09-21 13:58:39 +02:00
Norman Jäckel
2d15bd54a1
Merge pull request #2386 from FinnStutzenstein/sidebarScroll
...
First attempt to scroll the projector sidebar
2016-09-21 12:40:13 +02:00
Norman Jäckel
96b4fb9fd9
Merge pull request #2376 from tsiegleauq/issue2300-pdf-line-numbers
...
Add line numbers to pdf (fixes #2300 )
2016-09-20 21:15:25 +02:00
Emanuel Schuetze
875b7b2ddd
Reduced font-size of outline numbers.
2016-09-20 16:57:57 +02:00
Sean Engelhardt
cc5ff21005
Add line numbers to pdf ( fixes #2300 )
2016-09-20 11:34:19 +02:00
FinnStutzenstein
9347a78d56
Make the sidebar scroll and one typofix
2016-09-19 09:05:55 +02:00
Norman Jäckel
858f4a2b43
Merge pull request #2405 from emanuelschuetze/fixAlerts
...
Fixed syntax of all uib-alerts.
2016-09-18 22:54:29 +02:00
Emanuel Schuetze
2a825adde4
Disable projector auto reload after 5 minutes.
...
Auto reload no longer used because client gets all required data
after reconnection via websocket.
2016-09-18 22:34:54 +02:00
Emanuel Schuetze
a7f5d4dd3c
Fixed syntax of all uib-alerts.
...
Required after ui-bootstrap upgrade.
2016-09-18 21:09:37 +02:00
Erik Steenman
b48a99f21b
Add a 'private' flag to mediafiles.
...
Only users with the 'mediafiles.can_see_private' permission can create
and view these private mediafiles.
2016-09-18 15:45:54 +02:00
Norman Jäckel
00913a6333
Added management command to change config values. Fixed #2400 .
2016-09-18 13:17:21 +02:00
Emanuel Schütze
3bfa055aed
Merge pull request #2385 from FinnStutzenstein/Issue2384
...
Confirm multiple deletions (fixes #2384 )
2016-09-18 12:26:45 +02:00
Norman Jäckel
76250c5851
Changed loading of JavaScript files.
2016-09-18 11:23:51 +02:00
Emanuel Schütze
cdf6b79a36
Updated confirm message.
2016-09-18 11:03:30 +02:00
Emanuel Schuetze
852b175f3e
Upgraded a lot of javascript libs.
...
Some template fixes required for upgrading ui-bootstrap.
2016-09-18 00:45:00 +02:00
Oskar Hahn
6abb0976c2
Change system for autoupdate on the projector ( #2394 )
...
* Second websocket channel for the projector
* Removed use of projector requirements for REST API requests.
Refactored data serializing for projector websocket connection.
* Refactor the way that the projector autoupdate get its data.
* Fixed missing assignment slide title for hidden items.
* Release all items for item list slide and list of speakers slide. Fixed error with motion workflow.
* Created CollectionElement class which helps to handle autoupdate.
2016-09-17 22:26:23 +02:00
Emanuel Schuetze
d1458dcca1
Fixed motion form to save form with default text ( Fixes #2069 ).
...
Use workaround: Added 'novalidate' to motion form. Otherwise user
can't save form if text editor field contains default value.
2016-09-17 15:45:59 +02:00
Norman Jäckel
5f65830d47
Reconnect autoupdate after some migrations. Fixed #2377 .
2016-09-17 13:36:32 +02:00
Norman Jäckel
27223c35d9
Merge pull request #2364 from CatoTH/motion-detail-behaviour-services
...
Move inline editing methods into a separate service
2016-09-17 12:17:31 +02:00
Norman Jäckel
7998df03a3
Merge pull request #2382 from FinnStutzenstein/2350
...
Option to generate multiple new passwords (closes #2350 )
2016-09-17 12:05:30 +02:00
Emanuel Schuetze
8e3463b1df
Use ui-sref instead of ng-click (with $state.go).
...
For agenda item list and detail template.
2016-09-17 11:44:33 +02:00
Norman Jäckel
ca9c946b6f
Merge pull request #2390 from emanuelschuetze/agend-item-check
...
Template checks if user has no permission to see agenda items.
2016-09-17 11:00:53 +02:00
Norman Jäckel
f8610dad96
Merge pull request #2389 from emanuelschuetze/motionCommentFixes2
...
Motion comment permission fixes on server and client.
2016-09-17 10:58:36 +02:00
Norman Jäckel
429fdb31fa
Merge pull request #2383 from FinnStutzenstein/Issue2335
...
Unprivileged users don't see ban icon (fixes #2335 )
2016-09-17 10:57:04 +02:00
Emanuel Schuetze
c55e55e91b
Template checks if user has no permission to see agenda items.
2016-09-17 10:17:40 +02:00
Emanuel Schuetze
485c6ece87
Motion comment permission fixes on server and client.
...
- Show motion comment fields in form also for users without can_manage but with
can_see_and_manage_comments permission.
- Ignore comments data if user is not allowed to send comments (in create view).
2016-09-16 23:35:37 +02:00
Norman Jäckel
d7936c53e3
Updated settings files. Fixed timezone support.
2016-09-16 21:17:00 +02:00
FinnStutzenstein
bdeeb53f9b
Confirm multiple deletions ( fixes #2384 )
2016-09-15 14:48:03 +02:00
FinnStutzenstein
3720fd1b0d
Right test for false ( fixes #2335 )
2016-09-13 13:19:51 +02:00
FinnStutzenstein
42f723f3cb
Option to generate multiple new passwords ( closes #2350 )
2016-09-13 12:52:50 +02:00
Tobias Hößl
2605239244
Move inline editing methods into a separate service
2016-09-08 19:22:09 +02:00
Emanuel Schütze
2753af3585
Merge pull request #2277 from FinnStutzenstein/FeatureCSV
...
Improved motions table with CSV export
2016-09-08 14:47:54 +02:00
Finn Stutzenstein
a05a29c99a
A new motions table with csv export
2016-09-08 14:38:32 +02:00
Norman Jäckel
ddc1f5d0b9
Merge pull request #2367 from emanuelschuetze/motionCommentFixes
...
Fixes and template improvements for motion comments.
2016-09-08 13:24:08 +02:00
Norman Jäckel
b661a6e215
Merge pull request #2370 from normanjaeckel/Issue2315
...
Migration for new permission matrix
2016-09-08 13:20:49 +02:00
Norman Jäckel
25d3b6d552
Merge pull request #2368 from matakuka/motionComment
...
Moved MotionComment factory to base.js.
2016-09-08 12:00:10 +02:00
Norman Jäckel
cd3c470919
Changed migration coding style.
2016-09-08 11:40:58 +02:00
Maximilian Krambach
bcd15d2691
moved MotionComment factory to base.js
2016-09-08 11:25:03 +02:00
Emanuel Schuetze
9ed37c00af
Fixes and template improvements for motion comments.
...
Fixed erros while creating motion as anonymous user.
2016-09-08 11:18:56 +02:00
Finn Stutzenstein
4ffe2b5a80
Migration for new permission matrix
2016-09-08 08:38:17 +02:00
Norman Jäckel
1cdcad7d47
Fixed bug in templateHook directive. Fixed #2362 .
2016-09-08 00:58:02 +02:00
Norman Jäckel
f2c17f1787
Added password hasher settings. Fixed #2354 .
2016-09-08 00:13:01 +02:00
Norman Jäckel
4bed8f6c11
Added recommendations for motions.
...
Also changed label of former state 'commited a bill' to 'refered to committee'. Fixed #2342 .
2016-09-07 23:46:38 +02:00
Norman Jäckel
ab845b4137
Added generic fields for comments for motions.
2016-09-07 20:43:00 +02:00
Emanuel Schütze
34f85da1d8
Merge pull request #2352 from FinnStutzenstein/Issue2349
...
Fixing resolving of Config for projector resolution (fixes #2349 )
2016-09-07 20:10:53 +02:00
Norman Jäckel
261b23affa
Merge pull request #2326 from tsiegleauq/issue2301
...
Limit image scale in pdf documents (fixes #2301 )
2016-09-06 16:41:58 +02:00
sean
23b7d74890
create ballot papers with pdfmake ( fixes #2298 )
2016-09-06 16:08:25 +02:00
Finn Stutzenstein
fd78ccdb01
Fixing resolving of Config for projector resolution ( fixes #2349 )
2016-09-06 12:09:50 +02:00
Norman Jäckel
0fddfdd25a
Merge pull request #2356 from emanuelschuetze/fix
...
Fixed missing translation and form errors.
2016-09-06 00:33:40 +02:00
Emanuel Schuetze
d7b092300d
Fixed missing translation and form errors.
2016-09-05 23:13:07 +02:00
Tobias Hößl
a341071e91
Line-Breaking Bugfix: break before an inline element if the first word of the element exceeds the current line
2016-09-05 20:31:43 +02:00
Tobias Hößl
b701127f04
Fix a styling problem
2016-09-05 20:03:41 +02:00
Norman Jäckel
b4d4026316
Refactored user serializers for different client permissions. See #1871 .
2016-09-05 13:48:06 +02:00
Norman Jäckel
29f9203377
Merge pull request #2314 from FinnStutzenstein/Issue2137
...
new change password view (fixes #2137 )
2016-09-05 13:46:15 +02:00
Maximilian Krambach
8ec5cd3ccd
new fullscreen icon ( fixes #2316 )
2016-09-05 09:25:39 +02:00
Finn Stutzenstein
9d3b06c0a6
new change password view ( fixes #2137 )
2016-09-05 07:56:28 +02:00
Emanuel Schuetze
7abdc2e615
Increase the allowed characters for event name config to 100.
...
Same limit as event_description.
2016-09-01 15:32:59 +02:00
Norman Jäckel
c87111e81d
Merge pull request #2318 from FinnStutzenstein/projectorSize
...
Control the resolution of the projector
2016-09-01 14:59:53 +02:00
Finn Stutzenstein
a8dcc2abdc
Control the resolution of the projector
2016-08-31 14:18:29 +02:00
Norman Jäckel
31e47e0ac5
Merge pull request #2308 from FinnStutzenstein/Issue1213
...
Handle duplicates during user import (fixes #1213 )
2016-08-31 13:05:03 +02:00
Norman Jäckel
08c6fa11b4
Merge pull request #2291 from normanjaeckel/MotionAmendment
...
Reimplemented amendments for motions.
2016-08-31 12:39:48 +02:00
Finn Stutzenstein
78ec30d6b2
Handle duplicates during user import
2016-08-31 12:23:38 +02:00
Emanuel Schuetze
e87eb930df
Use neutral (untranslated) prefix for amendments.
...
Reason: Server cannot use the on client-side translated prefix string.
2016-08-31 12:05:33 +02:00
Emanuel Schuetze
24b95e5fbc
Scale image size also in detail and projector view.
2016-08-31 09:58:26 +02:00
sean
33f463599a
limit image scale in pdf documents ( fixes #2301 )
2016-08-30 12:54:55 +02:00
Norman Jäckel
09aa2dea72
Review.
2016-08-29 17:15:44 +02:00
Norman Jäckel
6fba75c78b
Reimplemented amendments for motions.
2016-08-29 17:14:40 +02:00
Norman Jäckel
ac6d78b0ee
Fixed groups metadata view. Upgraded to djangorestframework 3.4.x. Fixed #2275 .
2016-08-29 17:06:33 +02:00
Norman Jäckel
9fdc050048
Merge pull request #2330 from normanjaeckel/FixAutoupdate
...
Fixed autoupdate for deleted instances. Fixed #2329 .
2016-08-29 16:59:28 +02:00
Norman Jäckel
70dfe8f525
Merge pull request #2331 from emanuelschuetze/issue2182b
...
Motion config: 'calculate % without abstains' (Fixes #2182 )
2016-08-29 16:59:12 +02:00
Emanuel Schuetze
65b0772556
Some clean up and styling work for motion config 'without abstains'.
...
Manage all config strings in site.js of each app.
2016-08-29 16:40:27 +02:00
Norman Jäckel
3ea46e9dc7
Fixed autoupdate for deleted instances. Fixed #2329 .
2016-08-29 16:37:53 +02:00
Emanuel Schuetze
344d9329f9
Added template hook for each poll in assignment detail.
2016-08-29 16:26:13 +02:00
Maximilian Krambach
fc1ce3d90d
added option to calculate % based on Yes/No (for motions) ( fixes #2182 )
2016-08-29 13:07:57 +02:00
Emanuel Schuetze
f0ca4a0d98
Added template hook for assignment poll form.
2016-08-26 06:33:27 +02:00
Emanuel Schütze
6efbe7b210
Merge pull request #2255 from matakuka/search_filter
...
Added search filtering by category (fixes #2019 , fixes #2239 )
2016-08-25 17:53:55 +02:00
Maximilian Krambach
e06b4db664
Added search filtering by category ( fixes #2019 , fixes #2239 )
2016-08-25 17:49:36 +02:00
Maximilian Krambach
3221ce18f6
new view for current list of speakers ( fixes #2212 )
2016-08-25 17:35:57 +02:00
Emanuel Schütze
acf24a26ee
Merge pull request #2313 from emanuelschuetze/update-translations
...
Updated translations for DE, ES, PT (used by JS, Django).
2016-08-25 17:29:43 +02:00
Maximilian Krambach
126cfb9000
Parent items for Agenda items ( fixes #2213 )
2016-08-25 13:51:54 +02:00
Emanuel Schuetze
cfdb90f6a7
Updated translations for DE, ES, PT (used by JS, Django).
2016-08-25 09:34:58 +02:00
Emanuel Schuetze
1d0dacbc2d
Fixed and updated EN translations.
2016-08-24 16:55:56 +02:00
Emanuel Schuetze
841feaba92
Updated EN translations
2016-08-24 16:04:01 +02:00
Norman Jäckel
e9c5194a17
Merge pull request #2303 from emanuelschuetze/template-hook
...
Added new template hook for motion detail template.
2016-08-24 09:35:27 +02:00
Emanuel Schütze
5a092710c9
Merge pull request #2286 from FinnStutzenstein/Issue2075
...
Fixing motion CSV import (fixes #2075 , fixes #2165 )
2016-08-23 23:17:32 +02:00
Emanuel Schuetze
984282deac
Added new template hook for motion detail template.
2016-08-23 23:08:17 +02:00
Finn Stutzenstein
0c5726b5d4
Fixing CSV import ( fixes #2075 , fixes #2165 )
2016-08-22 16:01:57 +02:00
Emanuel Schütze
73095948ca
Merge pull request #2260 from FinnStutzenstein/Feature435
...
New matrix interface for group editing (closes #435 )
2016-08-22 15:26:10 +02:00
Finn Stutzenstein
bf3a1ce714
New matrix interface for group editing ( closes #435 )
2016-08-22 15:05:06 +02:00
Tobias Hößl
d986d551e0
Line numbers and inline editing
2016-08-20 11:18:17 +02:00
Norman Jäckel
5ea9cbf4d1
Merge pull request #2289 from emanuelschuetze/motionpdf
...
Minor motion PDF improvements.
2016-08-19 22:42:56 +02:00
Emanuel Schuetze
8a329a81e6
Minor motion PDF improvements.
2016-08-19 22:13:12 +02:00
Norman Jäckel
70a732bce8
Merge pull request #2280 from normanjaeckel/TemplateHook
...
Added template hooks for plugins.
2016-08-19 21:13:55 +02:00
Norman Jäckel
c38cf562d5
Added template hooks for plugins.
2016-08-19 21:08:54 +02:00
Thomas Junk
92a541215f
pdfmake incl. fixes
2016-08-19 16:21:46 +02:00
Thomas Junk
546c4e65f6
PDFMake implemented
2016-08-19 14:10:30 +02:00
Finn Stutzenstein
cd1a2735dc
fixes an important typo in category sort
2016-08-19 09:17:28 +02:00
Finn Stutzenstein
ee95af9acc
Added a possibility to sort and renumber all motions in a category
2016-08-18 14:54:09 +02:00
Emanuel Schütze
71c3aa5d5e
Merge pull request #2273 from normanjaeckel/NumberingCategories
...
Added possibility to sort motions in category numbering view.
2016-08-17 08:55:19 +02:00
Oskar Hahn
ff658a59c1
The start command uses only one worker ( #2271 )
...
Fixes #2198 after https://github.com/andrewgodwin/channels/pull/298 is
part of the next channels release
2016-08-17 07:48:59 +02:00
Norman Jäckel
b0070d13b9
Added possibility to sort motions in category numbering view.
2016-08-16 23:51:12 +02:00
Norman Jäckel
91ebfbac61
Merge pull request #2272 from ostcar/missing_migrations
...
Added missing migrations for #2269 .
2016-08-16 00:22:47 +02:00
Norman Jäckel
aea602acb9
Merge pull request #2256 from ostcar/fix_2248
...
Only do an autoupdate after an ongoing transaction.
2016-08-16 00:14:15 +02:00
Oskar Hahn
8d58368937
Added missing migrations for #2269
2016-08-15 19:15:05 +02:00
Emanuel Schütze
243ef7ae5d
Merge pull request #2257 from FinnStutzenstein/Issue2249
...
No crash without a browser (fixes #2249 )
2016-08-15 09:47:17 +02:00
Oskar Hahn
ee2f6b500b
Only do an autoupdate after an ongoing transaction.
...
This needs at least django 1.9
Fixes : #2248
2016-08-13 10:08:10 +02:00
Oskar Hahn
fac9e71c29
Remove default permissions for session
...
fixes #2262
2016-08-13 07:37:27 +02:00
Emanuel Schütze
d2c5646ce4
Merge pull request #2254 from matakuka/mini_issues
...
Repairs assignment ballots for candidates with structure_level
2016-08-09 20:43:33 +02:00
Emanuel Schütze
320de66783
Merge pull request #2261 from emanuelschuetze/config-translations
...
Fixed missing translations of config options (Fixes #2193 )
2016-08-09 20:18:49 +02:00
Emanuel Schuetze
282bc45790
Fixed missing translations of config options ( Fixes #2193 , fixes #2245 )
2016-08-09 17:06:24 +02:00
Norman Jäckel
9813edf490
Merge pull request #2252 from ThomasJunk/mediafix
...
Added static media handling (Fixes 2223)
2016-08-09 16:03:22 +02:00
Thomas Junk
dec7cb9002
Added static media handling ( Fixes #2223 )
...
Now DEBUG compatible
Commit fe64941aab
replaced former use of tornado as webserver with django channels.
During this, the additional routing path for /media/ was forgotten.
This is now fixed.
Due to the routing scheme, the static URLS were added beforehand.
Adding it afterwards does not work.
2016-08-09 14:56:18 +02:00
Finn Stutzenstein
12af0256dd
No crash without a browser ( fixes #2249 )
2016-08-09 08:22:04 +02:00
Emanuel Schütze
54ee068057
Merge pull request #2243 from FinnStutzenstein/master
...
Fixing issue #2127
2016-08-05 16:13:19 +02:00
Finn Stutzenstein
b115691675
Messages now allow HTML tags ( Fixes #2127 )
2016-08-05 12:38:19 +02:00
Maximilian Krambach
350a60722c
repairs ballots for candidates with structure_level
2016-08-05 09:53:10 +02:00
Norman Jäckel
81bcb19847
Merge pull request #2221 from matakuka/issue2214
...
Added user field "number" (fixes #2214 )
2016-08-04 10:21:17 +02:00
Emanuel Schütze
6cec9e9f87
Merge pull request #2251 from normanjaeckel/WooshAsync
...
Used whoosh.writing.AsyncWriter. See #2198 .
2016-08-03 21:42:58 +02:00
Maximilian Krambach
371945e36e
adding user field "number" ( fixes #2214 )
2016-08-03 16:55:03 +02:00
Norman Jäckel
7f1b894db4
Used whoosh.writing.AsyncWriter. See #2198 .
2016-08-03 16:46:52 +02:00
Norman Jäckel
f191956dd9
Fixed error in autoupdate. See #2248 .
2016-08-03 16:12:52 +02:00
Norman Jäckel
e688a345c0
Merge pull request #2230 from emanuelschuetze/remove-assignment-config
...
Remove unused assignment config to publish winner results only.
2016-08-03 15:58:35 +02:00
joelmacht
19592f1eea
Add tags for assingments
2016-08-03 14:48:12 +02:00
Maximilian Krambach
f2f7ddf072
translations issue #2197
2016-08-01 16:23:20 +02:00
Norman Jäckel
d3cd2d72dc
Merge pull request #2225 from normanjaeckel/NumberCategories
...
Added viewpoint to number all motions in a category.
2016-07-29 12:30:09 +02:00
Emanuel Schuetze
8d52d4a1c6
Remove unused assignment config to publish winner results only. ( Fixes #2145 )
2016-07-29 12:29:53 +02:00
Norman Jäckel
646540ee17
Merge pull request #2233 from emanuelschuetze/motionOrigin
...
Use origin field in motion detail and list view (Fixes #2227 )
2016-07-29 12:16:19 +02:00
Norman Jäckel
7e6dc50b39
Added viewpoint to number all motions in a category.
2016-07-29 11:56:12 +02:00
Emanuel Schuetze
88715646ba
Show user fields is_committee and is_active in list view. ( Fixes #2217 )
...
New icon for is_committee and is_active.
Check is_committee field for csv import.
2016-07-29 11:37:51 +02:00
Norman Jäckel
4b9767b09e
Added new user field is_committee and new default group Committees.
2016-07-29 11:37:51 +02:00
Emanuel Schütze
aca01c466c
Merge pull request #2222 from matakuka/issue2210
...
add "delete all speakers" button (feature, issue #2210 )
2016-07-28 11:11:31 +02:00
Maximilian Krambach
589137ece7
add "delete all speakers" button ( fixes #2210 )
2016-07-28 10:51:33 +02:00
Emanuel Schuetze
af16733b36
Use origin field in motion detail and list view ( Fixes #2227 )
2016-07-27 16:16:22 +02:00
Emanuel Schütze
45321b6139
Merge pull request #2226 from normanjaeckel/MotionOrigin
...
Added motion origin field.
2016-07-27 16:14:31 +02:00
Emanuel Schuetze
8208f44108
Updated German translations.
2016-07-27 14:10:04 +02:00
Norman Jäckel
0b9a64f968
Added motion origin field.
2016-07-13 14:45:40 +02:00
Norman Jäckel
2627724c55
Merge pull request #2199 from matakuka/noBrowserLanguage
...
sets language to en if no browser language is set
2016-07-11 14:19:14 +02:00
Norman Jäckel
207db4de89
Merge pull request #2186 from tsiegleauq/issue2164
...
Add translatable entries for QuickEdit (Fixes #2164 )
2016-07-10 23:24:36 +02:00
Maximilian Krambach
31df629fc9
sets language to en if no browser language is set
2016-07-06 09:52:32 +02:00
Sean Engelhardt
520f8362fa
Add translatable entries for QuickEdit ( Fixes #2164 )
2016-06-28 14:06:46 +02:00
Emanuel Schuetze
31657d0cf3
Fixed and update English translation strings.
2016-06-28 10:18:43 +02:00
Emanuel Schuetze
31c509f288
Updated EN source translation files.
2016-06-20 21:03:43 +02:00
Norman Jäckel
b45e0ea09f
Fixed coding style.
2016-06-16 10:28:14 +02:00
Maximilian Krambach
a5a00a7eda
Config translations moved to client side (Issue #2093 )
2016-06-12 11:46:46 +02:00
Emanuel Schütze
7a94b6511b
Merge pull request #2189 from matakuka/YesNoVotes
...
adding option "yes/no for each candidate"
2016-06-12 11:11:10 +02:00
Joel Macht
b7d83e786f
Fix linebreak on tags, add spacing and remove commas ( Fixes #2147 )
2016-06-10 18:17:42 +02:00
Maximilian Krambach
3157ac59f2
adding option "yes/no for each candidate"
2016-06-10 14:13:01 +02:00
Oskar Hahn
fe64941aab
Big Mode for OpenSlides
...
Uses django channels instead of tornado for the autoupdate. Therefore
tornado is nolonger a dependency of OpenSlides (but channels).
This uses websockets instead of SockJS.
Use the flag insecure in the start command to provide static files serving.
Use a new session backend that has a ForeignKey to User.
2016-06-09 11:14:39 +02:00
Maximilian Krambach
5061ea1770
typo fixing (issue #2181 )
2016-06-08 22:18:35 +02:00
Maximilian Krambach
649300cfb8
Add a back button to tag overview ( Fixed #2151 )
2016-06-08 16:41:27 +02:00
Norman Jäckel
a8595ab234
Merge pull request #2185 from tsiegleauq/issue2156
...
Fix pagination when agenda got >100 entrys (Fixes #2156 )
2016-06-08 10:45:07 +02:00
Norman Jäckel
13e7e1b1e1
Merge pull request #2176 from tsiegleauq/issue2133
...
Limit selection of files to csv and txt (Fixed #2133 )
2016-06-08 10:41:52 +02:00
Sean Engelhardt
235eed1172
Fix pagination when agenda got >100 entrys ( Fixes #2156 )
2016-06-07 14:17:36 +02:00
Sean Engelhardt
62310c83ae
Limit selection of files to csv and txt ( Fixed #2133 )
...
agenda, motions, users csv import
2016-06-07 11:34:02 +02:00
Norman Jäckel
294fb7ebc5
Fixed motion PDF if motions have no identifier. Fixed #2158 .
2016-06-06 14:26:16 +02:00
Norman Jäckel
8c5c5dc556
Fixed bug on config view.
2016-06-06 14:19:57 +02:00
Oskar Hahn
f2570551a1
Merge pull request #2175 from ostcar/config
...
Redesign of the config variables.
2016-06-04 01:12:50 +02:00
Oskar Hahn
2221b23447
Redesign of the config variables.
...
Removed the config cache and created files for each app in which the
config variables are defined.
2016-06-03 13:47:54 +02:00
Sean Engelhardt
d0c9450d02
Updated German translations ( Fixes #2132 )
2016-05-31 15:00:38 +02:00
Oskar Hahn
416c2646fe
Order speaker on projector
...
fixes #2138
2016-05-28 19:22:49 +02:00
Emanuel Schütze
61976f47f0
Merge pull request #2144 from normanjaeckel/SettingsFix
...
Fixed example text in settings.
2016-05-28 15:42:17 +02:00
Emanuel Schuetze
80b6dcc971
Updated Spanish translation.
...
Thanks to johnfelipe!
Fixed: Define missing Spanish translation in django settings file.
2016-05-25 09:58:55 +02:00
Norman Jäckel
253d615755
Fixed example text in settings.
2016-05-17 14:16:44 +02:00
Erik Steenman
4b7ba02b7d
Change the z-index of .fullscreen
to 100.
...
Z-Index 199 places the fullscreen content just below the various
projector overlays, such as messages and timers.
2016-05-10 14:51:30 +02:00
Norman Jäckel
e968c88cc1
Update version to 2.0.1-dev
2016-04-17 22:49:17 +02:00
Norman Jäckel
347cf478f8
Release 2.0
2016-04-17 22:49:17 +02:00
Emanuel Schuetze
e0b73ff68a
Use group_id instead of group in User form views
2016-04-17 22:42:56 +02:00
Emanuel Schuetze
e151e7c84c
Fix z-index of chatbox and projector sidebar.
2016-04-17 22:18:16 +02:00
Emanuel Schuetze
06d333c067
Template fixes for better smartphone usage.
...
- Remove on-focus-me directive on every list view.
(Otherwise smartphones/tablets opens always the keyboard on each list view.)
- Make some columns 'optional' in list view to see only the most important columns
on small devices.
- Add z-index for projector sidebar. Show it in full width on small
devices.
- Remove padding on small devices.
2016-04-17 19:56:38 +02:00
Emanuel Schuetze
7ebedb1fdd
Use always user.groups_id ( Fixes #2081 )
...
- Fix rest api: send always groups_id (instead of groups).
- Fix JS-Data-Store: Add hasMany relations for user.groups.
- Fix templates: use field 'groups_id' instead of 'groups'.
2016-04-14 22:13:28 +02:00
Emanuel Schuetze
9481d037e8
Reduce sizes of used logos.
2016-04-13 11:06:50 +02:00
Norman Jäckel
8d5e983d29
Merge pull request #2077 from emanuelschuetze/translations
...
Translations
2016-04-12 23:47:38 +02:00
Emanuel Schuetze
b8194a0b54
Updated all translations (angular-gettext).
2016-04-12 22:58:40 +02:00
Emanuel Schuetze
7229c8dc3a
Fix translation strings.
2016-04-12 22:47:46 +02:00
Emanuel Schuetze
7e5ea61b34
Hide candidate list if assignment phase is finished (2).
2016-04-12 22:41:15 +02:00
Emanuel Schuetze
f5125d0d23
Add content object (motion/election) in agenda sort view.
2016-04-12 22:33:53 +02:00
Emanuel Schuetze
07d95fd10a
Allow to show vote value '0' in motion poll result view.
2016-04-12 22:26:13 +02:00
Norman Jäckel
27c8d511f0
Used exit method from sys library. Fixed #2065 .
2016-04-07 00:43:53 +02:00
Emanuel Schuetze
cb605d619e
Mark missing translation string.
2016-04-03 11:53:40 +02:00
Norman Jäckel
331da7f300
Update version to 2.0-dev.
2016-03-21 21:13:52 +01:00
Norman Jäckel
5842ad86f4
Release 2.0b5
2016-03-21 21:13:28 +01:00
Norman Jäckel
d51652ff72
Merge pull request #2061 from emanuelschuetze/template-Fixes
...
Template fixes
2016-03-21 20:03:43 +01:00
Emanuel Schuetze
4b06fa225f
Updated all translations. ( Fixes #2043 )
...
Thanks to all translators of FR, PT, CS, ES and DE!
2016-03-21 19:57:45 +01:00
Emanuel Schuetze
0565d57789
Template fixes
...
- Fix config groups. Use group index instead of group names (with blanks).
- Use 100% width for all chosen fields.
2016-03-21 19:56:53 +01:00
Emanuel Schuetze
815f03145c
Use specific host and port for 'openslides start'. ( Fixes #1987 )
2016-03-21 00:06:15 +01:00
Emanuel Schuetze
fb0fd3fe8c
Updated EN translation resource files.
2016-03-20 23:31:13 +01:00
Norman Jäckel
6d62516499
Merge pull request #2056 from ostcar/master
...
Fix #2050
2016-03-20 21:22:11 +01:00
Norman Jäckel
e2383dc770
Merge pull request #2051 from emanuelschuetze/templateFixes2
...
Template improvements
2016-03-20 21:21:52 +01:00
Oskar Hahn
46ba039cd5
Fix #2050
2016-03-20 21:08:57 +01:00
Emanuel Schuetze
3479a0636e
Allow to enter countdown time in seconds or 'mm:ss' format.
2016-03-20 21:07:20 +01:00
Emanuel Schuetze
2af38f75bb
Fix edit current slide button.
2016-03-20 21:07:16 +01:00
Norman Jäckel
7cba7c42a4
Merge pull request #2055 from emanuelschuetze/fix2048
...
Catch JS error "this.getVersion(...) is undefined" (Fixes #2048 )
2016-03-20 21:06:39 +01:00
Emanuel Schuetze
85ffe4d8fa
Catch JS error "this.getVersion(...) is undefined" ( Fixes #2048 )
2016-03-20 20:52:34 +01:00
Norman Jäckel
5af25351fa
Merge pull request #2049 from emanuelschuetze/fix2028
...
Catch 404 errors in resolve promise if user has not all required permissions
2016-03-20 20:48:58 +01:00
Emanuel Schuetze
5e08e073f4
Fix translation strings in motions and users forms.
2016-03-19 13:06:36 +01:00
Emanuel Schuetze
0cd6bb272c
Projector template improvements
...
- Vertical centering event title (if no description available)
- Fix sorting of main agenda item list.
- Show countdowns side-by-side. Allow edit if countdown is running.
2016-03-19 07:30:18 +01:00
Emanuel Schuetze
03f08628c7
Catch 404 errors in resolve promise if user has not all required permissions.
...
- fix motion detail/list, agenda item detail, assignment list, mediafile list
- add fontpage permission check
- use agenda item title for motion title if available (to show item number)
- fix groupFilter reset in users list
- fix users permission string
Fixes #2028 . Fixes #2038 .
2016-03-18 21:41:16 +01:00
Emanuel Schuetze
9ab182184f
Updated EN translation JS resource.
2016-03-18 20:11:56 +01:00
Emanuel Schuetze
140869ebd7
Fix translation strings.
2016-03-18 20:11:04 +01:00
Emanuel Schuetze
89446ce4f6
Use angular-chosen instead of ui-select for better performance.
...
The jQuery select field from angular-chosen is used for all ui-select
fields. See https://github.com/leocaseiro/angular-chosen/
Use input delay on users filter field with 'debounce'.
Fixed #2006 .
2016-03-18 14:37:03 +01:00
Emanuel Schuetze
794fa9faf1
Updated EN translation JS resource file.
2016-03-17 12:48:06 +01:00
Emanuel Schuetze
ace335f7cc
Fix missing translation string.
2016-03-17 12:47:44 +01:00
Emanuel Schuetze
a8d9581664
Allow html in event name and description.
2016-03-14 17:09:37 +01:00
Emanuel Schuetze
1b25d9c376
Added loading spinner icon.
...
Only for loading resolve object from server.
2016-03-14 17:09:37 +01:00
Norman Jäckel
15119ab28b
Merge pull request #2041 from emanuelschuetze/fix2020
...
New configs for font color in header and h1 on projector (Fixes #2020 )
2016-03-08 23:16:28 +01:00
Emanuel Schuetze
b9fed84732
Updated EN language files.
2016-03-08 23:01:20 +01:00
Emanuel Schuetze
85326d75f2
New configs for font color in header and h1 on projector ( Fixes #2020 )
2016-03-08 23:01:17 +01:00
Emanuel Schuetze
f47055c13a
Fix 'stop' speech button in Safari ( Fixes #2029 )
...
Use '{}' instead of empty 'JSON.stringify()'.
2016-03-08 20:23:12 +01:00
Norman Jäckel
56936c86ab
Used bulk_create to create the initial projector during migration. Fixed #2035 .
2016-03-07 19:09:45 +01:00
Norman Jäckel
ce3576f306
Merge pull request #2034 from emanuelschuetze/fix2005
...
Fix main menu on small devices (Fixes #2005 )
2016-03-07 19:00:08 +01:00
Emanuel Schütze
2097121e45
Merge pull request #2030 from normanjaeckel/FixAgendaGetQueryset
...
Fixed get_queryset method of ItemViewSet. Fixed #2027 .
2016-03-06 22:48:50 +01:00
Emanuel Schuetze
876d9408fe
Fix main menu on small devices ( Fixes #2005 )
...
Use bootstraps navbar-toggle button to bring up a
vertical responsive main menu.
Some additional responsive CSS impmprovements.
2016-03-06 20:14:52 +01:00
Norman Jäckel
78565ffd25
Updated migrations.
2016-03-06 14:36:50 +01:00
Norman Jäckel
132c6e81ec
Forwarding JSON instead of Django model instances to autoupdate loop.
...
- Used raw SQL for createing default projector during inital migration.
- Removed default_password and hidden agenda items from autoupdate data for some users.
- Removed old get_collection_and_id_from_url() function.
2016-03-06 14:24:53 +01:00
Norman Jäckel
4daa61888f
Massive refactoring for autoupdate optimization.
2016-03-06 14:22:40 +01:00
André Böhlke
3db2f2fc16
"durchstich" for autoupdate optimization
2016-03-06 14:22:40 +01:00
Norman Jäckel
e598b308f0
Merge pull request #2033 from emanuelschuetze/fix1949
...
Allow pdf scrolling on projector (Fixes #1949 ).
2016-03-06 14:19:06 +01:00
Emanuel Schuetze
b78c9bc7bd
Allow pdf scrolling on projector ( Fixes #1949 ).
2016-03-05 22:44:00 +01:00
Emanuel Schuetze
921ec3ab72
Remove 'can_see_extra_data' permission from registered and anonymous groups.
...
Now, only staff users has this permission by default. (Fixed #2004.)
Some more work on users/groups template:
- Added description to permission string to show that only 'present' and
'comment' fields are affected by this permission.
- Allowed to create groups without permissions.
- Fixed showing group names in users lists view for staff and normal users.
2016-03-05 22:12:29 +01:00
Norman Jäckel
bc93b61a02
Fixed get_queryset method of ItemViewSet. Fixed #2027 .
2016-03-04 11:48:20 +01:00
Emanuel Schuetze
7029852043
Template fixes
...
- switch projector live view minimize/maximize buttons
- show agenda/item split buttons (project only main agenda items, project subitem)
only if subitems are available
2016-03-03 08:46:18 +01:00
Norman Jäckel
7da48efd4c
Fixed TypeError in agenda views. Fixed #2023 .
2016-03-03 00:23:41 +01:00
Norman Jäckel
3c6d4d5e30
Fixed gulp jshint task.
2016-03-02 16:51:40 +01:00
Norman Jäckel
de871f3f9c
Squished migrations files.
2016-03-02 14:26:47 +01:00
Norman Jäckel
ca3cfae8b3
Changed name of '--development' option and name of the respective directory. Fixed #2001
2016-03-01 17:38:14 +01:00
Emanuel Schütze
8d1de6923b
Merge pull request #2017 from normanjaeckel/FixMotionPoll
...
Fixed error in motion poll serializer. Fixed #2014 .
2016-02-28 00:21:04 +01:00
Norman Jäckel
bc49f00c66
Fixed error in motion poll serializer. Fixed #2014 .
2016-02-27 21:34:26 +01:00
Norman Jäckel
872d73b5cf
Merge pull request #2016 from normanjaeckel/GetContext
...
Rename and refactor some ProjectorElement methods. Fixed #1631 .
2016-02-27 21:24:18 +01:00
Norman Jäckel
a2a6637c89
Rename and refactor some ProjectorElement methods. Fixed #1631 .
2016-02-27 20:56:03 +01:00
Emanuel Schuetze
1d314db487
Show special vote values for motion polls on projector.
2016-02-27 20:10:24 +01:00
Norman Jäckel
9fbb12944c
Updated start script help text and custom commands. Fixed #1987 .
2016-02-25 23:17:04 +01:00
Emanuel Schütze
2b239f2214
Merge pull request #2003 from emanuelschuetze/fix1820
...
Reload after login and logout (Fixes #1820 )
2016-02-25 13:51:44 +01:00
Emanuel Schuetze
a6be43809f
Agenda list slide improvements
...
- project summary of selected item
- show full tree OR main agenda items only
- show done items grey (without icon)
2016-02-25 13:37:59 +01:00
Emanuel Schuetze
d3d73a019d
Fix translations in group detail template.
2016-02-25 13:37:55 +01:00
Emanuel Schuetze
06f7515ca4
Reload after login and logout ( Fixes #1820 )
...
Not very nice solution but with DS.clear() we have to do a lot of more
work with high effort. Can improved later.
2016-02-25 10:22:05 +01:00
Emanuel Schütze
88b2e8a73e
Merge pull request #2000 from normanjaeckel/VotesQuery
...
Optimized number of queries for motion serializing. Fixed #1655 .
2016-02-24 11:10:11 +01:00
Norman Jäckel
758180e7cc
Optimized number of queries for motion serializing. Fixed #1655 .
2016-02-24 10:30:52 +01:00
Norman Jäckel
544b28cacf
Fixed coding style in some JS files. Fixed #1979 .
2016-02-24 09:56:27 +01:00
Norman Jäckel
e57a83f45b
Merge pull request #1997 from emanuelschuetze/fix1817
...
Get success message in user edit form when default password is resetted
2016-02-24 00:45:05 +01:00
Emanuel Schütze
0cbb3fba01
Merge pull request #1996 from normanjaeckel/LanguageHeader
...
Added language header to internal server requests. Fixed #1981 .
2016-02-23 23:54:44 +01:00
Emanuel Schuetze
bed96f66b0
Get success message in user edit form when default password is resetted ( Fixes #1817 ).
2016-02-23 23:51:42 +01:00
Norman Jäckel
73cc1a5dfb
Merge pull request #1995 from emanuelschuetze/fix1991
...
Add/Remove a group to selected users (Fixes #1991 )
2016-02-23 23:37:57 +01:00
Norman Jäckel
3ea4c507cf
Added language header to internal server requests. Fixed #1981 .
2016-02-23 23:19:38 +01:00