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

3100 Commits

Author SHA1 Message Date
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
Emanuel Schütze
d76162e3b0 Increased the cache option MAX_ENTRIES from 1000 to 10000 (Fixes #2828). 2017-01-14 12:46:23 +01:00
FinnStutzenstein
794db79511 adding permission checks 2017-01-14 12:13:38 +01:00
Emanuel Schütze
458a7cf7c4 Merge pull request #2846 from normanjaeckel/MotionBlockSecu 
Fixed motion create view. Fixed #2506.
 2017-01-14 12:10:51 +01:00
Emanuel Schütze
8c4b38f018 Merge pull request #2847 from FinnStutzenstein/Issue2844 
Group order and hide internal items filter
 2017-01-14 11:39:51 +01:00
Emanuel Schütze
8c9bde27fb Merge pull request #2853 from normanjaeckel/ManagePy 
Added error message for unknown args. Fixed #2200.
 2017-01-14 11:39:17 +01:00
Norman Jäckel
a918361ec5 Fixed motion create view. Fixed #2506. 2017-01-14 11:38:20 +01:00
FinnStutzenstein
f092d6670d Group order, hide internal items filter, hide comment in agenda list view 2017-01-14 10:51:07 +01:00
Norman Jäckel
aa47ecbf8a Added error message for unknown args. Fixed #2200. 2017-01-14 10:48:41 +01:00
Emanuel Schütze
99a771ac6c Merge pull request #2845 from FinnStutzenstein/Issue2833 
Fixing user list view with restricted permissions (closes #2833)
 2017-01-14 10:47:12 +01:00
Norman Jäckel
663feff806 Merge pull request #2848 from emanuelschuetze/issue2421 
Added text to empty assignment poll result slide (Fixed #2421)
 2017-01-14 10:41:24 +01:00
Emanuel Schütze
35a5d4fe3b Merge pull request #2839 from FinnStutzenstein/Issue2838 
Fixing #2838
 2017-01-14 10:40:57 +01:00
Emanuel Schütze
113aac59b3 Added text to empty assignment poll result slide (Fixed #2421) 2017-01-14 10:21:19 +01:00
FinnStutzenstein
76e6bac422 Fixing #2838 2017-01-14 10:21:14 +01:00
FinnStutzenstein
c0f092d811 Fixing user list view with restricted permissions (closes #2833) 2017-01-14 09:57:45 +01:00
Norman Jäckel
d22dff2743 Merge pull request #2841 from flanagan/remove-summary 
Removed recommendation motion summary on slide.
 2017-01-13 21:32:50 +01:00
Meinert Leinigen
d133199a73 Removed Recommendation motion summary 2017-01-13 21:28:03 +01:00
Oskar Hahn
1dc671430a Fix channels 2017-01-13 20:53:06 +01:00
Oskar Hahn
728576d514 Performance improvements 
* Add caching support to users/group
* Add a function has_perm that works with the cache.
* Removed our session backend so other session backends (without the database) can be used
 2017-01-13 13:37:18 +01:00
FinnStutzenstein
b44b58393d Motion comments inline editing 2017-01-11 20:59:50 +01:00
Emanuel Schütze
a6807d77bf Added groups_id to management command 'createopenslidesuser'. 2017-01-11 13:46:56 +01:00
Emanuel Schütze
962c06c85f Merge pull request #2820 from FinnStutzenstein/Issue2667 
Change user import table
 2017-01-10 21:22:39 +01:00
Norman Jäckel
8e385199d5 Merge pull request #2826 from FinnStutzenstein/Issue2805 
Do not enable inline editing for non privileged users
 2017-01-10 21:13:52 +01:00
Oskar Hahn
97b21427aa Change the way that missing cache ids are found. 
This is probalby faster but in any way it maks debugging a lot easier. To go though
a big list in a for-loop is no fun at all.
 2017-01-10 20:50:44 +01:00
FinnStutzenstein
cf7033e033 Do not enable inline editing for non privileged users 2017-01-09 16:03:09 +01:00
Emanuel Schütze
17b951058b Merge pull request #2821 from emanuelschuetze/no-amendments 
Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.
 2017-01-09 14:33:57 +01:00
Emanuel Schütze
41124a53ca Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS. 
Set settings value to False to disable new amendment button in motion detail
template. Default: True.
 2017-01-09 14:25:28 +01:00
FinnStutzenstein
a9fbbb522e Change user import table 2017-01-09 14:22:32 +01:00
Norman Jäckel
58d8f68cc5 Merge pull request #2814 from FinnStutzenstein/ConfigEditor 
Use ckeditor in config
 2017-01-09 14:19:32 +01:00
Emanuel Schütze
6502f36a90 Merge pull request #2796 from FinnStutzenstein/Issue2548 
Project change recommendations
 2017-01-09 09:27:46 +01:00
Norman Jäckel
1a88f0985a Merge pull request #2818 from emanuelschuetze/motion-identifier-without-blanks 
Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS.
 2017-01-08 13:43:20 +01:00
FinnStutzenstein
e8fa488d60 Project change recommendations 2017-01-07 14:48:11 +01:00
FinnStutzenstein
4530a5faed Use ckeditor in config 2017-01-07 14:45:58 +01:00
Emanuel Schütze
f4d468a6f6 Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS. 
Allow to remove all whitespaces from motion identifier if settings
value is True. Default: False.
Example: "B 1 - Ä 1" -> "B1-Ä1"
 2017-01-06 21:38:08 +01:00
Emanuel Schütze
11c0b0cc3f Merge pull request #2816 from FinnStutzenstein/Issue2127 
Use ckeditor to edit projector messages
 2017-01-06 21:28:48 +01:00
FinnStutzenstein
c3fc7d0f1b Do not project more than one message 2017-01-06 19:48:37 +01:00
FinnStutzenstein
6e7321d2a3 disable edit button if it is not possible to edit 2017-01-06 14:51:27 +01:00
FinnStutzenstein
f37ad0f6c3 Use ckeditor to edit projector messages 2017-01-06 12:45:30 +01:00
Maximilian Krambach
a31ffd1009 print correct number of ballots (closes #2504) 2017-01-06 11:39:55 +01:00
Emanuel Schütze
cc0c0bf0d4 Merge pull request #2783 from FinnStutzenstein/PapaParse 
New csv import using PapaParse
 2017-01-06 11:33:06 +01:00
Norman Jäckel
c12d985ab6 Merge pull request #2810 from tsiegleauq/issue2665-qr-code-pdf 
Add QR code in user access list pdf (fixes #2665)
 2017-01-06 11:08:22 +01:00
FinnStutzenstein
f5fa3575df New csv import using PapaParse 2017-01-06 10:50:03 +01:00
Emanuel Schütze
388e6353cc Show qr codes in access data pdf only if config fields are set. 
Disable footer with page numbers.
 2017-01-04 22:43:17 +01:00
Sean Engelhardt
9abf9d5d57 Add QR codes to access data list (fixes #2665) 2017-01-04 15:50:20 +01:00
Maximilian Krambach
912dc1af8f Bind mediafile to projector scope (fixes #2706) 2016-12-29 11:37:56 +01:00
Norman Jäckel
900ddaabb3 Merge pull request #2803 from emanuelschuetze/participant-number2 
Added "No." for participant number in get_full_name().
 2016-12-21 12:33:12 +01:00
Emanuel Schütze
c79e779934 Added "No." for participant number in get_full_name(). 2016-12-21 12:08:37 +01:00
Norman Jäckel
7b0dca84d2 Merge pull request #2801 from FinnStutzenstein/Issue2754 
More select mode options for users
 2016-12-21 11:57:20 +01:00
Norman Jäckel
286643ddd2 Merge pull request #2797 from FinnStutzenstein/Issue2653 
projector language (closes #2653)
 2016-12-21 11:55:49 +01:00
Norman Jäckel
bfa0b4b3fe Merge pull request #2800 from FinnStutzenstein/Issue2748 
Consistent time handling and generic time converter code
 2016-12-21 11:52:47 +01:00
FinnStutzenstein
365c122edd More select mode options for users 2016-12-21 10:42:34 +01:00
FinnStutzenstein
f9f64b3e31 projector language (closes #2653) 2016-12-21 10:41:06 +01:00
FinnStutzenstein
6454853bf6 Consistent time handling and generic time converter code 2016-12-21 10:09:27 +01:00
Emanuel Schütze
be66a26353 Move participant number to the end of get_full_name(). 2016-12-21 08:59:50 +01:00
Emanuel Schütze
16ff9200a9 Merge pull request #2782 from FinnStutzenstein/AssignmentSort 
Sort candidates in assignments
 2016-12-19 19:47:38 +01:00
Emanuel Schütze
ff444eaa5d Merge pull request #2795 from CatoTH/Issue2777-pdf-problems 
Bugfix for PDF-export - fixes #2777
 2016-12-19 19:46:44 +01:00
Tobias Hößl
159720b983 Bugfix for PDF-export - fixes #2777 2016-12-19 16:17:36 +01:00
FinnStutzenstein
3b1ab265eb Sort candidates in assignments 2016-12-19 16:03:45 +01:00
FinnStutzenstein
a24b4aed99 cookie handling on login 2016-12-19 14:14:46 +01:00
Norman Jäckel
655a1b8f71 Update version to 2.1b2-dev 2016-12-16 23:54:23 +01:00
Norman Jäckel
789a3c308b Release 2.1b1 2016-12-16 23:54:23 +01:00
Emanuel Schütze
01ab52a637 Use Roboto Medium font for some more 'bold' classes. 2016-12-16 22:10:56 +01:00
Emanuel Schütze
82396a784d Fixing some remarks for CKEditor PR#2770 2016-12-16 21:43:19 +01:00
Tobias Hößl
08cb6a3d1b Bugfix for line numbering with CKeditor 2016-12-16 21:43:19 +01:00
Maximilian Krambach
58b8066249 Going back from TinyMCE to CKEditor 
- Update CKEditor toolbar
- CKEditor: new formating options and stripping empty paragraphs from imports
- fix for other clipboard html cases not beginning with 'p' tag
- Added RemoveFormat button to ckditor toolbar.
- Reorder bower.json
- inline editor and working on line numbers and language setting
- line numbering in inline edit
- changed allowed content, line number display, editor toggling
- included "justify" in ckeditor
- reload original text after ckeditor is disabled
- Reorder and extend ckeditor toolbar.
- fixed save button trigger and inserted a revert button
- set language on editor load (works for inline case only)
 2016-12-16 21:43:19 +01:00
Norman Jäckel
4ebb8023e3 Merge pull request #2776 from CatoTH/Issue2770-pdfmake-bugfix 
Bugfix for #2770
 2016-12-16 20:32:54 +01:00
Emanuel Schütze
abe6c0f589 Merge pull request #2786 from normanjaeckel/PatchInMediafile 
Changed PATCH to PUT for mediafile update. See #1871.
 2016-12-16 19:15:25 +01:00
Emanuel Schütze
cd89f72a17 Merge pull request #2778 from emanuelschuetze/inject-improvement 
Speed up autoupdates
 2016-12-16 19:12:45 +01:00
Emanuel Schütze
4b9be816b3 Speed up autoupdates 
Use 'bulk mode' for DS.inject by calling inject
only once per each collection.
 2016-12-16 18:55:24 +01:00
Norman Jäckel
75f4c55181 Removed viewpoint for Django url patterns. Fixed #1453. 2016-12-16 17:01:34 +01:00
Norman Jäckel
11e39e4ed8 Changed PATCH to PUT for mediafile update. See #1871. 2016-12-16 16:58:31 +01:00
Tobias Hößl
46cf26481e Bugfix for #2770 2016-12-14 22:28:44 +01:00
Norman Jäckel
1221ef4f02 Rearrange client mediafile app. 2016-12-14 17:16:42 +01:00
Norman Jäckel
deb5c5f4b3 Merge pull request #2774 from matakuka/language 
Change the language selector to the languages' own names
 2016-12-14 16:38:24 +01:00
Maximilian Krambach
0e6324b252 Change the language selector to the languages' own names 2016-12-14 15:25:38 +01:00
Sean Engelhardt
41ceb4ef9d add special voting values for missed options (fixes #2709) 2016-12-14 14:05:03 +01:00
Norman Jäckel
cebfbf5b8d Merge pull request #2633 from normanjaeckel/SquishMigrations 
Prepare migrations for 2.1b1.
 2016-12-13 23:28:56 +01:00
Emanuel Schütze
218b4bc7f4 Remove old countdowns and messages in core migrations. 2016-12-13 17:04:25 +01:00
Emanuel Schütze
78361308aa Updated EN+DE translations. 2016-12-13 12:20:14 +01:00
Norman Jäckel
3096958ba9 Prepare migrations for 2.1b1. 
Agenda, Assignments, Core, Mediafiles, Motions, Users.

Topics are already done.
 2016-12-13 11:58:36 +01:00
Norman Jäckel
c1d4927a9b Merge pull request #2764 from FinnStutzenstein/Issue2754 
More motion select mode options and layout changes for guests
 2016-12-13 11:57:51 +01:00
FinnStutzenstein
dbdaa9748c More motion select mode options and layout changes for guests 2016-12-13 11:27:44 +01:00
Norman Jäckel
6a58174e25 Merge pull request #2765 from FinnStutzenstein/Issue2451 
rename mediafiles private flag to hidden
 2016-12-13 11:15:53 +01:00
Emanuel Schütze
a9cc8fcb37 Some template style and translation fixes. 2016-12-12 20:30:50 +01:00
FinnStutzenstein
6bbbf30d94 rename mediafiles private flag to hidden 2016-12-12 16:23:31 +01:00
Norman Jäckel
99db9b71b7 Merge pull request #2760 from normanjaeckel/MotionTextIntro 
Added global config for motion preamble.
 2016-12-12 16:23:18 +01:00
Emanuel Schütze
32b7ddedce Template fixes for motion preamble (#2760). 2016-12-12 16:14:32 +01:00
Emanuel Schütze
2bf1b3d827 Merge pull request #2755 from normanjaeckel/StatePermission 
Fixed state flag required permission to see.
 2016-12-12 13:49:07 +01:00
Emanuel Schütze
8780c47fc1 Minor fixes (Fixes #2750) 
- Use <ul> instead of <ol> for candidate lists.
- Fix sorting by assignment_related_users.length in list view (Fixes #2750).
- Apply category and motion block for new amendments.
 2016-12-12 12:58:58 +01:00
Norman Jäckel
7772f60bd4 Added global config for motion preamble. 2016-12-12 12:51:27 +01:00
Norman Jäckel
6dc598800d Fixed state flag required permission to see. 2016-12-11 22:02:16 +01:00
Emanuel Schütze
116c3702f2 Updated German translations. 
Added missing translation filter.
 2016-12-11 13:37:26 +01:00
Emanuel Schütze
cd08f02949 Updated EN translation file. 2016-12-10 11:14:08 +01:00
Emanuel Schütze
43cdfd3836 Merge pull request #2752 from FinnStutzenstein/MotionState 
Adding 'done' option in motion state filter
 2016-12-09 22:36:32 +01:00
Emanuel Schütze
8289306569 Merge pull request #2746 from emanuelschuetze/fonts 
Use Roboto font in all templates.
 2016-12-09 22:26:38 +01:00
Emanuel Schütze
0bef3d751e Merge pull request #2742 from emanuelschuetze/missing-translations 
Mark missing translation strings in table headers.
 2016-12-09 15:22:03 +01:00
FinnStutzenstein
efaa00483c Adding 'done' option in motion state filter 2016-12-09 15:18:35 +01:00
Norman Jäckel
c2edf134e2 Merge pull request #2751 from FinnStutzenstein/Issue2747 
Some stylistic changes and new motion filter option
 2016-12-09 15:16:50 +01:00
Emanuel Schütze
358fd59d3c Merge pull request #2749 from FinnStutzenstein/Issue2666 
changing user import (closes #2666)
 2016-12-09 15:14:42 +01:00
Emanuel Schütze
f6d01c1d17 Mark missing translation strings in table headers. 2016-12-09 15:13:35 +01:00
Emanuel Schütze
fb7b265826 Use Roboto font in all templates. 
- Only install needed font files for Roboto and Roboto Condensed
  which strongly reduced the directory size of 'static/font'.
- Make it easier to adjust custom font by using global css font definition
  in app.css and projector.css.
- Remove Open Sans font.
 2016-12-09 15:10:31 +01:00
FinnStutzenstein
acba95f8a4 changing user import (closes #2666) 2016-12-09 15:02:32 +01:00
FinnStutzenstein
f7fcb69cc2 Some stylistic changes and new motion filter option 2016-12-09 14:58:15 +01:00
FinnStutzenstein
36c8477c7f no nav underline glitch 2016-12-09 13:51:23 +01:00
FinnStutzenstein
eca93594d7 Moving csv exports in seperate files (closes #2728) 2016-12-09 08:08:38 +01:00
Norman Jäckel
787805efa6 Merge pull request #2744 from tsiegleauq/issue2576-parsing-does-not-end 
add precise text decoration (fixes #2576)
 2016-12-07 22:14:49 +01:00
sean
b1f4def743 add precise text decoration (fixes #2576) 2016-12-07 21:41:55 +01:00
Emanuel Schütze
c363fff3ba Remove sidebox from assignment slide 
Feedback from serveral users: open posts and state are not very
useful on slide and should be removed.
 2016-12-07 21:00:13 +01:00
Emanuel Schütze
8bd03bafdb Rename first/last name to given name/surname (Fixes #2564). 2016-12-07 19:49:25 +01:00
Norman Jäckel
4e5adb74e3 Merge pull request #2739 from CatoTH/Issue2561-pdf-line-numbering-in-lists 
Attempt to mitigate the list / line number problem
 2016-12-07 11:34:50 +01:00
Norman Jäckel
b27a975075 Merge pull request #2737 from FinnStutzenstein/Issue2730 
Use session cookies and store filter settings in sessionStorage
 2016-12-07 11:25:06 +01:00
FinnStutzenstein
acb5a6dcf9 Use session cookies and store filter settings in sessionStorage 2016-12-07 08:01:33 +01:00
Tobias Hößl
2cb1429c8d First attempt to mitigate the list / line number problem 2016-12-06 22:12:29 +01:00
FinnStutzenstein
29ae600194 Dynamic webpage title 2016-12-05 18:00:52 +01:00
Emanuel Schütze
a716910b63 Merge pull request #2734 from emanuelschuetze/issue2727 
Hot fix for cache update while user import (Fixes #2727).
 2016-12-05 13:25:11 +01:00
Emanuel Schütze
405fb1b9d1 Merge pull request #2733 from normanjaeckel/CategorySort 
Category sort
 2016-12-05 13:24:45 +01:00
Emanuel Schütze
b36560bffb Hot fix for cache update while user import (Fixes #2727). 2016-12-05 13:17:35 +01:00
Emanuel Schütze
3888632e14 Merge pull request #2735 from normanjaeckel/FixStatus 
Fixed typo.
 2016-12-05 13:09:25 +01:00
Norman Jäckel
e180b1df29 Fixed sorting of motions in a category. Changed identifiers of amendments during sorting. Fixed #2701. 2016-12-05 12:59:46 +01:00
Norman Jäckel
8b6844675e Merge pull request #2732 from CatoTH/bugfix-typo-in-variable-name 
Typo in variable name
 2016-12-05 12:58:56 +01:00
Norman Jäckel
d8c7eda587 Fixed typo. 2016-12-05 12:40:28 +01:00
Norman Jäckel
d0ed0cea23 Improved speed of motion numbering. 2016-12-03 20:57:00 +01:00
Tobias Hößl
940fb14ad6 Typo in variable name 2016-12-03 14:50:39 +01:00
Emanuel Schütze
9009c9e2e9 Updated translations for EN/DE. Fix translation string. 2016-12-02 16:30:03 +01:00
Emanuel Schütze
486f0601eb Merge pull request #2721 from FinnStutzenstein/AgendaTable 
Agenda table
 2016-12-02 15:59:57 +01:00
Emanuel Schütze
0698327427 Fix minor remarks for #2271. 2016-12-02 15:49:21 +01:00
Emanuel Schütze
4c37fd8e62 Merge pull request #2726 from normanjaeckel/FollowRecommendationButton 
Added button to motion detail view to follow recommendation. Closed #…
 2016-12-02 15:40:33 +01:00
FinnStutzenstein
ee5adb8fd2 New AgendaTable 2016-12-02 15:18:32 +01:00
Norman Jäckel
49dca65640 Added button to motion detail view to follow recommendation. Closed #2700. 2016-12-02 14:57:45 +01:00
Norman Jäckel
4d288ec9b2 Merge pull request #2724 from emanuelschuetze/posts 
Rename 'posts' to 'persons' in assigment templates.
 2016-12-02 14:47:11 +01:00
Norman Jäckel
926d04f610 Merge pull request #2723 from FinnStutzenstein/Clock 
Fixing the clock
 2016-12-02 14:46:43 +01:00