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

1654 Commits

Author SHA1 Message Date
Emanuel Schuetze
1a416e5726 Updated template and some minor fixed for list of speakers. Updated projector slide. 2013-04-15 19:23:37 +02:00
Oskar Hahn
fa95119936 New Feature: List of speakers. 2013-04-15 19:23:37 +02:00
Oskar Hahn
f52df88cd6 fixed error on new overlay api 2013-04-15 15:47:18 +02:00
Oskar Hahn
bbf4b33086 New Overlay API 2013-04-15 13:24:08 +02:00
Norman Jäckel
0155690630 Protection for participant managers, Issue #122 
Raises a validation error, if a non-superuser user edits himself and
removes the last group containing the permission to manage participants
 2013-04-14 23:52:20 +02:00
Norman Jäckel
82b1796875 Fixed issue #585. Sort group members by first name or last name in group detail view according to config variable 2013-04-13 18:13:11 +02:00
Oskar Hahn
632c9476ed Merge pull request #584 from emanuelschuetze/participants-1 
Participants fields: add 'title', remove 'type', use 'groups'
 2013-04-09 13:25:18 -07:00
Emanuel Schuetze
2c5bae7b01 #560 fixed: FormField to choose permissions is too small 2013-04-09 20:12:57 +02:00
Emanuel Schuetze
9f6da9f33b Reorder GroupDetailView code in view.py. 2013-04-09 19:53:18 +02:00
Emanuel Schuetze
2a97a61a14 Remove participants field 'type'. Use 'group' field instead. Updated csv import, overview table and user detail view 2013-04-09 11:21:55 +02:00
Emanuel Schuetze
051f9af1f7 #436: New participant field 'title' 2013-04-09 08:51:31 +02:00
Norman Jäckel
82c804e2d6 Inserted a new config variable 'Stop submitting of new motions' 
Normal delegates can not submit a new motion when this is set to true. Inserted also a new template filter to relate to config variables in if-clauses.
 2013-04-05 11:49:57 +02:00
Roland Geider
e40a2e9332 Restart tornado on file changes, respect port and adress flags 2013-04-03 23:20:56 +02:00
Oskar Hahn
e7def39323 Merge pull request #582 from normanjaeckel/AgendaConfigJSFix 
Moved javascript code for agenda config into extra file.
 2013-04-03 10:21:08 -07:00
Norman Jäckel
5d472b274a Update tests to extend test cover by coverage 2013-04-03 17:55:30 +02:00
Norman Jäckel
623cf60adf Moved javascript code for agenda config into extra file. Moved translation to correct area for javascript files. 2013-04-03 14:51:19 +02:00
Norman Jäckel
b310d6077e Move personal info widget to a new app: account. 2013-04-03 00:17:23 +02:00
Norman Jäckel
e3eabada8b Update default groups and permissions. 2013-04-02 15:50:40 +02:00
Norman Jäckel
e1b149cde3 New config app. Apps only have to define config vars once. Config pages, forms and so on are created automaticly. 
Changes after some reviews are done.

Problematic is still that the JS can not be moved to an extra file because of the template tags in the code.
 2013-03-28 15:31:13 +01:00
Emanuel Schuetze
71ac7a1cdb New feature: qr-code for system url on participants password pdf. 
(Note: New dependency! Run 'pip install qrcode')

Fixed pep8 issues. Create qr-code image for system url one time only.

New feature: qr-code for system url on participants password pdf.
(Note: New dependency! Run 'pip install qrcode')

Fixed pep8 issues. Create qr-code image for system url one time only.

Print qrcode image from StringIO stream.
Adapted table stylesheet for better integration of reportlab's Image object.

Fixed pep8 issue.

Made qrcode import as optional feature. Fixed pep8 issue.
 2013-03-22 14:35:40 +01:00
Oskar Hahn
f5e6f736dc Merge pull request #572 from normanjaeckel/Fileupload_3 
Mediafile (new)
 2013-03-20 03:23:50 -07:00
Norman Jäckel
156acc451f Insert whitespace. Fix docstrings. 2013-03-20 11:17:24 +01:00
Norman Jäckel
d81c3bb1f8 Change order of classes for User and Group 2013-03-18 22:43:46 +01:00
Norman Jäckel
d82bb6ee33 Small modifications. Enhencement of tests. 2013-03-18 22:41:42 +01:00
Norman Jäckel
ad0e157bd1 Insert new app to upload files via the frontend. Let tornado server media files. Insert icon-mediafile css class. Insert extra_stylfiles context variable. 2013-03-18 21:44:02 +01:00
Norman Jäckel
571649d5a6 Fix typo in assignment. 2013-03-18 21:31:24 +01:00
Emanuel Schuetze
4e6818fb1a Compressed jquery-ui files (for agenda config). 2013-03-18 20:22:54 +01:00
Emanuel Schuetze
b3fca8f6f2 Updated bootstrap from 2.2.2 to 2.3.1 2013-03-18 20:19:17 +01:00
Oskar Hahn
3832aa4178 Tests for the motion views 2013-03-15 12:18:27 +01:00
Oskar Hahn
c46ec570bf Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-03-15 02:16:26 +01:00
Oskar Hahn
81eb92a761 fixed pep8 2013-03-15 02:14:15 +01:00
Oskar Hahn
1a2ebf7b3b removed some unused functions 2013-03-15 01:34:17 +01:00
Emanuel Schuetze
d180b4f331 Reverted support/unsupport changes (question) 2013-03-14 23:45:17 +01:00
Emanuel Schuetze
20118ae833 Improved version.get command 2013-03-14 23:35:57 +01:00
Emanuel Schuetze
2a2c704bf2 GetVersionMixin not required. Fixed htmldiff function. 2013-03-14 23:26:41 +01:00
Emanuel Schuetze
3f4df58807 Moved htmldiff function to utils.py. Fixed travis build error (pep8). 2013-03-14 23:22:11 +01:00
Emanuel Schuetze
49765bbe6e Merge remote branch 'upstream/master' into motiontemplate 2013-03-14 23:05:38 +01:00
Emanuel Schuetze
b2dc3820bd Changed motion.number to motion.identifier. 2013-03-14 23:04:32 +01:00
Emanuel Schuetze
88a32dc546 Updated motion version warnings (not latest/authorized version) 2013-03-14 22:56:25 +01:00
Emanuel Schuetze
73430e45d8 Changed style for empty category table. 2013-03-14 22:54:33 +01:00
Emanuel Schuetze
fa098f6bd3 Typo. 2013-03-14 22:54:00 +01:00
Oskar Hahn
43cd5aba00 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-03-14 22:44:11 +01:00
Oskar Hahn
63932a348e Merge pull request #561 from emanuelschuetze/datatables-participants 
Datatables for participants table (reworked)
 2013-03-14 14:40:01 -07:00
Emanuel Schuetze
0587c2019a Integrated DataTables function for participants table (for client side sorting/filtering/pagination). Removed old server side sorting/filtering code. 
Fixed csv import (added success url).

Added large csv file for testing import of >1000 participants.

Removed lage csv example file for paticipants (will be sustitute by a test script in future).
 2013-03-14 22:34:40 +01:00
