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

3965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Norman Jäckel
a6870eec3d Merge pull request #2621 from FinnStutzenstein/motionBlockLayout 
fixing motion block list layout
 2016-11-11 13:21:10 +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
Emanuel Schütze
31f29bdfc9 Merge pull request #2601 from boehlke/master 
Add new command for adding users.
 2016-11-10 12:50:08 +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
André Böhlke
161ce5a509 cleanup build dependencies (wget, pip and apt package cache) 2016-11-09 19:10:40 +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
5ea5f86aba Merge pull request #2603 from emanuelschuetze/angular-csv-import 
Freeze angular-csv-import version to 0.0.36.
 2016-11-08 22:38:59 +01:00
Norman Jäckel
2fae952edd Fixed group update method. Fixed #2541. 2016-11-08 22:36:57 +01:00
Emanuel Schütze
7de5892ba3 Freeze angular-csv-import version to 0.0.36. 
0.0.37 breaks button in template.
 2016-11-08 22:14:12 +01:00
Emanuel Schütze
3b2b267e0f Merge pull request #2602 from normanjaeckel/FixFQueryProblem 
Fixed zoom and scroll, fixed #2547.
 2016-11-08 21:50:15 +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
3c34f9feea Merge pull request #2600 from emanuelschuetze/update-translations-3 
Updated German translations.
 2016-11-08 14:42:59 +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
4c08bca34a Merge pull request #2582 from emanuelschuetze/fix-mergeconflict 
Fix merge conflict in core/base.js
 2016-11-04 12:11:09 +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
2966fa91ff Merge pull request #2579 from emanuelschuetze/fix-projector 
Fix regression with projector loading.
 2016-11-02 14:18:49 +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