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

4579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
9e5b0f270d Merge pull request #2577 from emanuelschuetze/de-translation-update 
Updated German translations.
 2016-11-02 09:19:06 +01:00
Emanuel Schütze
c5ffa13436 Updated German translations. 2016-11-02 09:06:55 +01:00
Emanuel Schütze
842ff93ffb Merge pull request #2572 from emanuelschuetze/translation-resources-3 
Updated template-en.po resource.
 2016-11-02 00:29:32 +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
Norman Jäckel
047697d0ae Merge pull request #2536 from emanuelschuetze/2.1-dev 
Use version 2.1-dev.
 2016-10-27 23:07:34 +02:00
Emanuel Schütze
2a36a0e84e Use version 2.1-dev. 2016-10-27 14:10:20 +02:00
Emanuel Schütze
4d48f2d8a5 Merge pull request #2533 from normanjaeckel/FixHelpText 
Fixed error in README and help texts of start script. Fixed #2532.
 2016-10-26 15:08:29 +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
Norman Jäckel
12f7f20d8c Merge pull request #2528 from emanuelschuetze/fix-assignment-detail 
Fix to show election results without ng-init.
 2016-10-25 11:21:07 +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
Emanuel Schütze
6a1fc01a38 Merge pull request #2524 from normanjaeckel/FixMigrations 
Fixed migrations by skipping autoupdate.
 2016-10-24 19:22:49 +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