Oskar Hahn
545d4be04f fixed update of person_api 2013-03-14 22:32:00 +01:00
Emanuel Schuetze
247f6c9431 Merge remote branch 'upstream/master' into motiontemplate 
Conflicts:
	openslides/motion/models.py
	openslides/motion/views.py
 2013-03-14 21:36:02 +01:00
Emanuel Schuetze
a1a11ff53c New motion version diff view. Improved version history table in motion detail template. 2013-03-14 21:28:03 +01:00
Oskar Hahn
2944b6ded3 fixed travis 2013-03-13 00:29:53 +01:00
Oskar Hahn
71b9bd0a08 dont set identifier prefix, if it is empty 2013-03-12 23:54:37 +01:00
Oskar Hahn
b2c888b151 set identifier 2013-03-12 23:35:08 +01:00
Oskar Hahn
304887e8f3 Changed comlex workflow automaticly set the identifier 2013-03-12 22:13:17 +01:00
Oskar Hahn
d21185a449 Merge branch 'master' of github.com:OpenSlides/OpenSlides into category 2013-03-12 22:05:20 +01:00
Oskar Hahn
9cd69f59e0 Motion Identifier 2013-03-12 22:03:56 +01:00
Norman Jäckel
03fff46517 Add new TestCase class in utils to call the signal on running every test. 2013-03-12 21:38:22 +01:00
Norman Jäckel
9679be1867 Move builtin groups to a signal. 2013-03-12 20:58:22 +01:00
Emanuel Schuetze
196ad217b0 Fixed version history. 2013-03-11 23:58:45 +01:00
Emanuel Schuetze
d41ce146e2 Added category_delete function to template. 2013-03-11 21:50:16 +01:00
Emanuel Schütze
db97d3c312 Merge pull request #2 from ostcar/category 
Category Delete View
 2013-03-11 13:45:54 -07:00
Oskar Hahn
31ba70efd1 Category Delete View 2013-03-11 21:38:07 +01:00
Norman Jäckel
514577f7c6 Built-in Workflows are created by listening to a signal which is sent after syncdb. 2013-03-11 21:32:09 +01:00
Emanuel Schuetze
d9fbaf9aa7 Updated motion category template. 2013-03-11 21:29:56 +01:00
Emanuel Schütze
ff848a865a Merge pull request #1 from ostcar/category 
Category
 2013-03-11 12:46:42 -07:00
Oskar Hahn
f411040c3a Append missing files 2013-03-11 20:43:23 +01:00
Oskar Hahn
bc7be27131 Add CategoryFormField to the MotionForm 2013-03-11 20:41:02 +01:00
Oskar Hahn
2614a1cb2f Categories for Motions 2013-03-11 20:17:19 +01:00
Emanuel Schuetze
1b93cec209 Merge remote branch 'upstream/master' 
Conflicts:
	openslides/motion/models.py
 2013-03-11 19:16:16 +01:00
Emanuel Schuetze
42c847dfba Update motion templates to new template design. Added some missing model and view functions. 2013-03-11 18:26:22 +01:00
Emanuel Schuetze
5c70b4a044 Update after comments: Removed user context var. Removed condition in unupport state check. 2013-03-11 16:56:56 +01:00
Emanuel Schuetze
ee0e599a6c Update motion templates to new template design. Added some missing model and view functions. 2013-03-09 14:29:40 +01:00
Emanuel Schuetze
71b1bede6f Set new button als primary/blue button. 2013-03-09 14:17:30 +01:00
Emanuel Schuetze
c3c200b423 Changed link to new csv import wiki page on github. 2013-03-09 14:16:28 +01:00
Emanuel Schuetze
48e1282cb9 Show duration clock only if start/end time is set. 2013-03-09 14:15:03 +01:00
Emanuel Schuetze
56a510e89c Removed link to professional support in base template (footer). 2013-03-08 08:31:52 +01:00
Oskar Hahn
51a9e41015 Set new django setting. Put tornado code in a seperate file. 2013-02-27 18:54:06 +01:00
Oskar Hahn
757b97e4cb Merge pull request #542 from frauenknecht/master 
Issue #539 Default config value in agenda app
 2013-02-22 03:54:30 -08:00
Stefan Frauenknecht
45856fc9b0 add signal callback to provide defaults 2013-02-20 23:50:34 +01:00
Stefan Frauenknecht
f81abe215f Revert last changes 2013-02-20 23:48:04 +01:00
Stefan Frauenknecht
343aa018e4 Fixed Issue #539 - Default config value in agenda app 2013-02-20 22:09:40 +01:00
Norman Jäckel
03d57d17b0 Fix state attributes in motion pdf. 2013-02-19 23:43:20 +01:00
Norman Jäckel
6b71142747 Recover commit 6a639fe498 2013-02-18 22:08:21 +01:00
Oskar Hahn
853dcf8334 fixed pep8 2013-02-18 20:06:46 +01:00
Oskar Hahn
f388f3d41a handle static files with tornado 2013-02-18 19:58:18 +01:00
Oskar Hahn
2822c39f8a Merge branch 'master' into tornado 2013-02-18 19:08:58 +01:00
Oskar Hahn
ce1e1c112f fixed pep8 2013-02-18 18:59:24 +01:00
Oskar Hahn
4f3f917812 some small code design changes 2013-02-18 18:56:37 +01:00
Oskar Hahn
cb5b735565 Merge branch 'master' into HEAD 2013-02-18 18:34:52 +01:00
Oskar Hahn
051723e686 Merge branch 'master' of github.com:OpenSlides/OpenSlides 
Conflicts:
	openslides/motion/models.py
	openslides/motion/workflow.py
 2013-02-18 18:31:35 +01:00
Norman Jäckel
2603d93d69 Fix PEP8 and tests. 2013-02-17 17:07:44 +01:00
Stefan Frauenknecht
1d1d72d45a Fixed if condition with duration property which can be None 2013-02-16 11:55:40 +01:00
Stefan Frauenknecht
8103c09b81 PEP8 errors resolved 2013-02-16 10:41:22 +01:00
Emanuel Schuetze
0b3b91b8d5 Show item-tooltip in bootstrap tooltip style. 2013-02-15 08:51:08 +01:00
Emanuel Schuetze
4f60160667 Added missing success_url_name. 2013-02-15 08:50:42 +01:00
Emanuel Schuetze
e9c996340a Used custom build jquery-ui javascript components file. Integrated required jquery-ui styles (no remote link). Added used jquery components/addons to THANKS file. 2013-02-15 08:39:36 +01:00
Norman Jäckel
8363b06fc1 Move motion exceptions to its own file in the motion app. 2013-02-14 19:27:36 +01:00
Norman Jäckel
2e37e4c18b Comment the dev-file workflow.py 2013-02-14 11:16:46 +01:00
Norman Jäckel
f2dde228c9 Work on motion workflow system. 
Also: Insert new base exception for OpenSlides.

Also: Insert a workflow field to the state class. Update tests. Rename versioning attribute.
 2013-02-13 23:04:24 +01:00
