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

103 Commits

Author SHA1 Message Date
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
Oskar Hahn
d681e94eed Merge remote-tracking branch 'openslides/stable/1.4.x' 
Conflicts:
	AUTHORS
 2013-10-04 09:13:51 +02:00
Oskar Hahn
6926630d3e Added Feature for config app, to return the default value for a key 2013-09-29 15:10:01 +02:00
Oskar Hahn
ecf5248962 Rework of the projector with websocket 
* Set a static projector title
* absolute_urls for the activate links
* update the projector when a slide changes (in save())
* insert the absolute_url template filter
* Preview to slides
* renamed is_active to is_active_slide
* The SlideMixin has to come before the PersonMixin
* Update list of speakers
* Render Countdown via JS
* Reconnect projector after connection lost
* Overlays can allways be active and do not appear in the widget
* Rewrote the clock as overlay
 2013-09-24 23:35:05 +02:00
Oskar Hahn
93079938a3 Fixed keyerror on user setting page 
Fix #891
 2013-09-24 23:31:45 +02:00
Oskar Hahn
66679c8efe Merge branch 'stable/1.4.x' 
Conflicts:
	openslides/__init__.py
 2013-09-14 11:07:02 +02:00
Oskar Hahn
7faf59a82b Merge pull request #878 from ostcar/change_agenda_items 
Fixed wrong ordering of agenda items after order change
 2013-09-09 02:04:27 -07:00
Oskar Hahn
3bf1f24a4a Fixed wrong ordering of agenda items after order change 
Fixed #875
 2013-09-08 11:17:32 +02:00
Norman Jäckel
404d0fc272 Add on_change_callback to config variables. These callback can be defined in the ConfigVariable object and is called, when the variable is changed. 2013-09-08 11:16:23 +02:00
Oskar Hahn
a28ca8a4a3 Merge remote-tracking branch 'openslides/stable/1.4.x' 
Conflicts:
	openslides/assignment/models.py
 2013-09-07 16:48:55 +02:00
Norman Jäckel
26607da154 Fix delete of assignments with related agenda items. 2013-09-07 16:33:10 +02:00
Oskar Hahn
afe186add4 Fixed repr in widget 2013-09-07 15:19:03 +02:00
Norman Jäckel
c800884a43 Use GenericForeignKey for agenda related items, fix #865 2013-09-07 14:30:25 +02:00
Norman Jäckel
c88d180808 Deletes config cache after each test if it exists. 2013-08-19 18:05:03 +02:00
Oskar Hahn
25bac4a704 Fixed a bug when setting a config var before getting one 2013-08-19 17:59:35 +02:00
Oskar Hahn
20cf960c82 Merge remote-tracking branch 'openslides/stable/1.4.x' 
Conflicts:
	openslides/core/templatetags/tags.py
 2013-08-19 17:54:50 +02:00
Oskar Hahn
1113b6d861 Added template filter 'absolute_url' 2013-08-19 11:21:29 +02:00
Oskar Hahn
99895a28d1 Fix get_absolute_url for deleted persons. 
Fix #845
 2013-08-19 10:50:37 +02:00
Norman Jäckel
30c3f5ea64 Disable deleting active versions of a motion 2013-07-28 01:14:15 +02:00
Oskar Hahn
8743d75d10 Use get_active_version in motion.__unicode__() 
Fixes the bug, that motion.__unicode__() raises an AttributeError, if the active_version
was None.

Fixes #822
 2013-07-27 10:11:28 +02:00
Emanuel Schuetze
69c7832701 Updated csv example files for motion and participants - in DE and EN used in demo database. 
Updated motion csv import test.
 2013-07-08 10:11:48 +02:00
Norman Jäckel
834851acbd Typo in assignment view (fixed #805) 2013-07-04 15:40:47 +02:00
Oskar Hahn
7d1eb5207a Fixes #765. Avoids the django AbstracUser username validator 
Also changed added a white-space in the default username again
 2013-06-26 19:00:52 +02:00
Norman Jäckel
7dddd70493 Fix whitespaces in translated strings. 2013-06-25 17:44:31 +02:00
Norman Jäckel
bad64144da Fix translation of messages with additional content 2013-06-20 23:36:23 +02:00
Norman Jäckel
96c5b1d2dc Fix numbering with category prefix in simple workflow, fix #769 2013-06-20 18:03:22 +02:00
Oskar Hahn
64af0b162f Create admin-user after syncdb 2013-06-16 17:07:55 +02:00
Emanuel Schuetze
5237e1d90d Fixed #745 and #744: Make widgets fixable and collapsable. 
Fixed widget header style issues.
 2013-06-16 12:15:52 +02:00
Oskar Hahn
9853f2c433 Change the Workflow of a motion in CreateView. 
The Manager can choose the workflow in the createview. The default value
is the workflow from the config.

In the UpdateView the workflow in which the motion is, is choosen by
default.

The workflow will only be reset, if it is changed.
 2013-06-16 00:53:49 +02:00
Oskar Hahn
e630d600ed Fixes #648 
delete function for the motion versions
 2013-06-15 09:18:21 +02:00
Norman Jäckel
3afc58be9e Add request to all widgets, fixed #653 2013-06-13 23:45:30 +02:00
Oskar Hahn
efd10eaecc Fixed #718 
An string argument was not used in the assignment app
 2013-06-13 16:47:35 +02:00
Oskar Hahn
42ad1113fa Fixed #724 
The motion updated view now uses the last_versio instead of the active_Version
 2013-06-11 11:42:20 +02:00
Norman Jäckel
aa0728ff60 User lockout protection, fixed #666 
Protection of updating and deleting users and groups if this caused a lockout of the requesting user.
 2013-06-11 11:02:40 +02:00