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

575 Commits

Author SHA1 Message Date
Emanuel Schütze
4e1c7b7497 New admin user group 2018-03-06 11:21:00 +01:00
FinnStutzenstein
ca8ee3edd6 Splitup comment see and manage permissions for motion comments 2018-02-16 14:09:32 +01:00
Emanuel Schütze
8042beda60
Merge pull request #3577 from CatoTH/Issue3563-Escaping-Ampersands 
Escape Ampersands - fixes #3563
 2018-02-15 08:23:54 +01:00
FinnStutzenstein
3ba39c37c1 Agenda DOCX export, motion log message when comment edited, motion sequential number in detail view and PDF, save pagination state to session storage (fixes #3558). 2018-02-14 10:25:51 +01:00
Tobias Hößl
a345815b57 Escape Ampersands - fixes #3563 2018-02-13 16:43:07 +01:00
FinnStutzenstein
5fc7dce567 Mark speakers 2018-02-13 10:32:31 +01:00
FinnStutzenstein
0b04b7478f Fixed email translations, motion sorting, undefined in DOCX, reduced motion search 2018-02-02 12:48:01 +01:00
Emanuel Schütze
9c4a8cc7fc
Merge pull request #3539 from normanjaeckel/BundleAutoupdate 
Added autoupdate bundle middleware.
 2018-01-26 15:23:32 +01:00
Norman Jäckel
1527cc69dd Cleaned up config app. Removed OPTIONS request. Fixed #3531. 2018-01-26 13:58:21 +01:00
Norman Jäckel
d381ca36dd Added autoupdate bundle middleware. 2018-01-25 23:09:28 +01:00
Tobias Hößl
c7729a6619 Diff-Bugfix: Whitespace was inserted after <br> 2018-01-22 09:12:36 +01:00
FinnStutzenstein
5e089bfcdc Preparations for the SAML plugin; Fixed caching of main views. 2018-01-21 11:54:01 +01:00
Emanuel Schütze
2f7bc4227a
Merge pull request #3546 from CatoTH/Bugfix-Diff-Bugfix-Moving-Words 
Fixes an edge case in the diff
 2018-01-21 10:30:44 +01:00
Tobias Hößl
e4da7905ca Fixes an edge case in the diff 2018-01-21 10:21:22 +01:00
Emanuel Schütze
3ac072d1a2
Merge pull request #3534 from normanjaeckel/BetterProjectorPrioritization 
Split send_data channel into send_data_projector and send_data_site f…
 2018-01-21 09:23:19 +01:00
Emanuel Schütze
60fa629857 Set new default for projector resolution (1220x915, Fixed #2549). 2018-01-20 21:20:52 +01:00
Tobias Hößl
b574502a37 Bugfix: Diff and Line breaks at dashes 2018-01-20 11:48:46 +01:00
Norman Jäckel
aaeb85db61 Split send_data channel into send_data_projector and send_data_site for projector prioritization. Fixed #3426. 2018-01-20 11:07:28 +01:00
FinnStutzenstein
5cf82e5921 fixed ValidationError 2018-01-08 10:41:09 +01:00
Emanuel Schütze
2fe1218fbb
Merge pull request #3503 from FinnStutzenstein/emailTest 
Send invitation emails
 2017-12-15 08:29:09 +01:00
FinnStutzenstein
2220112d27 Send invitation emails with OpenSlides login. 2017-12-15 08:16:29 +01:00
FinnStutzenstein
a998657923 extended the legal notice page (fixes #3504) 2017-12-05 07:55:12 +01:00
Tobias Hößl
e18f22f200 Break lines in nodes that have already been parsed 2017-11-02 09:16:36 +01:00
Tobias Hößl
6891471c45 Better handling of inserted paragraphs 2017-11-01 10:29:18 +01:00
Emanuel Schütze
4ff7d0b7dc Merge pull request #3450 from CatoTH/Bugfix-Disable-Change-Ratio 
Disable change ratio detection / Fix marking unchanged dangling line as changed
 2017-10-16 13:05:35 +02:00
Tobias Hößl
e651c124e4 Disable change ratio detection / Fix for marking unchanged line as changed 2017-10-16 12:27:44 +02:00
Emanuel Schütze
17959bd9c5 Motion template improvements (Fixed #3303) 
- Sort categories drop downs by config value (name or prefix) (fixed #3303).
- Show comment fiels in pdf without "Comment" as prefix.
- Improved heading style in web and pdf.
- Added motion block to motion pdf.
 2017-10-16 09:35:06 +02:00
Tobias Hößl
a09a12c55c Diff: use comma as a word separator 2017-10-11 22:15:12 +02:00
FinnStutzenstein
178948b269 Index and Webclient View caching 2017-09-27 12:50:59 +02:00
FinnStutzenstein
aa13e5ddd0 Fixing special comments fields, reconnect timeout, minor things. 2017-09-22 13:45:52 +02:00
Tobias Hößl
ee37cfed9c Line break algorithm should not be distracted by newline characters 
- Cancel out newlines inserted when inline-editing motions
- Bugfix for newlines after BRs
 2017-09-21 16:24:54 +02:00
Emanuel Schütze
9f6deb89c1 Fixed karma diff test of #3408. 2017-09-18 12:02:09 +02:00
Emanuel Schütze
e313731c9e Merge pull request #3408 from CatoTH/Issue3401-Inline-Diff-When-First-Word-Changed 
Inline-Diff when the first word in a paragraph is replaced - fixes #3401
 2017-09-18 11:15:52 +02:00
Tobias Hößl
8650bc0401 Inline-Diff works when the first word in a paragraph is being replaced - fixes #3401 2017-09-18 11:05:00 +02:00
Tobias Hößl
da8f825d42 Sort attributes before applying the diff - fixes #3402 2017-09-16 14:06:12 +02:00
Emanuel Schütze
b824e0387c Merge pull request #3390 from ostcar/rewrite_restricted_data 
CollectionElement and Autoupdate cleanups to help mypy
 2017-09-15 12:23:50 +02:00
Oskar Hahn
d7db714562 CollectionElement and Autoupdate cleanups 
* change get_restricted_data and get_projector_data to always use a list
* Add typings to all get_restricted_data and get_projector_data methods
* Replace CollectionElementList with a real list
* Fixed arguments of inform_deleted_data
* Moved CollectionElementCache to cache.py and refactored it
* Run tests with cache enabled (using fakeredis)
 2017-09-15 12:11:32 +02:00
Emanuel Schütze
4565e7e4a6 Merge pull request #3400 from FinnStutzenstein/UserAutoupdate 
Autoupdates on user login (fixes #3395, fixes #3392)
 2017-09-15 11:48:35 +02:00
Emanuel Schütze
2c4a1d5a6c Merge pull request #3376 from FinnStutzenstein/MotionCommentsRework 
Rework on motion comments.
 2017-09-15 10:59:02 +02:00
FinnStutzenstein
16abfd0dbf Autoupdates on user login (fixes #3395, fixes #3392) 2017-09-15 10:40:04 +02:00
FinnStutzenstein
288a706d01 Rework on motion comments (fixes #3350). 2017-09-12 14:58:43 +02:00
Oskar Hahn
b80e95a321 Rewrite projector_element without dispatch 2017-09-05 22:46:13 +02:00
Oskar Hahn
be94e97889 more typings 2017-09-03 18:34:55 +02:00
Oskar Hahn
24b07da7b4 Fix PersonalNoteAccessPermissions for anonymous user 
fixes: #3377
 2017-08-31 22:00:22 +02:00
Oskar Hahn
87b889fbf2 Rewrite config to have id field 2017-08-24 15:02:42 +02:00
Oskar Hahn
9d1ebac86e Add typing (#3370) 
Add typing
 2017-08-23 20:51:06 +02:00
FinnStutzenstein
727d1341e8 some changes in the example data plugin 2017-08-14 09:56:48 +02:00
Tobias Hößl
7b62c60350 Marks split list items with CSS-classes and hides the bullet points - fixes #3269 2017-07-27 14:42:51 +02:00
Norman Jäckel
77a321894b Merge pull request #3306 from FinnStutzenstein/Issue2862 
Remove OPTION request to query permissions (fixes #2862)
 2017-07-05 21:26:08 +02:00
Tobias Hößl
65d5bbccd6 Prevent colliding change recommendations - fixes #3298 2017-06-29 18:03:58 +02:00
FinnStutzenstein
90af3e6d1d remove OPTION request to query permissions (fixes #2862) 2017-06-29 13:25:52 +02:00
Emanuel Schütze
573fc4da57 Merge pull request #3267 from normanjaeckel/NewPersonalNote 
Rework on personal notes.
 2017-06-16 12:38:40 +02:00
Norman Jäckel
eaebeb8f06 Fixed get_projector_data impementation. Closed #3282. 2017-06-13 22:21:56 +02:00
Norman Jäckel
91d365e386 Rework on personal notes. Fixed #3262. 2017-06-13 20:58:17 +02:00
Norman Jäckel
260cd5cd16 Merge pull request #3290 from FinnStutzenstein/Issue1533-neu 
Massimport for users
 2017-06-12 22:07:32 +02:00
FinnStutzenstein
433cdc42fa Massimport for users 2017-06-08 14:40:29 +02:00
Emanuel Schütze
fb56215a26 Merge pull request #3233 from normanjaeckel/FixFreeUserAgenda 
Fixes autoupdate bug for a user without user.can_see_name permission …
 2017-06-07 21:00:12 +02:00
Norman Jäckel
ea50971ae6 Fixes autoupdate bug for a user without user.can_see_name permission. 2017-06-07 20:55:00 +02:00
Tobias Hößl
029ca0b8e3 Fix a bug where a single moved word was not highlighted in the diff 2017-06-06 19:28:52 +02:00
Tobias Hößl
7109c75246 Remove color styles insert .insert/.delete-Paragraphs - fixes #3247 2017-05-17 21:38:35 +02:00
Tobias Hößl
b340256541 Detect broken HTML after diff (Fixed #3229) 2017-05-16 12:19:18 +02:00
Norman Jäckel
db1d087aa0 Merge pull request #3236 from CatoTH/Issue3226-WhitespacesDisturbingLineExtraction 
Bugfix: whitespaces were disturbing line extraction - fixes #3226
 2017-05-08 13:06:13 +02:00
Norman Jäckel
ebabc291c5 Refactoring of data parsing for startup and autoupdate. 2017-05-03 08:58:29 +02:00
Tobias Hößl
b0a569fdf3 Bugfix: whitespaces were disturbing line extraction 2017-05-01 15:55:51 +02:00
Norman Jäckel
4bdb06bd9b Fixed error for internal function get_model_from_collection_string. 2017-04-27 15:16:07 +02:00
Emanuel Schütze
11aacc71b6 Merge pull request #3216 from ostcar/early_websocket_open 
Open websocket connections immediately
 2017-04-27 13:13:00 +02:00
Oskar Hahn
74c1cc63dc Open websocket connections immediately 
Also made a performance boost to get_model_from_collection_string()
 2017-04-27 12:54:16 +02:00
Norman Jäckel
6aee27e49f Added personal notes for motions (server side part). 2017-04-27 09:10:46 +02:00
Tobias Hößl
9d2edc23e4 Bugfix: changing line length did not invalidate cache 2017-04-19 14:49:43 +02:00
Norman Jäckel
c4ec26c4c0 User without permission to see users can now see some required users. 
These are
- agenda item speakers,
- motion submitters and supporters,
- assignment candidates,
- mediafile uploader and
- chat message users
but only if the user has respective permissions. Fixed #3002.
 2017-04-11 17:10:49 +02:00
Norman Jäckel
eea623befa Added some tests for topics. See #3175. 2017-04-03 13:17:10 +02:00
Norman Jäckel
4cad6943f6 Fixed creating motion for users with comments permissions. 2017-03-28 20:42:13 +02:00
Norman Jäckel
bdd5d0666f Added command to create example data. 2017-03-27 23:30:43 +02:00
Tobias Hößl
0d98fa3a88 Line breaks in inline diffs 2017-03-26 17:55:28 +02:00
Tobias Hößl
d4a72f4b37 Bugfix for regression introduced by #c912811bd37b70b897cdb0fdc50cbe516e853cc0 2017-03-24 21:07:51 +01:00
Norman Jäckel
85d13179da Merge pull request #3111 from FinnStutzenstein/Issue3103 
Improving creation of ballots (fixes #3103)
 2017-03-24 14:46:25 +01:00
FinnStutzenstein
0220a03350 fixing test and inform_changed_data call 2017-03-24 08:14:08 +01:00
Tobias Hößl
45cac43193 Remove erroneous margin around inline diff paragraphs in PDF 2017-03-22 20:54:56 +01:00
Tobias Hößl
c912811bd3 Beginning: passing line numbers through the diff 2017-03-22 12:21:45 +01:00
Tobias Hößl
a3c7eeb091 Add an explicit line highlighting function for the diff 2017-03-18 15:24:19 +01:00
Emanuel Schütze
e611b46784 Added karma tests for angular.js to travis. 
Installed required dependencies to run karma test in phantomjs which
is a supported browser by travis.
 2017-03-08 23:46:04 +01:00
Tobias Hößl
c3bd85e5ee Diff-Bugfix: don't repeat unchanged words 2017-03-08 21:29:34 +01:00
Tobias Hößl
a6de228f56 Prevent broken HTML like <ins>Test</p></ins> 2017-03-08 20:38:02 +01:00
Tobias Hößl
9f71afa602 Fixes broken diff test cases + Bugfix for: TypeError: Failed to execute 'insertBefore' on 'Node' 2017-03-08 20:10:32 +01:00
Norman Jäckel
14ec6c0f44 Improved autoupdate on permission change. 2017-03-06 17:42:27 +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
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
a4a7fd255b Merge pull request #3041 from CatoTH/remove-pdf-test-cases 
Remove PDF unit tests
 2017-03-05 20:19:52 +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
Tobias Hößl
c8006588c5 Handle STRIKE-tags correctly in line numbering 2017-03-04 16:17:48 +01:00
Tobias Hößl
3ca45f24c9 Remove PDF unit tests 2017-03-04 15:54:23 +01:00
Tobias Hößl
e698d81f9f Bugfix for #3024 - escaping HTML tags 2017-03-04 15:51:33 +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
FinnStutzenstein
9fbbfe0f50 Always provide the list of speakers (closes #3003) 2017-03-03 14:35:55 +01:00
Norman Jäckel
5a821ecf49 Fixed use of PATCH and PUT. Fixed #1871. 2017-02-27 17:20:57 +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
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
Tobias Hößl
afff1f35f8 Solving two bugs in the diff 2017-02-15 20:23:29 +01:00
Oskar Hahn
26b7f2879c Let CollectionElement fail early 
Fixes #2835
Fixes #2904
 2017-02-12 14:15:58 +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
FinnStutzenstein
49e32d8e57 Possibility to send extra startup data (closes #2885) 2017-01-31 13:17:42 +01:00
FinnStutzenstein
d55d374211 Prevent XSS-attacks (fixes #2871) 2017-01-30 21:04:41 +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
Maximilian Krambach
929a7e5e89 delete list of speaker error messages (closes #2237) 2017-01-16 18:37:59 +01:00
Norman Jäckel
c6b1df9e24 Fixed security issue #2850: Comments were shown for unprivileged users. 2017-01-15 10:26:37 +01:00
FinnStutzenstein
a6d1eeb9c3 Worked on startup process. 
- fix group view on reload
 2017-01-14 21:23:05 +01:00
Norman Jäckel
a918361ec5 Fixed motion create view. Fixed #2506. 2017-01-14 11:38:20 +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
f9f64b3e31 projector language (closes #2653) 2016-12-21 10:41:06 +01:00
Tobias Hößl
159720b983 Bugfix for PDF-export - fixes #2777 2016-12-19 16:17:36 +01:00
Tobias Hößl
08cb6a3d1b Bugfix for line numbering with CKeditor 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
Norman Jäckel
75f4c55181 Removed viewpoint for Django url patterns. Fixed #1453. 2016-12-16 17:01:34 +01:00
Tobias Hößl
46cf26481e Bugfix for #2770 2016-12-14 22:28:44 +01:00
Norman Jäckel
6dc598800d Fixed state flag required permission to see. 2016-12-11 22:02:16 +01:00
Tobias Hößl
2cb1429c8d First attempt to mitigate the list / line number problem 2016-12-06 22:12:29 +01:00
Norman Jäckel
cdc37b4dd5 Merge pull request #2703 from normanjaeckel/LeadingZero 
Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696.
 2016-12-01 14:46:15 +01:00
Norman Jäckel
ad651300d9 Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696. 2016-12-01 14:41:12 +01:00
Maximilian Krambach
32aaaf5b9e Majority calculation for assignments. 
Majorities when config YN(A) and simple voting method.
 2016-12-01 14:35:35 +01:00
Norman Jäckel
6aa3ea0d63 Merge pull request #2627 from CatoTH/change-recommendations-inline-diff 
Showing Diff inline
 2016-12-01 10:24:18 +01:00
Tobias Hößl
bce74cac2f Bugfix for merging change recommendations 2016-11-26 21:48:56 +01:00
Tobias Hößl
2958a401ad Showing Diff inline 2016-11-26 16:50:32 +01:00
Norman Jäckel
d068765db9 Merge pull request #2678 from CatoTH/goto-line-numbers-always-available 
Make line highlighting and 'Goto'-Feature available on all modes
 2016-11-24 00:09:22 +01:00
Tobias Hößl
c888419527 Make line highlighting and 'Goto'-Feature available on all modes 2016-11-20 21:55:03 +01:00
FinnStutzenstein
0cc8a81320 countdown and message models (closes #2464) 2016-11-19 12:37:33 +01:00
Emanuel Schütze
9c58efbdae Remove unused serverside pdf file from users app. 2016-11-18 10:50:56 +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
Oskar Hahn
7281aa57b8 Removed old code needed be the server to serve pdf 2016-11-07 15:54:29 +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
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
20f8875dcd Added view to follow recommendations. 
for all motions of a motion block
 2016-10-17 21:02:50 +02:00
Tobias Hößl
228abf5cee Change recommendations 2016-10-17 19:37:32 +02:00
Emanuel Schütze
7ada65a628 Optimized template and translation for majority feature. 2016-10-17 17:03:42 +02:00
Norman Jäckel
639748bb3b Added view to clear the chatbox. 2016-10-17 16:56:19 +02:00
Maximilian Krambach
88674da36a list-of-speakers overlay (fixes #2211) 2016-10-12 15:45:21 +02:00
Oskar Hahn
e209dd6dfe Support to send many objects through the autoupdate system 2016-10-04 18:10: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
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
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
Finn Stutzenstein
d13e11beb1 New ui element for comments in config (closes #2348) 2016-09-23 14:37:13 +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