Emanuel Schuetze
e3428d3e83 Some style work. 2013-02-11 23:01:48 +01:00
Emanuel Schuetze
e101fb8212 Merge branch 'master' into agenda-orga-items 
Conflicts:
	openslides/agenda/static/styles/agenda.css
	openslides/agenda/templates/agenda/config.html
	openslides/agenda/templates/agenda/item_row.html
	openslides/agenda/templates/agenda/overview.html
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/static/styles/base.css
	requirements.txt
 2013-02-11 22:36:19 +01:00
Emanuel Schuetze
a51a296434 Changed agenda start/end time to djangos DATETIME_FORMAT. 2013-02-09 22:59:15 +01:00
Oskar Hahn
6a639fe498 Add todos 2013-02-06 11:11:49 +01:00
Oskar Hahn
5573077b88 fixed pep8 2013-02-06 09:34:44 +01:00
Oskar Hahn
27c73092e1 Merge remote-tracking branch 'emanuel/newtemplate' into new_motion 
Conflicts:
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
 2013-02-06 09:25:27 +01:00
Emanuel Schuetze
ce51f0ef7e template: minor style changes 2013-02-05 23:42:30 +01:00
Emanuel Schuetze
6b4ee0e4f6 Updated translation. 2013-02-05 23:09:23 +01:00
Emanuel Schuetze
c8ddb21760 Fixed wrong hiding of open agenda child items if parent item is closed 2013-02-05 22:36:05 +01:00
Emanuel Schuetze
e49efb40d8 template: Added new css class for minimum column width. 2013-02-05 22:03:43 +01:00
Emanuel Schuetze
bfd01e67b6 template: Removed unused 'cycle' template tag. 2013-02-05 21:55:41 +01:00
Emanuel Schuetze
d809ff95bb template: Removed unused participant.css 2013-02-05 21:51:09 +01:00
Emanuel Schuetze
64e3c1f3cb template: Removed unused 'load staticfiles'. 2013-02-05 21:41:26 +01:00
Emanuel Schuetze
8388774f12 template: Minor style changes. 2013-02-05 21:33:07 +01:00
Emanuel Schuetze
82e35bebff Fixed wrong deletion if user clicks "no" in confirm form. 2013-02-05 21:31:45 +01:00
Emanuel Schuetze
0c5459f96e template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes. 2013-02-05 20:40:55 +01:00
Oskar Hahn
042f1a8571 Fixed typo 2013-02-05 18:49:32 +01:00
Oskar Hahn
a08cf84ab8 Wrote docstrings to the motion app 2013-02-05 18:46:46 +01:00
Emanuel Schuetze
8f05ada6a1 template style and new icons 2013-02-05 17:05:40 +01:00
Stefan Frauenknecht
d6084f7c8b Create items with duration loger than 23:59. Show start and end date. Duration has tooltip showing end date and time. 2013-02-05 16:36:57 +01:00
Emanuel Schuetze
80b0ab5252 template: Updated dashboard. Fixed ajax functionality. Adapted style. 2013-02-05 11:24:41 +01:00
Emanuel Schuetze
6db0210ef3 Updated jquery form plugin to v3.26.0-2013.01.28 2013-02-05 11:22:01 +01:00
Emanuel Schuetze
5e44bba941 Updated jquery from 1.9.0 to 1.9.1. 2013-02-05 11:15:23 +01:00
Emanuel Schuetze
404bf7f0b5 template: Added missing back link. 2013-02-04 13:38:29 +01:00
Emanuel Schuetze
36f5c97dbe Added assignment context menu (more actions). Fixed 'back to election' link. 2013-02-04 13:18:10 +01:00
Emanuel Schuetze
e822efdc81 Some template style work. 2013-02-04 13:06:36 +01:00
Oskar Hahn
a34731c00e fixed pep8 in motion.pdf 2013-02-03 20:12:44 +01:00
Oskar Hahn
90614cc637 Updated some views for the new utils.views style 2013-02-03 19:43:36 +01:00
Oskar Hahn
139ba74459 Merge remote-tracking branch 'emanuel/newtemplate' into new_template 
Conflicts:
	.travis.yml
	INSTALL.txt
	openslides/agenda/templates/agenda/base_agenda.html
	openslides/agenda/templates/agenda/edit.html
	openslides/agenda/templates/agenda/item_row.html
	openslides/agenda/templates/agenda/overview.html
	openslides/agenda/templates/agenda/widget.html
	openslides/assignment/templates/assignment/base_assignment.html
	openslides/assignment/templates/assignment/config.html
	openslides/assignment/templates/assignment/edit.html
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/poll_view.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/templates/assignment/widget.html
	openslides/config/templates/config/general.html
	openslides/motion/templates/motion/base_motion.html
	openslides/motion/templates/motion/config.html
	openslides/motion/templates/motion/edit.html
	openslides/motion/templates/motion/import.html
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
	openslides/motion/templates/motion/widget.html
	openslides/motion/views.py
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/edit.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_widget.html
	openslides/participant/templates/participant/import.html
	openslides/participant/templates/participant/login.html
	openslides/participant/templates/participant/overview.html
	openslides/participant/templates/participant/password_change.html
	openslides/participant/templates/participant/settings.html
	openslides/participant/templates/participant/user_widget.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/control_countdown.html
	openslides/projector/templates/projector/control_overlay_message.html
	openslides/projector/templates/projector/custom_slide_widget.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/projector/templates/projector/new.html
	openslides/projector/templates/projector/overlay_widget.html
	openslides/templates/base.html
	openslides/utils/template.py
	openslides/utils/views.py
	requirements.txt
 2013-02-03 19:03:18 +01:00
