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

136 Commits

Author SHA1 Message Date
Oskar Hahn
4c86c9cd07 Fix list_of_speaker overlay 
* Issue a warning message, if a overlay raises a exception
* Fixed #1131
 2014-01-11 09:21:35 +01:00
Norman Jäckel
22960748a3 Added permission to see participants also to the manager group. See #1150. 2013-12-23 19:14:11 +01:00
Norman Jäckel
1e52959f70 Fixed error when a file was removed from filesystem. Fixed #1120. 2013-12-23 18:46:04 +01:00
Oskar Hahn
49ca243153 Add function get_active_object and bugfixes 
* Dont throw errors in overlay.get_projector_html if debug == False
* fixe check of active slide in agenda
* Fix #1121
 2013-11-25 11:35:03 +01:00
Oskar Hahn
f8048da76c Fixed countdown and projector update issues 
* agenda_item.get_absolute_url('projector') returns the activate-url of the related slide.
* agenda_item.is_activate() returns True, if the related item is active
* Fixed set_active_slide to accept kwargs
* Reset countdown when saving a new duration time
* Update countdown overlay when begin_speak and end_speak is called
* Fixed blinking countdown

Fixes: #1078, #1076, #1075
 2013-11-24 10:04:01 +01:00
Norman Jäckel
70042142f6 Fix tests. 2013-11-21 19:50:44 +01:00
Norman Jäckel
c34b407945 Fix templatetag, #1077. 2013-11-19 17:57:03 +01:00
Oskar Hahn
3d19ae7db2 Merge pull request #1082 from normanjaeckel/SetStateView 
Add check for set state view, fix #1080.
 2013-11-19 08:13:10 -08:00
Norman Jäckel
31af5c0ce6 Add check for set state view, fix #1080. 2013-11-19 01:06:38 +01:00
Norman Jäckel
1a33c1c9f1 Add percent base value to all polls, fix #1079. 2013-11-19 00:19:46 +01:00
Oskar Hahn
4fa2c25978 Make sure QuestionView.get_question_message is in a unicode context. 
This is important if the attribute question_message is set with
ugettext_lazy which needs an unicode context

Fixes #1066
 2013-11-17 11:11:39 +01:00
Norman Jäckel
6bd4ffd8fa Add tests according to issue #931. 2013-11-14 22:38:12 +01:00
Oskar Hahn
9d8d9f806f Fixed agenda slide 
Fixes #1035
 2013-11-12 08:59:20 +01:00
Norman Jäckel
c4850e4b19 Move run_tornado import into runserver function because its imports needs settings (new in Django 1.6). 2013-11-10 22:15:13 +01:00
Norman Jäckel
7b45231211 Merge pull request #1001 from ostcar/django1.6 
Update to Django 1.6
 2013-11-10 12:26:06 -08:00
Emanuel Schuetze
45588024fd Fixed #957 (Allow list-style in CKEditor) 
Allowed additional css styles 'color' and 'background-color'
for span html fields in ck-editor (and bleach).
 2013-11-10 19:33:38 +01:00
Oskar Hahn
2a7a50a817 Show default_slide if an error occurs in a slide 
See #925
 2013-11-09 15:14:55 +01:00
Oskar Hahn
ab048e3393 Update to Django 1.6 2013-11-07 18:56:06 +01:00
Oskar Hahn
01eb64c1d2 Update scroll and sale in activate view. 
Fixes #939
 2013-11-07 12:45:17 +01:00
Oskar Hahn
929587971a Merge pull request #1006 from normanjaeckel/CheckPort 
Check used port, fix #985.
 2013-11-06 13:03:40 -08:00
Norman Jäckel
17a2eb97cb Check used port, fix #985. 2013-11-06 17:49:41 +01:00
Oskar Hahn
1ebca3b12e Fixed participant edit view 2013-11-06 17:08:54 +01:00
Oskar Hahn
2d07644d3c Fixed some javascript related problems 2013-11-06 14:58:30 +01:00
Norman Jäckel
7ac40f16f0 Add some tests. 2013-11-04 22:25:03 +01:00
Oskar Hahn
0752d476e4 Change to MIT Licence 
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
 2013-11-04 14:57:30 +01:00
