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

3330 Commits

Author SHA1 Message Date
Emanuel Schütze
1d6326fb1b Removed unused ubuntu fonts (from old pdf generation). 2017-03-05 22:40:38 +01:00
Emanuel Schütze
d92328674a Fixed iframeoverlay and missing ErrorMessage. 2017-03-05 22:27:14 +01:00
Emanuel Schütze
2d65ecbc3a Updated all translations. 
Added Russia as new language.
 2017-03-05 22:25:48 +01:00
Emanuel Schütze
c6ced4e4a0 Merge pull request #3051 from emanuelschuetze/issues-2142 
Excluded already elected persons for new ballot (Fixed #2142)
 2017-03-05 21:30:35 +01:00
Emanuel Schütze
ff840ab3c6 Excluded already elected persons for new ballot (Fixed #2142) 
- Reorder assignment ballot tabs in detail template.
- Removed logic to set phase automatically to 'finished' if
  elected candidates reached, because autoupdate makes it unreliable.
 2017-03-05 21:25:22 +01:00
Norman Jäckel
4c2b13a142 Merge pull request #3052 from emanuelschuetze/mobile-theme 
Responsive design improvements
 2017-03-05 20:34:50 +01:00
Norman Jäckel
32aaa28637 Merge pull request #3050 from CatoTH/bugfix-inline-diff-when-replacing-paragraphs 
Improve the diff when a paragraph is replaced by another one
 2017-03-05 20:25:43 +01:00
Norman Jäckel
6525b79774 Merge pull request #3047 from emanuelschuetze/projector-control 
Inscreased projector scroll distance.
 2017-03-05 20:23:56 +01:00
Norman Jäckel
0ca8fa57ed Merge pull request #3046 from CatoTH/Projector-Diff-View-Line-Numbers 
Bugfix for missing line numbers in diff view in the projector
 2017-03-05 20:23:35 +01:00
Norman Jäckel
16743cd9b8 Merge pull request #3044 from CatoTH/Issue3027-LineNumberingBugfix 
Handle STRIKE-tags correctly in line numbering - fixes #3027
 2017-03-05 20:22:59 +01:00
Norman Jäckel
659c7858eb Merge pull request #3043 from emanuelschuetze/category-sort-template 
Added motion detail links to category sort view.
 2017-03-05 20:22:40 +01:00
Norman Jäckel
1fdb3a4f2a Merge pull request #3042 from emanuelschuetze/3028 
Improved go to line number tooltip/popup. (#3028)
 2017-03-05 20:20:25 +01:00
Norman Jäckel
a33d504c6b Merge pull request #3040 from CatoTH/Issue3024-Escaping-of-HTML-elements 
Bugfix for #3024 - escaping HTML tags
 2017-03-05 20:19:24 +01:00
Emanuel Schütze
f67afd1823 Responsive design improvements 
- Reduce search bar on small devices.
- Use separate projector sidebar for small devices.
- motion detail toolbar: show line number mode and change recommendation
  controls as dropdown (for small/extra small devices) or as
  button group (for medium/large devices).
 2017-03-05 00:30:00 +01:00
Tobias Hößl
6577287e26 Improve the diff when a paragraph is replaced by another one 2017-03-04 20:48:18 +01:00
Emanuel Schütze
65d93d1b66 Inscreased projector scroll distance. 
Allows faster scrolling for long slides.
 2017-03-04 16:52:27 +01:00
Tobias Hößl
0022df2aff Bugfix for missing line numbers in diff view in the projector 2017-03-04 16:42:02 +01:00
Tobias Hößl
c8006588c5 Handle STRIKE-tags correctly in line numbering 2017-03-04 16:17:48 +01:00
Emanuel Schütze
fa395d6cc2 Added motion detail links to category sort view. 2017-03-04 16:07:05 +01:00
Emanuel Schütze
a9144b6d5b Improved go to line number tooltip/popup. (#3028) 2017-03-04 16:00:54 +01:00
Tobias Hößl
e698d81f9f Bugfix for #3024 - escaping HTML tags 2017-03-04 15:51:33 +01:00
Emanuel Schütze
3903be5d6b Fixed switching between motion versions (Fixed #2363) 
- Show correct text and reason for selected version.
- Disable inline editing after save (otherwise inline mode is still
  active when user change version)
 2017-03-03 17:03:32 +01:00
Emanuel Schütze
95c19159f8 Merge pull request #3026 from CatoTH/bugfix-line-numbering-diff 
Several bug fixes in the diff
 2017-03-03 15:26:44 +01:00
Tobias Hößl
74f40395d9 Several bug fixes in the diff 2017-03-03 15:16:51 +01:00
Norman Jäckel
cc6d2a6ca9 Merge pull request #3035 from FinnStutzenstein/Issue3003 
Always provide the list of speakers (closes #3003)
 2017-03-03 14:53:55 +01:00
Emanuel Schütze
91cb124918 Merge pull request #3018 from FinnStutzenstein/ErrorMessages 
Error messages and global messaging service (closes #2949)
 2017-03-03 14:52:00 +01:00
FinnStutzenstein
9c89f4d59c Error messages and global messaging service (fixes #2949, fixes #1774) 2017-03-03 14:36:31 +01:00
FinnStutzenstein
9fbbfe0f50 Always provide the list of speakers (closes #3003) 2017-03-03 14:35:55 +01:00
Norman Jäckel
4744e1ca99 Merge pull request #3034 from FinnStutzenstein/TemplateFixes 
Small template improvements
 2017-03-03 14:23:05 +01:00
FinnStutzenstein
606c17ef43 Small template improvements 2017-03-03 11:53:33 +01:00
Norman Jäckel
5a821ecf49 Fixed use of PATCH and PUT. Fixed #1871. 2017-02-27 17:20:57 +01:00
Norman Jäckel
96cbf17e72 Merge pull request #3015 from emanuelschuetze/fix-topic-form 
Fixed forms (added missing operator).
 2017-02-27 15:18:49 +01:00
Emanuel Schütze
65fcd8e9d6 Fixed forms (added missing operator). 
Also:
- Move motion state filter to 2nd filter position (as in detail view).
- Open dropdown filter of state and recommendation on left side.
 2017-02-27 10:02:43 +01:00
Emanuel Schütze
7630553303 Workaround to prevent screen jumps in assignment detail (Fixed #2555). 
Fixed also unexpected ballot creation while uib-tab updates.
Now button instead of tab is used for creating new ballot.
 2017-02-24 22:33:23 +01:00
Emanuel Schütze
e063ab8fe8 Updated EN and DE translations files. 2017-02-24 16:20:42 +01:00
Emanuel Schütze
2215d7159a Merge pull request #3001 from emanuelschuetze/user-profile 
Reduced user profile form
 2017-02-24 16:04:39 +01:00
Emanuel Schütze
04223b0107 Merge pull request #3009 from FinnStutzenstein/ClosManagement 
Manageview for Current list of speakers(closes #3007)
 2017-02-24 16:03:01 +01:00
FinnStutzenstein
c093796a17 Manage view for Current list of speakers (closes #3007) 2017-02-24 15:48:08 +01:00
Emanuel Schütze
6b74bf635d Merge pull request #2993 from emanuelschuetze/motion-poll-log 
Added motion log entry for creating polls.
 2017-02-24 15:44:53 +01:00
Emanuel Schütze
e67d67a07f Merge pull request #3006 from FinnStutzenstein/Issue2894 
hide 'show as agenda item' for non authorized users (fixes #2894)
 2017-02-24 15:44:25 +01:00
Emanuel Schütze
045c65de49 Merge pull request #3008 from FinnStutzenstein/Issue2636 
Remove scrolling to a line on projector (closes #2636)
 2017-02-24 15:38:18 +01:00
Emanuel Schütze
5d38ca8c68 Merge pull request #3005 from FinnStutzenstein/Issue3004 
Fixing create view for amendments (fixing #3004)
 2017-02-24 15:37:46 +01:00
Emanuel Schütze
4ebc238ea2 Added motion log entry for creating polls. 
Use timezone support for motion log time.
 2017-02-24 15:31:26 +01:00
Norman Jäckel
5b4ca84306 Removed restricted fields from PUT request where a users wants to update himself. Fixed #2986 and #2984. 2017-02-24 15:22:55 +01:00
FinnStutzenstein
8a8755f22d Fixing create view for amendments (fixing #3004) 2017-02-24 15:16:12 +01:00
FinnStutzenstein
803f9dba96 Remove scrolling to a line on projector (closes #2636) 2017-02-24 10:31:48 +01:00
FinnStutzenstein
1c1a2bef09 hide 'show as agenda item' for non authorized users (fixes #2894) 2017-02-24 10:15:28 +01:00
Emanuel Schütze
7de2f5c79c Reduced user profile form 2017-02-22 23:31:50 +01:00
Emanuel Schütze
bf0b5d5062 Added 'reject all change recommendations' button. 2017-02-22 23:08:46 +01:00
Emanuel Schütze
4168153ba3 Added extension for state and recommendation names in dropdown. 2017-02-22 21:31:47 +01:00
Emanuel Schütze
7f08a09497 Merge pull request #2992 from FinnStutzenstein/CleanUp 
Collection name to CamelCase (fixes #2983)
 2017-02-22 19:44:49 +01:00
FinnStutzenstein
5374b2f398 Collection name to CamelCase (fixes #2983) 2017-02-22 19:12:38 +01:00
Emanuel Schütze
60ebac9f8b Merge pull request #2994 from FinnStutzenstein/Improvements 
Usability improvements
 2017-02-22 19:03:42 +01:00
FinnStutzenstein
da89bf5a83 Usability improvements 2017-02-22 16:58:52 +01:00
Emanuel Schütze
8ff247b555 Allowed to export/import initial user password. 2017-02-22 08:38:14 +01:00
Emanuel Schütze
e1075eb24d Minor fixes from previous pull request reviews. 2017-02-21 15:56:41 +01:00
Norman Jäckel
4d3a45c8fb Merge pull request #2991 from emanuelschuetze/css-fixes 
CSS improvements for projector sidebar on small devices.
 2017-02-20 20:39:22 +01:00
Norman Jäckel
ebf9278b79 Merge pull request #2990 from emanuelschuetze/fixProjection 
Fix motion projection.
 2017-02-20 20:38:59 +01:00
Emanuel Schütze
acf996a720 CSS improvements for projector sidebar on small devices. 2017-02-20 19:46:44 +01:00
Emanuel Schütze
d79cea9a8b Fix motion projection. 2017-02-20 18:44:37 +01:00
Norman Jäckel
1e9c7273ae Merge pull request #2987 from emanuelschuetze/issue2963 
Fixed placement of 'back' button in motion block view (Fixed #2963).
 2017-02-18 00:06:00 +01:00
Emanuel Schütze
a06d969dc3 Updated translation resources and German translations. 2017-02-17 23:21:54 +01:00
Emanuel Schütze
58f499283f Fixed translation strings. 2017-02-17 23:21:50 +01:00
Emanuel Schütze
e4bd44082d Fixed placement of 'back' button in motion block view (Fixed #2963). 2017-02-17 22:32:17 +01:00
Emanuel Schütze
6bad8e8cc6 Merge pull request #2973 from FinnStutzenstein/Dialogs 
Dialogs for some views
 2017-02-17 22:20:59 +01:00
Norman Jäckel
e35e65b7d4 Merge pull request #2985 from normanjaeckel/AgendaSortCheck 
Added check for hierarchical loops in agenda sort view. See #2972.
 2017-02-17 22:08:23 +01:00
Emanuel Schütze
9ae1d7e59a Show allert in sort template if agenda sort request failed. 2017-02-17 21:59:13 +01:00
Norman Jäckel
582915a019 Merge pull request #2981 from emanuelschuetze/fix-motion-block-projector 
Send also motion.state.workflow to motion block slide.
 2017-02-17 21:44:56 +01:00
Emanuel Schütze
06e9ffc819 Send also motion.state.workflow to motion block slide. 
to show recommendation names in slide template
 2017-02-17 21:10:46 +01:00
Norman Jäckel
aa14ac99b3 Added check for hierarchical loops in agenda sort view. See #2972. 2017-02-17 17:20:30 +01:00
Norman Jäckel
56420aa0f5 Merge pull request #2982 from emanuelschuetze/recommendation-config 
Added new config for default change recommendation view.
 2017-02-17 16:33:36 +01:00
Norman Jäckel
935a2a7245 Merge pull request #2980 from emanuelschuetze/pdf-worker-fix 
Fixed placeholder replacement in pdf worker.
 2017-02-17 16:29:09 +01:00
Norman Jäckel
ee66ee3d72 Merge pull request #2979 from FinnStutzenstein/Issue2951 
fixing #2951
 2017-02-17 16:28:26 +01:00
Norman Jäckel
8adbb1218f Merge pull request #2978 from FinnStutzenstein/MotionBlockAutoupdate 
Fixing MotionBlock autoupdate and added projector button (fixes #2958)
 2017-02-17 16:27:22 +01:00
Emanuel Schütze
768ee9236a Added new config for default change recommendation view. 
Use this default view for motion catalog pdf and motion detail view.
 2017-02-17 16:03:00 +01:00
Emanuel Schütze
a804362e16 Fixed placeholder replacement in pdf worker. 
Make it more dynamic by searching recursively.
 2017-02-17 15:11:28 +01:00
FinnStutzenstein
735dbcf109 Better dialog handling. Many fixes. 2017-02-17 14:58:35 +01:00
FinnStutzenstein
a5398a491c fixing #2951 2017-02-17 14:54:32 +01:00
Emanuel Schütze
9a1e45682c Merge pull request #2976 from FinnStutzenstein/templateFixes 
Update mediafile form
 2017-02-17 13:58:49 +01:00
FinnStutzenstein
0e401e7223 Fixing MotionBlock autoupdate and added projector button (fixes #2958) 2017-02-17 13:49:55 +01:00
Emanuel Schütze
0075c23225 Merge pull request #2977 from emanuelschuetze/issue2967 
Fixed margin-top of motion change recommendation line tooltip.
 2017-02-17 13:21:54 +01:00
Emanuel Schütze
09ae3c3425 Fixed margin-top of motion change recommendation tooltip (Fixed #2967). 2017-02-17 13:17:24 +01:00
Norman Jäckel
28a5c9ecaf Merge pull request #2974 from emanuelschuetze/pdf-layout 
Motion PDF improvements
 2017-02-17 13:11:15 +01:00
FinnStutzenstein
a765f5cb0e Update mediafile form 2017-02-17 12:43:50 +01:00
Emanuel Schütze
75949cb01c Fixed IntegrityError while creating groups with postgres (Fixed #2960). 
Use ng-submit for group form template.
 2017-02-17 12:06:07 +01:00
Emanuel Schütze
46f6bbb907 Motion PDF improvements 
* Use consistent lineheight (1.25) in PDF (also for lists).
* set default value of motions_line_length config to 90.
* Reduce footer height.
* Use identifier in filename only if available.

Added missing translation string.
 2017-02-17 10:48:27 +01:00
Norman Jäckel
0319799aff Merge pull request #2891 from normanjaeckel/CamelCase 
Added support for CamelCase to RESTModelMixin. See #2480.
 2017-02-16 21:09:13 +01:00
Emanuel Schütze
d595e28d09 Merge pull request #2969 from CatoTH/Issue2961-bugfix 
Solving two bugs in the diff - for #2961
 2017-02-16 14:59:51 +01:00
Norman Jäckel
89192236fc Added support for CamelCase to RESTModelMixin. See #2480. 2017-02-16 13:31:57 +01:00
Emanuel Schütze
0da7765dc0 Merge pull request #2968 from normanjaeckel/StaticDir 
Fixed write settings command for Windows portable version. Fixed #2947.
 2017-02-15 22:57:05 +01:00
Emanuel Schütze
7a73b30189 More layout fixes for motion diff view slide. 
- Fixed wrong text order.
- Improved change summary box.
 2017-02-15 22:40:18 +01:00
Tobias Hößl
8029492d91 Bugfix: layout of diff view on the projector 2017-02-15 21:36:30 +01:00
Tobias Hößl
afff1f35f8 Solving two bugs in the diff 2017-02-15 20:23:29 +01:00
Emanuel Schütze
be342f752f Merge pull request #2966 from emanuelschuetze/issue2956 
Send only data to client which user is allowed to see (Fixed #2956).
 2017-02-15 20:18:45 +01:00
Emanuel Schütze
ae6496852e Merge pull request #2959 from emanuelschuetze/issue2954 
Added missing topic text to agenda csv export (Fixed #2954).
 2017-02-15 20:18:01 +01:00
Norman Jäckel
1a53c7c3cc Fixed write settings command for Windows portable version. Fixed #2947. 2017-02-15 17:07:59 +01:00
Emanuel Schütze
3e92799838 Send only data to client which user is allowed to see (Fixed #2956). 
Fixed get_restricted_data functions for motion and mediafiles.
 2017-02-15 16:51:44 +01:00
Emanuel Schütze
aa0791fc34 Added missing topic text to agenda csv export (Fixed #2954). 2017-02-15 14:46:25 +01:00
Sean Engelhardt
4eefde839b pdf w.o linen numbers and change rec. (fixes #2962) 2017-02-15 14:23:28 +01:00
Oskar Hahn
26b7f2879c Let CollectionElement fail early 
Fixes #2835
Fixes #2904
 2017-02-12 14:15:58 +01:00
Emanuel Schütze
1c79e2c8ee Update version to 2.1b4-dev 2017-02-10 23:40:18 +01:00
Emanuel Schütze
2aae6d43eb Release 2.1b3 2017-02-10 23:39:52 +01:00
Emanuel Schütze
75fa1fdb7b Merge pull request #2945 from emanuelschuetze/assignment-projector-fix 
Fixed outdated assignment phases variable in projetor.js.
 2017-02-10 23:36:15 +01:00
Emanuel Schütze
67b5b4ca32 Updated German translations. 2017-02-10 23:28:38 +01:00
Emanuel Schütze
41b30d70b6 Fixed outdated assignment phases variable in projetor.js. 
Removed wrong translation string.
 2017-02-10 23:26:38 +01:00
Emanuel Schütze
1230f4a29a New full text search on client-side (Fixed #2865). 
Removed server-side search by whoosh.
 2017-02-10 22:52:08 +01:00
Emanuel Schütze
311b134d81 Merge pull request #2939 from FinnStutzenstein/Encoding 
Added UTF-8 byte order mark for csv export
 2017-02-10 21:23:09 +01:00
FinnStutzenstein
30a3382bd1 Added UTF-8 byte order mark for csv export and global csv separator config 2017-02-10 20:47:57 +01:00
Norman Jäckel
97de8cf785 Merge pull request #2942 from FinnStutzenstein/Issue2864 
check if startup promise is resolved
 2017-02-10 14:25:19 +01:00
FinnStutzenstein
8f613177cb check if startup promise is resolved 2017-02-10 10:23:46 +01:00
FinnStutzenstein
b73c50a4f9 Fixed missing <p> tags for motion import and some improvements. 2017-02-10 09:11:45 +01:00
Norman Jäckel
160333beea Merge pull request #2931 from FinnStutzenstein/Issue2669 
Reorganize the current list of speakers. Fixes #2669 and find()-calls
 2017-02-09 20:06:43 +01:00
FinnStutzenstein
3c36cd5757 Reorganize the current list of speakers. Fixes #2669 and find()-calls. 2017-02-07 12:24:54 +01:00
Emanuel Schütze
eb0d34d212 Merge pull request #2937 from FinnStutzenstein/Issue2560 
Inline edit the ballot description (closes #2560)
 2017-02-07 12:00:56 +01:00
FinnStutzenstein
38279f4895 Inline edit the ballot description (closes #2560) 2017-02-07 11:53:09 +01:00
Emanuel Schütze
b4eff0ea1a Updated German translations. 2017-02-07 09:16:12 +01:00
Emanuel Schütze
f66e551eaa Merge pull request #2936 from FinnStutzenstein/MotionReason 
Set resaon on save with CKEditor (fixes #2934)
 2017-02-06 17:29:09 +01:00
FinnStutzenstein
bacadd6931 Set resaon on save with CKEditor (fixes #2934) 2017-02-06 14:50:51 +01:00
Emanuel Schütze
12b50a0d68 Merge pull request #2935 from emanuelschuetze/motion-pdf-subtitle 
PDF Layout improvements
 2017-02-06 14:44:06 +01:00
Norman Jäckel
2e410599bb Merge pull request #2932 from emanuelschuetze/fix-category-numbering 
Fixed motion numbering in category sort view.
 2017-02-06 14:29:19 +01:00
Emanuel Schütze
80b9ce138f PDF Layout improvements 
- Added parent motion into subtitle of motion pdf.
  (for amendments only).
- Adapted page margin and footer.
- Use same line height also for outside line numbering.
- Add more margin-top for motion reason heading.
 2017-02-06 14:22:13 +01:00
Emanuel Schütze
f238125a23 Fixed motion numbering in category sort view. 
Removed blanks if MOTION_IDENTIFIER_WITHOUT_BLANK is True.
 2017-02-06 12:11:50 +01:00
Emanuel Schütze
341916123c Fix word-wrap for long motion identifier in Firefox. 2017-02-03 14:02:36 +01:00
Emanuel Schütze
3ca254c88e Show/hide internal items in agenda sort view. 2017-02-03 12:50:57 +01:00
Emanuel Schütze
e7ee8fbc07 Fixed some minor template styles. 
Use always css class 'btn-sm' for buttons and 'input-sm' for inputs in
list and detail templates for consistent appearance.
 2017-02-03 12:50:57 +01:00
Emanuel Schütze
bbd8782c4c Fix 'follow recommendation for all motions' function. 
in motion block detail view
 2017-02-03 12:50:52 +01:00
Norman Jäckel
6f05fc09ce Merge pull request #2929 from FinnStutzenstein/Issue2927 
Fixing merge conflicts (fixes #2927)
 2017-02-03 11:54:21 +01:00
Norman Jäckel
aade91cead Merge pull request #2926 from emanuelschuetze/issue-2923 
Fixed dynamic pdf header and footer for worker (Fixed #2923).
 2017-02-03 11:53:34 +01:00
Emanuel Schütze
3d60238ce1 Fixed dynamic pdf header/footer and table border (Fixed #2923). 
Updated pdfmake to 0.1.25.
Fixed some pdf style issues.
Updated gulp watch task.
 2017-02-03 11:33:46 +01:00
FinnStutzenstein
4bc9a26c4c Fixing merge conflicts (fixes #2927) 2017-02-03 08:40:48 +01:00
Norman Jäckel
8c53b53a9d Added server side sort view for agenda items. See #2452. 2017-02-01 14:23:59 +01:00
Emanuel Schütze
bcff33330c Merge pull request #2922 from normanjaeckel/Console 
Removed console.log call.
 2017-02-01 13:36:00 +01:00
Norman Jäckel
9ff9ac92be Removed console.log call. 2017-02-01 12:55:26 +01:00
Norman Jäckel
b6db7d481b Merge pull request #2895 from FinnStutzenstein/Issue2885 
Possibility to send extra startup data (closes #2885)
 2017-02-01 11:45:21 +01:00
FinnStutzenstein
aed18205c4 showing config save status (closes #2842) 2017-01-31 18:54:02 +01:00
FinnStutzenstein
49e32d8e57 Possibility to send extra startup data (closes #2885) 2017-01-31 13:17:42 +01:00
Emanuel Schütze
c8cd1a7210 Merge pull request #2917 from FinnStutzenstein/Worker 
Use workers for pdf generation
 2017-01-31 12:02:43 +01:00
FinnStutzenstein
e1b4c1fc68 Used worker for pdf generation. 
Moved pdfmake.createPdf() into a web worker thread to prevent
blocking UI and max_script_runtime error in browser.

Used gulp to manage separate worker files (pdf-worker and pdf-worker-lib).
 2017-01-30 23:03:29 +01:00
Emanuel Schütze
f5fab05388 Merge pull request #2920 from emanuelschuetze/fixAssignmentVoteOrder 
Fixed wrong order of assignment votes caused by redis cache.
 2017-01-30 22:57:45 +01:00
Emanuel Schütze
83e16b0b09 Fixed wrong order of assignment votes caused by redis cache. 2017-01-30 21:33:41 +01:00
Emanuel Schütze
39037af662 Merge pull request #2896 from FinnStutzenstein/Issue2871 
Prevent XSS-attacks (fixes #2871)
 2017-01-30 21:11:46 +01:00
FinnStutzenstein
d55d374211 Prevent XSS-attacks (fixes #2871) 2017-01-30 21:04:41 +01:00
Oskar Hahn
6b5c329605 Fix the migration of the groups. 
Fixes #2915
 2017-01-27 11:59:31 +01:00
Emanuel Schütze
1d969838f2 Update version to 2.1b3-dev 2017-01-26 21:47:11 +01:00
Emanuel Schütze
e2fb1a60a1 Release 2.1b2 2017-01-26 21:46:21 +01:00
Emanuel Schütze
f10a3ffcb3 Merge pull request #2913 from emanuelschuetze/translations 
Updated translations (CS, ES, PT, FR).
 2017-01-26 21:42:57 +01:00
Emanuel Schütze
8234340a0c Merge pull request #2909 from ostcar/rework_auth 
Created a function to convert anything possible to a user-collection-element or None
 2017-01-26 21:42:40 +01:00
Emanuel Schütze
b3800ad873 Updated translations (CS, ES, PT, FR). 2017-01-26 21:37:29 +01:00
Norman Jäckel
ad937aecb3 Typos and small changes. 2017-01-26 21:35:26 +01:00
Emanuel Schütze
c36835a40e Merge pull request #2910 from emanuelschuetze/redis-prefix 
Use custom redis prefix for asgi and cache entries.
 2017-01-26 21:24:05 +01:00
Oskar Hahn
5dcfc69ff8 Update settings.py.tpl 
Also the last line of a dict should end with a ',' or with the closing }
 2017-01-26 21:17:36 +01:00
Emanuel Schütze
98e6f703e1 Use custom redis prefix for asgi and cache entries. 
Note: These prefix have to be unique for each OpenSlides instance!
 2017-01-26 21:17:32 +01:00
Norman Jäckel
2872cd437c Fixed bug in motion set_identifier method. Fixed #2911. 2017-01-26 21:03:10 +01:00
Oskar Hahn
2daafa8db9 Created a function to convert anything possible to a user-collectoin-element or None 
Changed user.has_perm(...) to has_perm(user, ...) at any place.

Removed old code
 2017-01-26 18:57:10 +01:00
Emanuel Schütze
8897e22df0 Merge pull request #2907 from emanuelschuetze/pagination 
Used better pagination for agenda, motions and users.
 2017-01-25 21:23:45 +01:00
FinnStutzenstein
35903cbe97 Watch perms in client (closes #1855) 2017-01-25 20:19:25 +01:00
Emanuel Schütze
df3e691734 Used better pagination for agenda, motions and users. 
to increase the browser performance while switching between apps.
 2017-01-25 19:51:51 +01:00
Norman Jäckel
df60700612 Merge pull request #2882 from normanjaeckel/ChannelSendWait 
Let channels' send method wait and retry if channel layer is full.
 2017-01-25 16:40:43 +01:00
Emanuel Schütze
0d30c72270 Added trim function for get_full_name/get_short_name. 
Required by submitter comparison for motion import.
 2017-01-25 14:38:51 +01:00
Norman Jäckel
e0d5f6d92f Merge pull request #2881 from ostcar/has_perm_with_id 
Changed the function has_perm to support an user id or None as the fi…
 2017-01-24 22:17:12 +01:00
Oskar Hahn
44474049c3 Added docstrings 2017-01-24 15:16:29 +01:00
Oskar Hahn
fccde8de11 Changed the function has_perm to support an user id or None as the first argument. 
Also fixt the case, where an anonymous user connects to the websocket connection.

Also added a function anonymous_is_enabled() to see, if the anyonmous user is enabled.

Added pip freeze to travis to see installed versions.
 2017-01-24 15:16:29 +01:00
FinnStutzenstein
40c2cdbe50 Fixing missing ballot resolver 2017-01-24 12:40:44 +01:00
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
Norman Jäckel
a724898ba3 Merge pull request #2875 from matakuka/removespeakers 
delete list of speaker error messages (closes #2237)
 2017-01-19 13:22:28 +01:00
Emanuel Schütze
8daaebbcd0 Updated translation resource and German translation file. 2017-01-19 10:43:04 +01:00
Emanuel Schütze
b2dfc9b44e Fixed translation strings. 2017-01-19 10:42:26 +01:00
Emanuel Schütze
52602d8330 Merge pull request #2884 from FinnStutzenstein/MotionProject 
Reorder projection of motions (fixes #2883)
 2017-01-18 19:07:01 +01:00
Norman Jäckel
f271d8bb47 Fixed error when running manage.py collectstatic. Fixed #2861. 2017-01-18 15:33:45 +01:00
Maximilian Krambach
929a7e5e89 delete list of speaker error messages (closes #2237) 2017-01-16 18:37:59 +01:00
FinnStutzenstein
2ac7df2ee6 Reorder projection of motions (fixes #2883) 2017-01-16 15:15:29 +01:00
FinnStutzenstein
bd0073d2f7 StartUp improvements 2017-01-16 14:32:10 +01:00
Norman Jäckel
bb8748a506 Let channels' send method wait and retry if channel layer is full. Fixed #2353. 2017-01-15 22:01:09 +01:00
Emanuel Schütze
e9e0280a13 Merge pull request #2878 from FinnStutzenstein/MotionProjectFix 
Hotfix for motion projection
 2017-01-15 13:42:06 +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
1672c2de66 Merge pull request #2872 from normanjaeckel/AgendaComment 
Fixed security issue #2850: Comments were shown for unprivileged users.
 2017-01-15 12:23:22 +01:00
Norman Jäckel
9250055e35 Merge pull request #2876 from emanuelschuetze/issue2763 
Adapted motion DOCX template.
 2017-01-15 12:21:27 +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
b419818b20 Hotfix for motion projection 2017-01-15 12:04:16 +01:00
Emanuel Schütze
986e8cc4f6 Adapted motion DOCX template (Fixed #2763). 2017-01-15 10:59:09 +01:00
FinnStutzenstein
a3b7b92239 smoothly scroll projector 2017-01-15 10:56:26 +01:00
Norman Jäckel
c6b1df9e24 Fixed security issue #2850: Comments were shown for unprivileged users. 2017-01-15 10:26:37 +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
Oskar Hahn
ebf686ef34 Send all data to the client at startup 2017-01-14 20:42:38 +01:00
FinnStutzenstein
397d659f0b New csv import for users and topics 2017-01-14 18:29:05 +01:00
Norman Jäckel
4b03a7ad5b Merge pull request #2831 from normanjaeckel/UserLoginTimestamp 
Skipped autoupdate for user during login. See #2804.
 2017-01-14 17:48:32 +01:00
Norman Jäckel
acab868c79 Quickfix for #2865. The problem is not completely solved. 2017-01-14 17:15:30 +01:00
Norman Jäckel
aefd5073a7 Skipped autoupdate for user during login. See #2804. 2017-01-14 16:45:14 +01:00
Norman Jäckel
560b820b57 Merge pull request #2855 from emanuelschuetze/issue2623 
Validates open posts field of assignment form (Fixes #2623)
 2017-01-14 16:16:35 +01:00
Emanuel Schütze
4faf580239 Validates open posts field of assignment form (Fixes #2623) 2017-01-14 15:30:02 +01:00
Norman Jäckel
286119108c Merge pull request #2860 from FinnStutzenstein/Issue2852 
adding permission checks
 2017-01-14 15:12:19 +01:00
Norman Jäckel
3600dd58f0 Merge pull request #2858 from emanuelschuetze/issue2142 
Assignment list: Used number of candidates, removed number of needed …
 2017-01-14 15:11:21 +01:00
Emanuel Schütze
527f949968 Assignment list: Used number of candidates, removed number of needed candidates (Fixes #2142) 2017-01-14 12:55:51 +01:00