Oskar Hahn
b8a353fa7c Added PDF view for the motions 2013-02-03 18:18:29 +01:00
Oskar Hahn
42082ae3c2 fixed pep8 2013-02-03 14:14:07 +01:00
Oskar Hahn
cbd4acbd4b fixed motion tests 2013-02-03 13:55:42 +01:00
Oskar Hahn
ef7f6cf476 Permission system for MotionVersions 2013-02-03 13:24:29 +01:00
Oskar Hahn
e7c65b3db1 Moved some methodes from utils.views.DeleteView to QuestionMixin 2013-02-03 13:23:55 +01:00
Oskar Hahn
f4ea611fb8 Wrote log messages for motion changes 2013-02-03 10:02:06 +01:00
Oskar Hahn
65a18953bd Added translatable log to the new motion system 2013-02-02 21:40:23 +01:00
Oskar Hahn
15b13c2bcd Handel null=True in PersonField 2013-02-02 21:19:37 +01:00
Oskar Hahn
2e430b4406 check permission in motion view 2013-02-02 10:59:07 +01:00
Oskar Hahn
3ffb16d4d8 Fixed pep8 errors 2013-02-02 10:52:13 +01:00
Oskar Hahn
4cc6539f0c Added get_allowed_actions to new motion app 2013-02-02 10:24:28 +01:00
Oskar Hahn
a27bd7eade Add motion to agenda 2013-02-02 00:51:08 +01:00
Oskar Hahn
910e0f17e7 Add slide Date to the motion 2013-02-02 00:37:43 +01:00
Oskar Hahn
1518543a9a Added motion widget and deletion of motions 2013-02-02 00:27:16 +01:00
Oskar Hahn
0f7d0e349c Fixed URLs in projector views 2013-02-02 00:26:08 +01:00
Oskar Hahn
bd317aed31 Wrote tests for openslides.motion.models.Motion 2013-02-01 19:19:18 +01:00
Oskar Hahn
6c3eb0f765 fixed urls in views from the participant app 2013-02-01 17:35:27 +01:00
Oskar Hahn
1a2f0a1b5a Added links to set and reset the state of a motion 2013-02-01 17:20:11 +01:00
Oskar Hahn
ac41a02ac5 Block supporting, unsupporting and creation of poll in some states 2013-02-01 16:44:06 +01:00
Oskar Hahn
fb82a1787b Add workflows for motions 2013-02-01 16:33:45 +01:00
Stefan Frauenknecht
7f03e02e9a Item type changed from CharField to IntegerField. Constant type names added. 2013-02-01 15:13:40 +01:00
Stefan Frauenknecht
9f3dae8059 ConfigForm: Base classes reordered 2013-02-01 14:47:51 +01:00
Stefan Frauenknecht
c595701597 Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel) 2013-02-01 14:41:52 +01:00
Oskar Hahn
3f02a28002 Added a poll delete view to the new motion app 2013-02-01 13:24:44 +01:00
Oskar Hahn
b6256b73e0 Changed utils.views.DeleteView 2013-02-01 13:24:30 +01:00
Emanuel Schuetze
d3b679442c Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. 2013-02-01 12:55:04 +01:00
Oskar Hahn
da7a7a9d68 Add Poll-system to the new motion app 2013-02-01 12:51:54 +01:00
Oskar Hahn
adeaf248ef Changed utils.- and poll.views 2013-02-01 12:51:01 +01:00
Stefan Frauenknecht
5a9b7fdca5 Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel) 2013-01-31 20:37:55 +01:00
Stefan Frauenknecht
9746b3818f Rework code to ommit unnecessary filter call. 2013-01-31 20:32:29 +01:00
Stefan Frauenknecht
3dfd16558a Blanks removed 2013-01-31 18:35:52 +01:00
Emanuel Schuetze
033ecd9497 Added new glyphicons icons. 2013-01-31 10:20:53 +01:00
Emanuel Schuetze
82ad5e2de0 Major changes for new twitter bootstrap template (e.g. replaced icons) 2013-01-31 10:19:56 +01:00
Stefan Frauenknecht
65ebcbc991 #41 Time for each agenda item finished 2013-01-30 17:39:53 +01:00
Stefan Frauenknecht
bc9dcffff4 #41 Time for each agenda item 2013-01-29 14:28:42 +01:00
Oskar Hahn
d911e311d6 Let the user support and unsupport the motion 2013-01-26 18:18:02 +01:00
Oskar Hahn
7bcfa16737 Merge branch 'master' of github.com:OpenSlides/OpenSlides into new_motion 
Conflicts:
	openslides/motion/templates/motion/view.html
	openslides/utils/views.py
 2013-01-26 17:57:35 +01:00
Oskar Hahn
87e42cf9f8 Let the user choose if the motion should have a new version 
via config or form
 2013-01-26 17:09:13 +01:00