Oskar Hahn
2691e2b239 More Tests for projector views 2013-11-04 14:53:07 +01:00
Oskar Hahn
eedc5cef5d Mockout threading in the startbrowser test 2013-11-04 08:41:51 +01:00
Oskar Hahn
434f7e6dc4 Merge pull request #977 from ostcar/test_password_hasher 
Set the test passwort hasher to md5
 2013-11-02 15:31:07 -07:00
Oskar Hahn
a50d2dde39 Set the test passwort hasher to md5 2013-10-31 09:44:21 +01:00
Norman Jäckel
a35d31aaa2 Add tests. Setup coverage. 2013-10-31 01:50:03 +01:00
Oskar Hahn
71666094e7 Add tests for the projector code 2013-10-30 18:58:15 +01:00
Norman Jäckel
3ec18194fa New command create-dev-settings. Clean up main script. Fix wrong path for Windows version. 2013-10-29 00:48:49 +01:00
Norman Jäckel
b2afa77e25 Add error message if a invalid answer was send via POST to a QuestionView. Fix #940. 2013-10-28 17:02:18 +01:00
Oskar Hahn
b84197d17b Reenabeld the test for the QuestionView 2013-10-27 16:00:27 +01:00
Norman Jäckel
218d0bad23 Add message if someone adds himself to the list of speakers. Fix #927. 2013-10-24 18:24:19 +02:00
Norman Jäckel
6175ce25c5 Fix #934: Error in motion import with bad csv file. 2013-10-22 00:18:58 +02:00
Norman Jäckel
9d80c05f90 Fix url_name_args bug. 
Fix delete view for motion categories. Add test for custom slide delete view.
 2013-10-21 22:51:38 +02:00
Norman Jäckel
b0e3c7d456 Fix missing url_name_args = [] lines in different views. 
Fix custom slide create and update view.
Fix motion category create and update view.
 2013-10-21 19:10:53 +02:00
Norman Jäckel
273140007e Fix url_name_args problems in user and group views. Add tests. 2013-10-20 21:42:17 +02:00
Oskar Hahn
c399eea2dd Merge pull request #920 from normanjaeckel/CountdownAndAgenda 
Countdown and agenda
 2013-10-19 22:19:26 -07:00
Norman Jäckel
40faaa39c6 Changed begin speach behavior. Fix merge conflicts. Add tests. 2013-10-19 14:52:37 +02:00
Norman Jäckel
a1ad1e4c49 Some changes in __main__.py and utils.main and other. 
Reinsert --no-browser option.

Move some code to utils.main.

Some other small style changes.

Fix merge conflict misstakes.

Change settings behavior. Add tests.

Fix rebase problems.
 2013-10-19 14:44:46 +02:00
Norman Jäckel
30371e964f Insert new feature: attachments for motions. 
Fixed #522. Database struture changed.
 2013-10-18 12:32:29 +02:00
Oskar Hahn
68b9a2e291 Cache the results of ItemDelete.get_answer_options 
Fix #911
 2013-10-18 07:49:39 +02:00
Oskar Hahn
d3f673a276 Merge pull request #912 from normanjaeckel/Fix910 
Fix wrong question_url_name in ItemDelete view. Fix #910.
 2013-10-17 22:36:04 -07:00
Norman Jäckel
d76a04f443 Fix wrong url_name_args in ItemDelete view. Fix #910. 2013-10-17 22:00:00 +02:00
Emanuel Schuetze
e277b8babf Full text search with haystack and whoosh. 
Updated THANKS file.
Portable: Added haystack and whoosh.
 2013-10-16 08:58:35 +02:00
Oskar Hahn
d937262d28 Use flake8 instead of pep8. Orderd the imports with isort 
* changed the fab-command pep8 to check
* checked and fixed any code with flake8. Also the urls.py
* checkt the projector app with pylint
 2013-10-14 18:43:12 +02:00
Oskar Hahn
d644d49579 Cleaned up utils 2013-10-13 20:43:26 +02:00
Emanuel Schuetze
84d5293fbc Rework (projector) template with bootstrap. 
- Always use templatetag 'absolute_url' instead of (depricated) 'model_url'.
  Search and replace all old arguments: edit -> update, view -> detail, delete
- Fixed bug in setting default value in 'absolute_url' templatetag
  (default value is defined in models.py only).

Updated 'backend' template.
 2013-10-07 08:57:22 +02:00