Oskar Hahn
0702d49e2e Save the supporter 2013-01-26 16:42:23 +01:00
Oskar Hahn
d3b340769b Added motion config tab 2013-01-26 16:33:55 +01:00
Oskar Hahn
ecb6419f8c fixed apply and success url in utils.views 2013-01-26 16:19:53 +01:00
Oskar Hahn
567e6c975a Show initial submitters in the update-form 2013-01-26 16:05:30 +01:00
Oskar Hahn
8708ba5da6 Only save new version, when version-data has changed 2013-01-26 15:39:35 +01:00
Oskar Hahn
1f87749742 Save the submitters to the motion 2013-01-26 15:25:54 +01:00
Oskar Hahn
1ae140c11e Add docstrings to the motion class 2013-01-26 12:28:51 +01:00
Roland Geider
bebaadf850 Actually do the right check for further args 2013-01-23 21:24:02 +01:00
Roland Geider
3bfead298d Add custom management command to start the application with tornado 2013-01-23 21:12:36 +01:00
Roland Geider
a14f9b30ad Fix help text 2013-01-23 19:37:12 +01:00
Andy Kittner
22e8457894 Add an option to suppress starting of web browser (closes #436) 2013-01-22 21:04:07 +01:00
Roland Geider
70407feab8 Use the tornado server to serve the application 2013-01-19 10:51:42 +01:00
Emanuel Schuetze
b8532fabe4 Removed files from images to img dir. 2013-01-18 22:23:31 +01:00
Emanuel Schuetze
da4ed365bc Updated js and css libraries (twitter bootstrap to 2.2.2 and jquery to 1.9.0). 2013-01-18 22:10:00 +01:00
Emanuel Schuetze
a4592ec849 Reworked projector activate buttons in agenda widget. 2013-01-18 21:44:47 +01:00
Emanuel Schuetze
586425354d Reworked new template, especially agenda and dashboard. 2013-01-08 23:05:35 +01:00
Oskar Hahn
0231fe37f5 Start to rewrite the motion app 2013-01-08 20:22:03 +01:00
Stefan Frauenknecht
aee24425bc Ticket 433 - Organisational items 2013-01-05 23:52:29 +01:00
Norman Jäckel
deb0d5b2e5 Some fixes. Update requirements.txt and setup.py. 2013-01-05 23:20:38 +01:00
Emanuel Schuetze
369f418b0e Fixed missing endif 2013-01-05 15:43:52 +01:00
Emanuel Schuetze
13cd52bd96 Merged (conflicts). 2013-01-05 15:29:57 +01:00
Oskar Hahn
6417f5f107 fixed pep8 error 2013-01-05 14:56:22 +01:00
Oskar Hahn
2fcf0b3a07 fixed typo in utils/views.py 2013-01-05 14:46:05 +01:00
Oskar Hahn
56510f94a8 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-01-05 13:44:35 +01:00
Stefan Frauenknecht
bb74674c41 Deprecated import django.conf.urls.defaults adjusted. 2013-01-05 12:39:20 +01:00
Oskar Hahn
ae8641bcad Raise an error if an CreateView does not define a apply_url 2013-01-05 01:48:03 +01:00
Oskar Hahn
3229d86d4d Import urls.py needed django functions from django.conf.urls 2013-01-05 01:05:38 +01:00
Oskar Hahn
2f28655a25 Show Tabs if there do not define some permissions 2013-01-05 01:03:42 +01:00
Norman Jäckel
d842214e26 Fix typo in template. 2013-01-04 19:14:56 +01:00
Oskar Hahn
5d754984a3 fixed pep8 errors 2013-01-04 12:39:42 +01:00
Oskar Hahn
c1903848f2 Update openslides/__init__.py 2013-01-04 11:49:43 +01:00
Emanuel Schuetze
d671740966 Fixed merged errors. 2013-01-02 23:22:12 +01:00
Emanuel Schuetze
4ae7f3e243 Merge remote branch 'upstream/master' into newtemplate 
Conflicts:
	openslides/application/views.py
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/views.py
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/motion/templates/motion/config.html
	openslides/motion/templates/motion/edit.html
	openslides/motion/templates/motion/import.html
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_overview.html
	openslides/participant/templates/participant/overview.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/dashboard.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/static/styles/base.css
	openslides/templates/base.html
	openslides/templates/front_page.html
	openslides/utils/utils.py
 2013-01-02 23:01:43 +01:00
Oskar Hahn
8a84f72891 fixed more url-template-tags 2012-12-16 17:35:06 +01:00
Oskar Hahn
5ea863ca81 Let the user choose the language in his settings 2012-12-16 17:26:53 +01:00
Oskar Hahn
b79fedc215 fixed jsonfield for django 1.5 2012-12-14 15:36:57 +01:00
Oskar Hahn
804f842650 Updated the url template tag 2012-12-14 15:10:14 +01:00
Oskar Hahn
366b8e0f1f Droped support for python 2.5 2012-12-14 14:21:53 +01:00
Oskar Hahn
a07146098b Changed Version to 1.4.dev 2012-12-14 14:14:01 +01:00
Emanuel Schuetze
c83348923a Set version number to 1.3.1a0-dev (unreleased) 2012-12-10 22:36:18 +01:00
Emanuel Schuetze
bf98224ebd Fixed missing translation. 2012-12-10 20:34:37 +01:00
Emanuel Schuetze
9a0bca7fea Set 1.3 final release. 2012-12-10 20:30:32 +01:00
Emanuel Schuetze
56a5778260 Updated translation (fixed minor typo). 2012-12-10 20:06:17 +01:00
Emanuel Schuetze
c48c4e0e90 Added missing remove icon (for unsupport motion button). 2012-12-10 19:44:35 +01:00
Oskar Hahn
67f6b36ebc Updated fr translation from transifex 2012-12-09 14:17:52 +01:00
Oskar Hahn
84324cf317 Updated translations 2012-12-09 12:59:56 +01:00
Oskar Hahn
0369edae1e Added translationcontext for posts in assignment 2012-12-09 10:48:45 +01:00
Oskar Hahn
442e5fba60 Added fr translation 2012-12-09 10:40:41 +01:00
Oskar Hahn
fc4c4c3f95 Revert "Updated fr translation" 
This reverts commit 7ff0825dc3.
 2012-12-05 20:07:11 +01:00
Oskar Hahn
05c029d8e5 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2012-12-04 00:20:41 +01:00
Oskar Hahn
7ff0825dc3 Updated fr translation 2012-12-04 00:20:11 +01:00
Norman Jäckel
046db10d3a Hide group registered in the group widget. 
Make custom slides text scrollable.

Fix template of personal_info_widget.
 2012-12-01 19:32:58 +01:00
Norman Jäckel
a5022a3f00 Fix pep8 in openslides/__init__.py 2012-12-01 14:05:19 +01:00
Norman Jäckel
4410e454c8 Update test for version string. 2012-12-01 13:39:29 +01:00
Norman Jäckel
e7744f8210 Merge branch 'master' into Version_String 2012-12-01 13:10:29 +01:00
Oskar Hahn
e76ec5e975 Added a new command to the startscript to show the version 2012-11-29 15:01:49 +01:00
Norman Jäckel
d53017eea8 Get git commit id also in detached head mode. 2012-11-28 18:02:33 +01:00
Norman Jäckel
589c209c79 Merge branch 'master' into Version_String 
Conflicts:
	openslides/__init__.py
	openslides/config/views.py
 2012-11-28 17:54:29 +01:00
Oskar Hahn
ab4c5791ad Merge pull request #61 from ostcar/master 
Forbid the deletion of the registered group
 2012-11-28 05:16:10 -08:00
Oskar Hahn
8306e7bf6e Don't allow to remove the registered group 2012-11-28 13:59:14 +01:00
Oskar Hahn
48b530487b Merge pull request #59 from emanuelschuetze/master 
Prepared 1.3-rc1
 2012-11-27 13:59:38 -08:00
Emanuel Schuetze
a010df5d1f Reverted person.sort_name AttributeError fix (e0ce1052c0) 2012-11-27 22:54:07 +01:00
Oskar Hahn
e7c47395bb Gave the empty user all the attributes it needs 2012-11-27 22:46:54 +01:00
Emanuel Schuetze
ae35a8c719 Updated translations 2012-11-27 21:30:45 +01:00
Emanuel Schuetze
94928c20c5 Updated translation msg strings. 2012-11-27 21:22:57 +01:00
Emanuel Schuetze
301a379fa6 Prepared 1.3-rc1 release. 2012-11-27 20:13:18 +01:00
Emanuel Schuetze
40984a6508 Merge remote branch 'upstream/master' 2012-11-27 20:10:13 +01:00
Oskar Hahn
4dfd4ac67f fix _proper_unicode 2012-11-26 15:48:23 +01:00
Oskar Hahn
bdfb714013 fixed pep8 in pdf.py 2012-11-26 10:35:29 +01:00
Oskar Hahn
c276bce780 Let travis test pep8 2012-11-26 10:11:36 +01:00
Oskar Hahn
abd21dd345 Added more tests for the agenda 2012-11-26 10:05:51 +01:00
Oskar Hahn
fddf929ab5 Load groups_de when creating the database 2012-11-25 01:07:39 +01:00
Oskar Hahn
ab4b117a93 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2012-11-25 00:55:37 +01:00
Oskar Hahn
a31a67c32e removed initial_data 2012-11-25 00:55:25 +01:00
Oskar Hahn
804b514597 Merge pull request #57 from andkit/bug-409 
Fix #409
 2012-11-24 12:29:44 -08:00
Oskar Hahn
3f469ab9d6 Commited the fix for get_version 2012-11-24 21:26:09 +01:00
Oskar Hahn
b3806d8cdd some tests for the agenda 2012-11-24 21:10:55 +01:00
Andy Kittner
5979b23b04 Merge remote-tracking branch 'origin/master' into bug-409 
Conflicts:
	openslides/main.py
 2012-11-24 20:49:04 +01:00
Andy Kittner
21a51523a4 Make pep8.py happy 2012-11-24 20:35:06 +01:00
Emanuel Schuetze
ec60207cfd Fixed typo (candidation -> candidature) 2012-11-24 17:39:28 +01:00
Emanuel Schuetze
e0ce1052c0 Catch AttributeError for 'person.sort_name' in assignment/models.py 2012-11-24 17:34:56 +01:00
Andy Kittner
c405e9b648 Rework default settings handling (fixes #409) 2012-11-24 15:00:36 +01:00
Oskar Hahn
6b2645d11c reordered the tests 
moved the tests from the openslides-module to an own module
configured coverage
 2012-11-24 15:00:17 +01:00
Oskar Hahn
bd32994296 cleanup 
Removed unused imports and fixed pep8 errors
 2012-11-24 14:01:21 +01:00
Oskar Hahn
f5a438cf9f cleanup in utils 2012-11-24 01:42:10 +01:00
Norman Jäckel
4c97291598 Remove non-used revision template var. 2012-11-23 11:33:34 +01:00
Norman Jäckel
baebfbb585 Fix get_version, insert and use get_git_commit_id. 2012-11-23 11:31:30 +01:00
Oskar Hahn
9943e84a96 default permissions for the registered group 
plus some cleanup for the registered and the anonymous group
 2012-11-23 09:35:41 +01:00
Emanuel Schuetze
bba301a4b3 #420: Use clean layout for group slide: Remove printing group users; print group name and number of members only. (Later we need a solution to print users fullname not username.) 2012-11-22 22:07:33 +01:00
Emanuel Schuetze
c115ea59a0 Fixed typo in comment. 2012-11-22 21:48:49 +01:00
Oskar Hahn
fa1c384d28 made use of defaults in get_or_create 2012-11-22 18:47:50 +01:00
Oskar Hahn
1049141483 Created a default group for registered users 2012-11-22 18:39:54 +01:00
Oskar Hahn
e168445497 fixed error, which allowed admins to delete the anonymous grou 2012-11-22 17:29:49 +01:00
Oskar Hahn
1dc7d45670 sort persons in motions 2012-11-22 17:00:09 +01:00
Oskar Hahn
8014f327a2 Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api 2012-11-22 16:35:26 +01:00
Oskar Hahn
fbf81e7780 sort persons 2012-11-22 16:19:09 +01:00
René Köcher
ed33b47666 Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides 
Conflicts:
	openslides/locale/de/LC_MESSAGES/django.po

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-22 12:52:11 +01:00
René Köcher
9f51a24311 #419 - aftermath 
- remove accidental print statements left over from debugging
- create missing groups on import

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-22 10:26:44 +01:00
René Köcher
36f83808fd Implement #419: Add group column for motion csv import 
The motion import now features an additional column to indicate that the import should be created by an existing group.
If the column is missing it is considered as 'off' and first / last name are used as always.
If the column exists and contains 'y','yes','j','ja','true', '1' or 1 first name will be ignored and last name will be interpreted as a group name.
If the group exists and can act as a person the motion will be imported and assigned to this group.

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-21 23:38:25 +01:00
Emanuel Schuetze
cbd04327bb Reverted: Administrator can be deleted by other manager. (partly reverted 533c65562d after discus it with oskar because import also possible as non-admin) 2012-11-21 23:26:54 +01:00
Emanuel Schuetze
8aec947303 Removed unused widget file (duplicate of welcome_widget.html). 2012-11-21 23:05:38 +01:00
Emanuel Schuetze
830f85109d Minor formatting work. 2012-11-21 23:03:14 +01:00
Emanuel Schuetze
d5ee6d69b6 Enlarged users select box in new/edit group form. 2012-11-21 22:06:22 +01:00
Emanuel Schuetze
4877eed46c Updated translation. 2012-11-21 21:45:27 +01:00
Emanuel Schuetze
ec1a15a835 #175: Adjusted group slide; analog to user slide. 2012-11-21 21:45:19 +01:00
Oskar Hahn
2acfd02144 Merge pull request #45 from normanjaeckel/GroupSlide 
Insert a slide for groups
 2012-11-21 12:18:17 -08:00
Emanuel Schuetze
f3c865ee3c #176: Adjusted user slide. Show only relevant information in a nice and clear layout. 2012-11-21 21:05:56 +01:00
Emanuel Schuetze
c5a2f896e2 Fixed typo in identifier 'assignment_candidates'. 2012-11-21 20:12:08 +01:00
Emanuel Schuetze
da0757e40f #417: Don't hide vote results table if status is reset 2012-11-21 19:39:55 +01:00
Emanuel Schuetze
17d813e08b Show error message for NameError. 2012-11-21 19:36:12 +01:00
Norman Jäckel
af6c403936 Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector. 2012-11-21 15:14:38 +01:00
Norman Jäckel
06af94fb91 Fix assignment poll choosing the right method (yes-no-abstain True or False) 2012-11-21 15:03:29 +01:00
Norman Jäckel
8e886a22ef Insert a slide for groups 2012-11-21 14:22:30 +01:00
Norman Jäckel
00e77ba0fc Use join for the group list also in the participant view 2012-11-21 14:09:47 +01:00
Norman Jäckel
5939b98772 Use join for group list in UserSlide.html 2012-11-21 14:07:14 +01:00
Norman Jäckel
d69e5a246b Fix urls.py - Redirect from / to the dahsboard 2012-11-21 13:41:16 +01:00
Emanuel Schuetze
7fa86f7de0 Used blocktrans instead of trans 2012-11-20 12:37:16 +01:00
Emanuel Schuetze
ec10f357cf Used RedirectView from openslides.utils.views. Used reverse_lazy 
instead of hard coded redirect url.
 2012-11-20 12:19:12 +01:00
Emanuel Schuetze
5e97ece5f4 #278: Used cycle rowcolor in vote results table also for inavlid votes row 2012-11-19 23:52:48 +01:00
Emanuel Schuetze
0fbb7dced3 Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!) 2012-11-19 23:30:09 +01:00
Emanuel Schuetze
844b2892f1 Updated translation for professional support footer. 2012-11-19 23:05:38 +01:00
Emanuel Schuetze
c5595effef Updated translation. 2012-11-19 22:59:13 +01:00
Emanuel Schuetze
93d2dc8d7d Restructuring and optimization of assignment templates. 
(Now: elected candidates are marked in candidate list; blocked candidates not visible for status 'finished')
 2012-11-19 22:54:09 +01:00
Emanuel Schuetze
0cf4191934 Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty. 2012-11-17 23:44:41 +01:00
Emanuel Schuetze
b10cf331ab Updated translation 2012-11-17 22:24:29 +01:00
Emanuel Schuetze
27fa32b718 Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard) 2012-11-17 22:14:49 +01:00
Emanuel Schuetze
e338529865 #296: Localised the datetime in PDF header 2012-11-17 21:44:17 +01:00
Emanuel Schuetze
71eb529adf Fixed #403: Moved projector control icons into projector live widget (Added RequestContext to check perms in template.) 2012-11-17 20:59:30 +01:00
Emanuel Schuetze
f1fb68a569 #375: Missing translation of participant type in participant PDF list. (Now get_type_display() is used.) 2012-11-17 20:02:16 +01:00
Andy Kittner
28cf531e4d Pass along database path to create_settings if started as portable version 2012-11-09 13:45:52 +01:00
Oskar Hahn
b8bbec3a04 Merge pull request #42 from emanuelschuetze/master 
Several minor fixes for 1.3-beta2
 2012-11-09 01:16:37 -08:00
Oskar Hahn
6719cca7e1 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2012-11-09 09:52:00 +01:00
Oskar Hahn
54fb61d211 fixed main.py and manage.py for the openslides.exe 2012-11-09 09:51:10 +01:00
Emanuel Schuetze
81570b61e6 Rename submenu titel 'projector' to 'dashboard'. 2012-11-08 20:11:06 +01:00
Emanuel Schuetze
216ac95cfb Redirect to dashboard after submit widget selection form. 2012-11-08 20:08:09 +01:00
Emanuel Schuetze
5623bb6888 Move professional support message into base template footer. 2012-11-08 19:13:31 +01:00
Emanuel Schuetze
533c65562d Don't allow to deactivate or delete the superuser or yourself. 
Otherwise it's very danger to lock out your current (superuser) session.
 2012-11-08 18:57:53 +01:00
Emanuel Schuetze
e601d8a5a3 Fixed display_name of widgets. 2012-11-08 09:43:04 +01:00
Emanuel Schuetze
7c75f42d85 Updated translations. 2012-11-08 09:42:35 +01:00
Oskar Hahn
cbea48ab7e Merge pull request #40 from emanuelschuetze/master 
Fixed type in pdf list
 2012-11-08 00:26:12 -08:00
Oskar Hahn
de7d4ed6cd Merge pull request #34 from normanjaeckel/UserSlide 
Add UserSlide with new template.
 2012-11-08 00:25:04 -08:00
Emanuel Schuetze
8d599d6428 Fixed type in participants PDF list. 2012-11-08 09:22:23 +01:00
Oskar Hahn
f551b2fa6d Merge pull request #39 from emanuelschuetze/master 
Last translation update for 1.3-beta2
 2012-11-07 13:43:02 -08:00
Emanuel Schuetze
71790a345b Fixed some English strings. Updated translations. 2012-11-07 22:37:33 +01:00
Oskar Hahn
030058fb7c Merge pull request #37 from andkit/master 
Fix UnicodeError on widgets page
 2012-11-07 13:35:24 -08:00
Emanuel Schuetze
a3627b77b4 Added new allowed language (French). 2012-11-07 22:24:39 +01:00
Emanuel Schuetze
b66a57d341 Prepared 1.3-beta2 release. 2012-11-07 22:21:55 +01:00
Emanuel Schuetze
9d183e9746 Rename user group to group. Updated translations. Clean up new french po file. 2012-11-07 22:16:11 +01:00
Emanuel Schuetze
7b64d464f5 Added user view url also for last_name. 2012-11-07 21:27:59 +01:00
Andy Kittner
32a76e2aad Fix UnicodeError on widgets page 2012-11-07 21:12:52 +01:00
Emanuel Schuetze
af4f923527 Fixed KeyError in main.py. 2012-11-07 20:48:07 +01:00
Oskar Hahn
0330f74d1b Merge pull request #35 from andkit/master 
Fix missing translations (#415)
 2012-11-07 01:24:54 -08:00
Oskar Hahn
4b2fddc9ce Merge pull request #36 from ostcar/fr 
Added fr translation. The work was done from Moira.
 2012-11-07 01:24:09 -08:00
Oskar Hahn
a691db5d30 updated fr translation 
Thx to Moira
 2012-11-07 10:22:32 +01:00
Oskar Hahn
2d9b0a8848 delete the projector cache after 1 second. 2012-11-07 10:05:38 +01:00
Oskar Hahn
13b5336af9 Merge pull request #33 from ostcar/manage 
fixed manage.py
 2012-11-07 00:59:35 -08:00
Andy Kittner
fbd77da788 Fix missing translations (#415) 
- The text "motions" was used with a plural here, but it was also
  present in other places without a plural, therefore the .po file
  contained only a singular translation. Solved by disambiguating the
  uses with a context

- The submitter field of the MotionManagerForm was missing a label
 2012-11-07 00:12:15 +01:00
Norman Jäckel
35e41873a0 Add UserSlide with new template. 2012-11-06 00:02:44 +01:00
Oskar Hahn
41c1c5a2c8 Added fr translation 2012-11-05 18:41:53 +01:00
Emanuel Schuetze
a363efe2ef Fixed #390: Added new user field 'about me' 2012-11-03 09:34:42 +01:00
Emanuel Schuetze
005cb2f15e Updated translations. 2012-11-03 08:59:34 +01:00
Oskar Hahn
3c58d8d64b fixed manage.py 2012-11-02 20:57:59 +01:00
Oskar Hahn
424d10cb63 Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1' 
Conflicts:
	openslides/__init__.py
	openslides/projector/views.py
 2012-10-31 15:27:47 +01:00
Norman Jäckel
3b4e19ad3b Enhence template of UserView and GroupView 2012-10-31 14:47:42 +01:00
Norman Jäckel
ac25e02e2d Catch another IOError in get_version() 2012-10-31 14:38:06 +01:00
Emanuel Schuetze
d9ccb02969 Changed version number string. Important for building portable version. 
Used alpha|beta|rc without git commit hash.
Added 'dev' suffix which use git hash only. It is easier to handle in file names of releases.
 2012-10-31 07:11:53 +01:00
Emanuel Schuetze
8ffeadfe88 Cleared projector cache if countdown enabled or overlay message changed. 2012-10-30 23:45:06 +01:00
Emanuel Schuetze
3dd5ce9e73 Fixed default password generation while CSV import. 2012-10-30 23:10:23 +01:00
Emanuel Schuetze
9a522f3835 Use participant_sort_users_by_first_name config var for overview table, participant list (pdf) and first time passwords (pdf). 2012-10-30 23:00:24 +01:00
Emanuel Schuetze
4ee518dd96 Updated translations (for sorting participants). 2012-10-30 22:59:37 +01:00
Emanuel Schuetze
aa0abec970 Fixed motion csv import error. 2012-10-30 22:30:32 +01:00
Emanuel Schuetze
145a52eb24 Updated translations. 2012-10-30 22:16:43 +01:00
Emanuel Schuetze
85771c4af6 Fixed participant CSV import. 2012-10-30 22:05:03 +01:00
Emanuel Schuetze
f62b7f299b Changed admin full name to "Adminstrator". 2012-10-30 21:02:39 +01:00
Emanuel Schuetze
d9fbfeff84 for pull request #23: Removed "You have access to apps" code from welcome widget. 2012-10-30 20:18:16 +01:00
Emanuel Schuetze
51a762b4c6 Prepared 1.3-beta1 release. 2012-10-30 20:05:54 +01:00
Emanuel Schuetze
0c797aa476 Merge remote branch 'upstream/master' 2012-10-30 20:03:17 +01:00
Norman Jäckel
c13f4ba52d Add UserView and GroupView part 2 2012-10-30 00:07:25 +01:00
Oskar Hahn
9dc799ef5e fixed projector_cache. 
It still does not work, but it does show changes on slides now
 2012-10-29 23:26:10 +01:00
Oskar Hahn
f4e1f83f15 rename test_name_surfix in test_name_suffix in participant/tests.py 2012-10-29 16:27:15 +01:00
Norman Jäckel
b213e75223 Enhancement to ticket # 389 (Message on assignment slide when no vote results yet available) 2012-10-29 10:16:12 +01:00
Oskar Hahn
79c5e93422 Redesigned the QuestioMixin 2012-10-28 19:59:41 +01:00
Norman Jäckel
21c12a6d32 Fix POST request in SupportView 2012-10-28 17:44:15 +01:00
Oskar Hahn
a100fd5d78 Merge pull request #30 from normanjaeckel/SupportView_in_motion 
New: Support view in motion
 2012-10-28 07:19:10 -07:00
Norman Jäckel
9d3d095162 Clean up SupportView. Raise error message at GET request instead of POST. 2012-10-28 02:09:47 +02:00
Norman Jäckel
015dc159ed Add UserView and GroupView part 1 2012-10-27 18:17:22 +02:00
Norman Jäckel
3f0c31d12b Add user widget and group widget, see # 379 2012-10-26 18:16:09 +02:00
Norman Jäckel
1063e7011a Change query for assignments in personal_info_widget 2012-10-26 17:14:46 +02:00
Norman Jäckel
510aca54eb Add widget with personal info, ticket #25 2012-10-25 23:58:32 +02:00
Norman Jäckel
0ec106a034 Fix message on assignment slide, ticket #389 2012-10-25 22:18:20 +02:00
Norman Jäckel
d6ebbdc541 Fix plural-error on ballot paper, ticket #393 2012-10-25 21:57:02 +02:00
Norman Jäckel
1849e14dbf Insert widget with static welcome text (see frontpage and config tab), ticket #387 2012-10-25 21:47:59 +02:00
Norman Jäckel
4052e137a2 Insert new list with all elected candidates, see ticket #374 2012-10-25 21:28:13 +02:00
Norman Jäckel
d0771063b3 Fix assignment overview table, ticket #372 2012-10-25 21:08:29 +02:00
Oskar Hahn
c4e6466926 Added cache for the ajax-version of the projector 2012-10-25 15:17:25 +02:00
Oskar Hahn
1002ecc6e6 Remove redundant keyword for the SupportView class 2012-10-25 10:25:59 +02:00
Oskar Hahn
2e41dcdefe Fixt problems with the permission of supporting and unsupporting a motion 
Ticket #377
 2012-10-25 10:15:41 +02:00
Oskar Hahn
7dcc2374f4 Merge remote-tracking branch 'openslides/master' into supporter 
Conflicts:
	openslides/application/urls.py
	openslides/motion/models.py
	openslides/motion/views.py
 2012-10-25 09:23:24 +02:00
Oskar Hahn
87d5f4b6f8 Updated german translation 2012-10-24 12:55:25 +02:00
Oskar Hahn
a0242c3c74 Show linebreaks in assignment description. #392 2012-10-24 12:48:11 +02:00
Oskar Hahn
413cd27d40 fixed deletion of motions. #391 2012-10-24 12:45:40 +02:00
Oskar Hahn
57d591fee8 Renamed category to detail 2012-10-24 12:30:45 +02:00
Oskar Hahn
56b9e831c8 Allowd access to the dashboard per default. #361 2012-10-24 12:21:44 +02:00
Oskar Hahn
3e1938941f Append a default class for the person-api. 
Also fixed the assignment-ballot-paper for group-persons
 2012-10-24 12:15:29 +02:00
Oskar Hahn
c58d478151 rename render_to_forbitten to render_to_forbidden. #370 2012-10-24 11:39:27 +02:00
Oskar Hahn
17afa3c5d1 fixed #326 whitespace in allready used names 2012-10-24 11:35:07 +02:00
Oskar Hahn
681d909fa3 rename application to motion 2012-10-24 11:07:36 +02:00
Norman Jäckel
c036be05bf Fix new class based view for support/unsupport motions. Fix strange error in QuestionMixin. 2012-10-23 11:54:18 +02:00
Norman Jäckel
fe69973dcc Change version number to 1.3a1. Insert git hash as suffix of the version number. (Ticket #388) 2012-10-23 02:03:47 +02:00
Emanuel Schuetze
fa9874038e New welcome widget. 2012-09-20 20:45:37 +02:00
Oskar Hahn
3aefd252ff Merge remote-tracking branch 'emanuel/master' 2012-09-20 10:05:00 +02:00
Oskar Hahn
5b97250df2 Small fix with the overlay message 2012-09-20 09:55:27 +02:00
Emanuel Schuetze
a60f03aebc Fixed: Application is deleted if user clicks 'No' in confirm form. 2012-09-19 17:00:40 +02:00
Emanuel Schuetze
9f9ea81fc6 Fixed attribute error if anonymous opens application/assignment view. 2012-09-19 14:16:17 +02:00
Emanuel Schuetze
4cd1ad5954 Fixed missing supporters number 2012-09-19 11:58:24 +02:00
Norman Jäckel
3bde0a8af9 Use Class-based View to support or unsupport an application. Use QuestionMixin for a confirm message 2012-09-19 03:10:15 +02:00
Emanuel Schuetze
613956b62a Fixed missing blue 'candidate elected' line in assignment projector template. 2012-09-18 22:55:31 +02:00
Emanuel Schuetze
1548479069 Fixed application and assigment ballot paper: don't use old profile object. 2012-09-18 22:47:12 +02:00
Emanuel Schuetze
12d8527255 Updated translations. 2012-09-18 22:40:30 +02:00
Emanuel Schuetze
9cb9270df3 Assignment: Fixed generating ballot pdf paper (typo: surfix). 2012-09-18 22:37:53 +02:00
Oskar Hahn
5aa2bc650f Merge pull request #18 from normanjaeckel/Default_Sorting 
Default sorting using Meta Class option and new config var
 2012-09-15 00:23:50 -07:00
Oskar Hahn
eb267acf08 removed scrollbar in projector-template 2012-09-15 09:13:36 +02:00
Oskar Hahn
2984fd791c small fix to the person api 2012-09-15 09:11:56 +02:00
Norman Jäckel
0db8af15b7 Clean up the code for pull request 2012-09-14 23:53:59 +02:00
Norman Jäckel
269b093b28 Enhence use of config var and Meta Class for default sorting of users 2012-09-14 03:02:00 +02:00
Norman Jäckel
e5c132e34c Use new config var for sorting users 2012-09-14 02:46:43 +02:00
Norman Jäckel
f41fe87656 Insert new config var for sorting Users by first_name 2012-09-14 02:40:40 +02:00
Norman Jäckel
f8d3390c78 Docstrings and sorting of Users and Groups in the UsersAndGroupsToPersons class object (was: UsersConnector) 2012-09-14 02:24:02 +02:00
Norman Jäckel
811b780fb9 Fix typo TYPE_CHOICE to TYPE_CHOICES 2012-09-14 01:52:20 +02:00
Norman Jäckel
cb3b26c45d Default sorting of applications using Meta Class 2012-09-14 01:14:25 +02:00
Norman Jäckel
77ae543ff2 Using Meta Class for ordering assignments by name 2012-09-14 00:21:59 +02:00
Oskar Hahn
eac23ecd99 remove confusing image 2012-09-13 22:02:42 +02:00
Oskar Hahn
56e3fe7a37 fix translation 2012-09-13 21:56:50 +02:00
Oskar Hahn
f0f14861e8 fixed message for unblocking users 2012-09-13 21:51:50 +02:00
Oskar Hahn
d8136045bb update application pdf 2012-09-13 21:33:57 +02:00
Oskar Hahn
0cf0e58af9 Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides 
Conflicts:
	openslides/assignment/models.py
 2012-09-13 15:28:35 +02:00
Oskar Hahn
ef7deb90c9 translate agenda hidden filter in js 2012-09-13 15:21:43 +02:00