Commit Graph

1877 Commits

Author SHA1 Message Date
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
Oskar Hahn
20ac817d49 Fixed error message when delrun after the list is closed 2012-09-13 15:07:24 +02:00
Oskar Hahn
e64f4f5efc show blocked candidates of an assignment 2012-09-13 14:59:14 +02:00
Oskar Hahn
0725003377 clarify the submitter name in the application pdf
It was not clear, that the submitter should sign the formular
2012-09-13 12:16:46 +02:00
Oskar Hahn
48a992119a Fixted permissions for editing an application
The suppmitter could edit an application after it was finished by
manipulating the url
2012-09-13 12:09:17 +02:00
Oskar Hahn
b15d70d13d typo 2012-09-13 11:52:04 +02:00
Oskar Hahn
bcfceccb09 dont use simular passwords in gen_password (no Il10oO) 2012-09-13 11:50:06 +02:00
Oskar Hahn
63835e7443 fixed application deletion 2012-09-13 11:43:11 +02:00
Oskar Hahn
760f8e042e some fixes 2012-09-12 10:17:51 +02:00
Emanuel Schuetze
7376b7a692 Updated translations. 2012-09-11 20:50:53 +02:00
Emanuel Schuetze
e9ac336b61 Fixed wrong permissions: can_create_applications instead of can_manage_applications 2012-09-11 20:20:58 +02:00
Emanuel Schuetze
bc25937aa0 Updated translations. 2012-09-11 19:57:22 +02:00
Oskar Hahn
93ee260856 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2012-09-11 19:30:50 +02:00
Oskar Hahn
38d53bbb92 fixed first-time-pdf 2012-09-11 19:30:12 +02:00
Oskar Hahn
8732b67bd8 Merge pull request #14 from ostcar/no_recandidate
block a user to be a candidate from a assignment, if he delete his candidation by him self
2012-09-11 00:52:50 -07:00
Oskar Hahn
d6a0ec5893 Merge pull request #11 from normanjaeckel/custom_slides
Insert weight field in custom slides and order custom slides in the
2012-09-11 00:47:07 -07:00
Emanuel Schuetze
51ab5e3850 Minor style for widgets. 2012-09-11 00:05:20 +02:00
Emanuel Schuetze
2bf992117c Updated widget titel and icons. 2012-09-11 00:00:44 +02:00
Emanuel Schuetze
15ab01c9d1 Removed unused mainmenu and submenu blocks. 2012-09-10 23:43:33 +02:00
Emanuel Schuetze
2f3e57bf4a Removed unused base_assignment.html template. 2012-09-10 23:40:08 +02:00
Emanuel Schuetze
a77bb31a2a Clean template code. 2012-09-10 23:38:20 +02:00
Emanuel Schuetze
473c2c347f Removed unused base_agenda.html template. 2012-09-10 23:37:59 +02:00
Emanuel Schuetze
889bd66e04 Adjusted dashboard templates for twitter bootstrap.
Reduced jquery-ui stuff to really neccessary files.
2012-09-10 23:28:19 +02:00
Emanuel Schuetze
b705df8c5f Changed redirect to dashboard after changing password. 2012-09-10 21:02:58 +02:00
Emanuel Schuetze
e50abbbf03 Restructured base.css. 2012-09-10 18:03:33 +02:00
Emanuel Schuetze
ce233fc870 Updated config template. 2012-09-10 17:40:41 +02:00
Emanuel Schuetze
74ffad6ced Minor changes for template style. 2012-09-10 17:17:22 +02:00
Emanuel Schuetze
65840d4261 Minor changes in assigment view template. 2012-09-10 17:15:43 +02:00
Emanuel Schuetze
94ffb3ab45 Redesign login template. 2012-09-07 21:25:18 +02:00
Emanuel Schuetze
6a3bead5f6 Cleanup template code and style. 2012-09-06 23:59:03 +02:00
Emanuel Schuetze
ae51d9e7da Adjusted template for assignment app. 2012-09-06 23:58:20 +02:00
Emanuel Schuetze
7c90206b3f Adjusted new template for participant app. Added new generic form. 2012-09-06 22:41:24 +02:00
Oskar Hahn
75eb596547 block a user to be a candidate from a assignment, if he delete his
candidation by him self
2012-09-06 15:57:42 +02:00
Norman Jäckel
d1c12ea0e5 Sorting applications in the widget by number 2012-09-05 22:42:44 +02:00
Norman Jäckel
2ecd552d2b Default Sorting of applications by number 2012-09-05 22:38:40 +02:00
Norman Jäckel
d84a8d2bdd Sorting assignments by name in the widget 2012-09-05 22:19:53 +02:00
Norman Jäckel
55073494fc Insert weight field in custom slides and order custom slides in the widget 2012-09-05 21:54:34 +02:00
Emanuel Schuetze
8da28310f7 Hide optional columns on mobile devices (with small window width). 2012-09-05 07:54:01 +02:00
Emanuel Schuetze
13cfdb36af Updated login form to new template style. 2012-09-05 00:43:19 +02:00
Emanuel Schuetze
7fde53a09e Updated template with twitter bootstrap. Step 1: agenda and application. 2012-09-05 00:20:28 +02:00
Andy Kittner
1b65044223 Remove a few spaces for pep8 conformance 2012-08-28 19:07:40 +02:00
Andy Kittner
cc20ec3456 Add special handling to determine default settings for portable version
The portable version will prefer to create it's settings in it's own
directory and only fallback to a user-specific path
($LOCAL_APPDATA/openslides) if this directory is not writable
2012-08-27 21:48:46 +02:00
Norman Jäckel
6d1c356ffd Name openslides_personal_settings.py and openslides_global_settings.oy 2012-08-24 14:23:12 +02:00
Norman Jäckel
32cfa6c914 Fix encoding error in settings.py #349 2012-08-23 23:34:30 +02:00
Emanuel Schuetze
777d2266bc Fixed drag'n'drop of widgets into empty dashboard column. Renamed
projector-control{js|css} files into dashboard{js|css}.
2012-08-22 09:39:20 +02:00
Oskar Hahn
423f04d0be send overlay message data to own view 2012-08-15 18:00:22 +02:00
Oskar Hahn
705fb972b1 removed projector link from agenda 2012-08-15 13:44:15 +02:00
Oskar Hahn
416f3f6ff3 added select widgets view 2012-08-15 13:42:25 +02:00
Oskar Hahn
6b7ea558fc rewrote widgets for the dashboard 2012-08-15 11:56:43 +02:00
Oskar Hahn
dfb24ba61a Merge branch 'master' into dashboard 2012-08-15 11:05:29 +02:00
Oskar Hahn
9c031768f8 fix merge errors 2012-08-15 11:01:38 +02:00
Oskar Hahn
c6bc50e2fd rename projector to dashboard 2012-08-15 10:58:29 +02:00
Oskar Hahn
b7a0e83c68 changed the main script 2012-08-14 14:19:59 +02:00
Oskar Hahn
a2be848932 Merge branch 'master' into install 2012-08-13 19:35:14 +02:00
Oskar Hahn
bd64a6cb5c Merge branch 'stable/1.2.x'
Conflicts:
	openslides/application/models.py
	openslides/application/views.py
	openslides/participant/forms.py
	openslides/participant/views.py
2012-08-13 19:16:42 +02:00
Oskar Hahn
d0e7419666 Merge remote-tracking branch 'openslides/stable/1.2.x' 2012-08-13 18:36:23 +02:00
Oskar Hahn
5178363127 Merge pull request #6 from ostcar/translation
Translation
2012-08-13 09:30:17 -07:00
Oskar Hahn
31ca01563e some corrective actions 2012-08-13 14:37:49 +02:00
Oskar Hahn
df40de67b0 rename openslidesuser to user and openslidesgroup to group 2012-08-12 12:52:38 +02:00
Oskar Hahn
0a8ee9cbad changed request.user to be the openslidesuser 2012-08-12 10:12:26 +02:00
Oskar Hahn
6795ccd25b change the users in the groupform 2012-08-11 11:36:55 +02:00
Oskar Hahn
cdf160dfc3 fix some problems with the creation of new users 2012-08-11 11:09:20 +02:00
Oskar Hahn
f01fe5a894 removed unused imports from participant and did some pep8 changes 2012-08-11 10:51:52 +02:00
Oskar Hahn
bc3e7fdaab rewrote the group views as class based views 2012-08-11 10:09:54 +02:00
Oskar Hahn
9b3bec69d1 rewrote the passwort reset view as class base view 2012-08-10 21:24:26 +02:00
Oskar Hahn
87af568eeb redesign the DeleteView
Append a QuestionMixin to send a question via the django message api
2012-08-10 21:00:13 +02:00
Oskar Hahn
1f2f7cc73a rewrote user csv import
The import does not delete the existing users anymore, but append the users as new users.
2012-08-10 19:49:46 +02:00
Oskar Hahn
bb00eb3eb4 rewrote participant status view as class based view 2012-08-10 19:19:41 +02:00
Oskar Hahn
90fddba63b rewrote delete participant view as class based view 2012-08-10 13:29:46 +02:00
Oskar Hahn
c029fe2f95 ix participant tests 2012-08-10 13:26:03 +02:00
Oskar Hahn
ddb5756868 rewrote the participant edit view as class based view 2012-08-10 13:22:09 +02:00
Oskar Hahn
1832a0c125 make the openslides user a child model of the django user model 2012-08-10 13:11:10 +02:00
Oskar Hahn
29049119f7 rewrote participant overview as class based view 2012-08-10 11:51:45 +02:00
Oskar Hahn
f008a4eb0a use OpenSlides.get_full_name instead of OpenSlides.user.get_full_name 2012-08-10 11:18:01 +02:00
Oskar Hahn
153482f32d first_name, last_name and name_surfix as OpenSlidesUser attributes 2012-08-10 11:14:11 +02:00
Norman Jäckel
3ba04e10b4 Fix typo in default permissions for anonymous-group 2012-08-10 00:37:23 +02:00
Oskar Hahn
b19f6a7d74 Merge branch 'master' into install
Conflicts:
	openslides/__init__.py
2012-08-08 13:45:32 +02:00
Oskar Hahn
5353053d29 Merge branch 'stable/1.2.x'
Conflicts:
	openslides/application/views.py
2012-08-08 11:21:36 +02:00
Oskar Hahn
75443808af fix some errors in participant 2012-08-08 10:52:13 +02:00
Oskar Hahn
d1ab2f2e85 some pep8 corections for the participant app 2012-08-08 10:34:23 +02:00
Oskar Hahn
f22362df9d made participant-test run again 2012-08-08 10:07:36 +02:00
Oskar Hahn
1719aa588d rename some user api and participant names 2012-08-07 22:43:57 +02:00
Oskar Hahn
b55ceddb82 append tests for the participant app 2012-08-07 10:15:39 +02:00
Oskar Hahn
ab33b9f05a fix error in application-supporters an assignment-candidates, for non admin users 2012-08-06 14:58:52 +02:00
Oskar Hahn
f8f6e712a7 added LOCALE_PATHS to openslides_settings to avoid deprication in Django 1.5 2012-08-05 22:35:09 +02:00
Oskar Hahn
c52f8f3ca7 changed application to motion and permitted to authorized in message-strings 2012-08-05 22:31:20 +02:00
Oskar Hahn
008c743650 fixt #334. Let the anonymous user see the assignments by default 2012-08-05 11:58:11 +02:00
Oskar Hahn
998fb3e1ee fix #336. The admin could not edit the supporters from applications 2012-08-05 11:48:03 +02:00
Oskar Hahn
4873cd7163 fixted #330. Error if the related slide for an Agenda Item does not exists 2012-08-05 11:28:56 +02:00
Oskar Hahn
bcd98301a9 remove mercurial_version from openslides.__init__ 2012-08-05 10:59:25 +02:00
Oskar Hahn
feb1aa4138 make start.py script run again 2012-08-05 09:52:00 +02:00
Oskar Hahn
e3f8bfcfd0 update setup.py to make an openslides module 2012-08-04 20:59:27 +02:00
Oskar Hahn
1a1bcb2358 updated some parts of OpenSlides to the new user-api 2012-08-04 15:15:11 +02:00
Oskar Hahn
465497ab30 some pep8 changes for the user-api 2012-08-04 14:47:09 +02:00
Oskar Hahn
72e41fe286 user-api: reorderd the user-api 2012-08-04 13:18:06 +02:00
Oskar Hahn
fe1ebf806a user-api: Use the right Exception in get_user() 2012-08-04 12:51:07 +02:00
Oskar Hahn
8da09bb985 user-api: fix an error with deactivated supporters in application 2012-08-04 12:46:32 +02:00
Oskar Hahn
14bf6d0a35 user-api: updated the application-supporter system to new user-api 2012-08-04 12:19:31 +02:00
Oskar Hahn
2bc2dad7a5 user-api: small fix for the second poll in assignment 2012-08-03 19:15:14 +02:00
Oskar Hahn
8fcf65e829 user-api: make the assignments work with the new user-api 2012-08-03 18:56:00 +02:00
Oskar Hahn
c16d38d9a3 user-api: Load the User-List from UserFormField on any request 2012-08-03 16:25:04 +02:00
Oskar Hahn
1ae91d1130 changed user-api, so it can be filter the result for the prefix and the id 2012-08-03 14:23:13 +02:00
Oskar Hahn
4f61c763d7 started to rewrite the assignment-code for the new user-api 2012-08-03 13:49:05 +02:00
Oskar Hahn
93020f9ead mark group to be teated as user 2012-08-03 12:44:34 +02:00
Oskar Hahn
4ffb701397 created new user-api 2012-08-03 00:11:53 +02:00
Oskar Hahn
e34f90aad1 update german translation 2012-07-28 11:09:00 +02:00
Oskar Hahn
47a40150e6 added " befor permitted.
This changes a translation string
2012-07-28 11:01:57 +02:00
Oskar Hahn
b2ce59080e #332 use an specific name for the session cookie 2012-07-27 23:18:31 +02:00
Oskar Hahn
ecfeb170f3 we can not redirect from a poll, that does not exists to an assignment. 2012-07-27 22:49:38 +02:00
Oskar Hahn
9a87db61cc #329 fix attribute error for anonymous users in the application view 2012-07-27 11:56:20 +02:00
Emanuel Schuetze
feb82bd531 Updated translation. 2012-07-25 23:21:30 +02:00
Emanuel Schuetze
8b39a4dfeb Hide div container of tabledrag to eleminate space between table and number of items. 2012-07-25 21:37:20 +02:00
Emanuel Schuetze
5d367dd635 Prepared 1.2 release. 2012-07-25 14:10:55 +02:00
Emanuel Schuetze
172b90ea1b #328: Translated application status error message. 2012-07-24 07:32:20 +02:00
Emanuel Schuetze
0c0f3d09da #328: Show error message if application status is already set. 2012-07-23 23:17:03 +02:00
Emanuel Schuetze
1f3cfaf25a Added ugettext_lazy for 403 error page. 2012-07-23 23:06:36 +02:00
Emanuel Schuetze
f3d656c98d #325: participant/passwords/print/ raises server-error 2012-07-23 23:03:42 +02:00
Emanuel Schuetze
f12d155651 Added linebreak. 2012-07-23 23:00:00 +02:00
Emanuel Schuetze
cdddc00d54 Improved else block. 2012-07-23 22:59:31 +02:00
Emanuel Schuetze
f36ad67bb9 Removed additional <hr> tag from custom slides widget. 2012-07-23 19:21:47 +02:00
Emanuel Schuetze
d58e8f4c84 Fixed filename of assignment poll pdf. 2012-07-23 12:58:46 +02:00
Emanuel Schuetze
bf5181e241 Fixed missing translation in PDF title and filename. 2012-07-23 12:57:47 +02:00
Emanuel Schuetze
219b1e936e Fixed two PDF build errors. 2012-07-23 12:35:15 +02:00
Oskar Hahn
9d2a011958 update translation 2012-07-23 09:33:19 +02:00
Oskar Hahn
797396d94d #322 remove the dot at the end of a assignment-model verbose-name 2012-07-23 09:30:34 +02:00
Emanuel Schuetze
0ce6627756 Fixed csv import error. 2012-07-23 08:55:05 +02:00
Norman Jäckel
e74e80299f Fix application links in the widgets. 2012-07-23 00:41:44 +02:00
Oskar Hahn
fedfe802e3 #315 remove 'application' from agenda/widget.html, too 2012-07-20 13:26:45 +02:00
Oskar Hahn
93f9e2dc97 fix error in the translation of the participant-list 2012-07-20 11:40:36 +02:00
Oskar Hahn
8854f7f9ba #319 sort participants by there last_name by default 2012-07-20 11:34:37 +02:00
Oskar Hahn
e1a2f18f74 #316 fix translation of the confirm message in the general config page 2012-07-20 11:31:28 +02:00
Oskar Hahn
e2d658b0d8 #321 change assignment string for the comment on the ballot paper 2012-07-20 11:24:34 +02:00
Oskar Hahn
ff4529d8eb #315 remove application from agenda by appending a new methode get_application_title_supplement 2012-07-20 11:22:09 +02:00
Oskar Hahn
078125a1a2 update translation 2012-07-20 11:05:04 +02:00
Oskar Hahn
0c834532db #317 change string for the automatic methode of choosind the right assignment-poll-methode 2012-07-20 10:59:34 +02:00
Oskar Hahn
469e93e21d rm beamer.html from agenda. created by merging the 1.2-dev branch in the default branch 2012-07-20 10:55:57 +02:00
Oskar Hahn
ba783489f2 changle end of line to windows for some files 2012-07-20 10:55:07 +02:00
Emanuel Schuetze
189d0bf5e1 Merged. 2012-07-19 14:55:58 +02:00
Norman Jäckel
fd0f3d68fa Fix typo in participant/views.py 2012-07-19 12:27:45 +02:00
Oskar Hahn
834c30321b #310 Redirect to the password-change-page if the admin has not changed his password yet 2012-07-19 11:43:48 +02:00
Oskar Hahn
f928abd006 merge 2012-07-19 11:16:38 +02:00
Oskar Hahn
70b161c539 added name for participant app in __init__
removed some files, added though branch merge
2012-07-19 11:11:07 +02:00
Emanuel Schuetze
90905d3e53 Updated jquery from 1.7.1 to 1.7.2. 2012-07-19 08:45:48 +02:00
Emanuel Schuetze
7a9d475dae Updated css property border-radius. 2012-07-19 08:37:41 +02:00
Emanuel Schuetze
c678b557fa #311: Updated first login message and translations. 2012-07-19 08:21:51 +02:00
Emanuel Schuetze
7ff3d1382d #304: Added link to projector-view for non-admins 2012-07-19 07:54:49 +02:00
Emanuel Schuetze
4fe77f89d3 Updated translations. 2012-07-18 21:15:12 +02:00
Emanuel Schuetze
9b3103d4a8 #284: Updated i18n links and added gettext requirement note. 2012-07-18 20:44:02 +02:00
Oskar Hahn
8f4970e16c merge 1.2-dev with default branch 2012-07-18 10:37:23 +00:00
Oskar Hahn
365f844164 update translation 2012-07-18 10:53:19 +02:00
Oskar Hahn
9b8517faeb default value for the config value admin_password 2012-07-18 10:46:26 +02:00
Oskar Hahn
b327d41ee6 #306 show admin password if it hasn't changed 2012-07-18 10:46:07 +02:00
Emanuel Schuetze
db22ecfde8 Prepared 1.2-rc1 release. 2012-07-16 22:47:59 +02:00
Emanuel Schuetze
2a0e7ef2c4 Updated translation. 2012-07-16 22:37:59 +02:00
Emanuel Schuetze
0d3dcaf433 Merged. 2012-07-16 22:26:48 +02:00
Emanuel Schuetze
d428841735 Fixed translation. 2012-07-16 22:26:07 +02:00
Emanuel Schuetze
80d16a2852 Fixed missing error/condition ('candidate list already closed') for participants without manager permissions. 2012-07-16 22:21:23 +02:00
Oskar Hahn
fd6961234a set DEBUG=False in default.settings.py 2012-07-16 18:13:53 +02:00
Oskar Hahn
76e52cf01a #300 dont show votecast and voteinvalid symbols, if the vote has no votes 2012-07-16 14:29:30 +02:00
Oskar Hahn
4e5884bda4 #298 fix problem with a votecast of 0, -1 and -2 2012-07-16 14:10:56 +02:00
Oskar Hahn
07c4649243 #297 fix error in ApplicationPDF with changes in the poll API 2012-07-16 14:05:51 +02:00
Oskar Hahn
0b033271f8 fix some typos, mostly {%trans to {% trans 2012-07-16 14:00:29 +02:00
Norman Jäckel
5d5e7c10f5 Change strings in agenda overview and agenda widget concerning application items 2012-07-16 00:39:46 +02:00
Norman Jäckel
16e829a05d Change application widget - Set number behind the title.
Fix wrong application title in the beamer template
2012-07-16 00:12:12 +02:00
Norman Jäckel
0279c07b15 Change design of application view and poll view (see #292) 2012-07-16 00:01:26 +02:00
Norman Jäckel
bd9c609dc0 Change design of assignment poll view (see #292) 2012-07-15 23:17:10 +02:00
Norman Jäckel
bee6fa7147 Set initial value for posts in assingment. 2012-07-15 22:46:20 +02:00
Oskar Hahn
84a78e8584 #290 fix unicode problem for python 2.5 in strftime 2012-07-14 09:19:45 +02:00
Oskar Hahn
a1152af7ea #288 fix type error if a poll has no votecast 2012-07-14 08:48:25 +02:00
Emanuel Schuetze
e4250b6ba1 Some style fixes. 2012-07-13 16:04:00 +02:00
Emanuel Schuetze
c8eb4d26d9 #232: Removed spaces from links via CSS. 2012-07-13 15:59:58 +02:00
Oskar Hahn
88cb44e0c3 #287 fix elected candidate in assignment-slide 2012-07-13 11:33:56 +02:00
Oskar Hahn
1b0a9b27ef #294 harmonize the name of the passwort settings page. 2012-07-13 11:24:41 +02:00
Oskar Hahn
66b853a10a redesign the poll api, so it don't creates poll-tables. Also, it is easier to get the poll for a vote object.
#288 show percent after the vote results
2012-07-13 11:16:06 +02:00
Emanuel Schuetze
969816be37 Use new close icon to keep old done icon. 2012-07-13 07:58:00 +02:00
Emanuel Schuetze
9c03726bef #295: Change link to button. 2012-07-13 07:44:42 +02:00
Emanuel Schuetze
b4ee5dfff4 #293: Updated translation. 2012-07-13 07:34:15 +02:00
Norman Jäckel
e99e5ab290 Clean up browsertitles (#282) in assignment and participant tab 2012-07-13 01:10:58 +02:00
Norman Jäckel
28d6fb54a7 Clean up browsertitles (#282) in config projector 2012-07-13 00:47:53 +02:00
Norman Jäckel
32c80caa37 Clean up browsertitles (#282) in agenda and application 2012-07-13 00:44:12 +02:00
Emanuel Schuetze
accb329a44 #232: Removed spaces from links. 2012-07-12 17:24:37 +02:00
Emanuel Schuetze
ed7221e0f0 Changed to other 'done' icon to better defferentiate the projector activate icon.
Changed link help text.
2012-07-12 17:17:53 +02:00
Emanuel Schuetze
0c64309c91 Rename summary icon. 2012-07-12 17:11:33 +02:00
Emanuel Schuetze
531f0d9abb Added link help text. 2012-07-12 17:02:59 +02:00
Emanuel Schuetze
7487cf1601 Set summary icon in agenda widget at the right side to other action
icons.
2012-07-12 16:57:23 +02:00
Oskar Hahn
e80b04504f #194 fix password when importing users via csv 2012-07-12 14:37:01 +02:00
Oskar Hahn
cea2bbbf7d update translation 2012-07-12 14:19:08 +02:00
Oskar Hahn
8cdcc95fd9 #286 import error in the agenda overview slide 2012-07-12 14:06:58 +02:00
Oskar Hahn
07a0d42577 #285 append tabs to password-change-view 2012-07-11 09:46:15 +02:00
Oskar Hahn
68215e78d6 add Licence for django-jsonfield 2012-07-11 09:45:48 +02:00
Oskar Hahn
aa130ab2da cleanup openslides base files.
Do not manipulate the pythonpath anymore.
2012-07-10 14:00:51 +02:00
Oskar Hahn
5fcef8aba4 cleanup utils 2012-07-10 13:19:12 +02:00
Oskar Hahn
debaa505fb fix problems with reportlab and ugettext_lazy 2012-07-10 12:11:07 +02:00
Oskar Hahn
e22467b06e cleanup poll app 2012-07-10 11:48:03 +02:00
Oskar Hahn
01f0823ed7 cleanup the assignment app 2012-07-10 11:27:06 +02:00
Oskar Hahn
81fc7ae560 update translation 2012-07-10 02:53:49 +02:00
Oskar Hahn
85bddf6872 use "forname lastname" as default username, with a space 2012-07-10 02:50:42 +02:00
Oskar Hahn
96aca54f61 update user setting page 2012-07-10 02:46:00 +02:00
Oskar Hahn
403f8e7917 update translation 2012-07-10 02:21:27 +02:00
Norman Jäckel
25df1b8693 Deactivate the projector message overlay by default 2012-07-10 01:44:42 +02:00
Oskar Hahn
8d961f4940 fix translation by using ugettext_lazy 2012-07-10 01:33:03 +02:00
Oskar Hahn
333349a1f2 Only show voteresult-table where there is at least one published poll.
Also fix AssignmentPDF-Poll-Table
2012-07-10 00:47:00 +02:00
Andy Kittner
cd245e4605 Convert MEDIA_ROOT to unicode to avoid UnicodeWarning 2012-07-08 18:09:25 +02:00
Andy Kittner
5438b2c318 Add a workaround for django bug 18404 (fixes #204) 2012-07-08 18:09:23 +02:00
Oskar Hahn
f074cb5bfd cleanup the imports of the application app 2012-07-08 09:21:39 +02:00
Oskar Hahn
8feb195067 fix typo 2012-07-08 09:01:01 +02:00
Oskar Hahn
dc9dabff6d cleaned up the participant app. Sort of... 2012-07-07 15:26:00 +02:00
Oskar Hahn
e01d456e7b clean up the config app. Use jsonfield to save the config values.
Syncdb necessary.
2012-07-07 14:48:21 +02:00
Oskar Hahn
15621b7702 clean up the projector App 2012-07-07 14:01:40 +02:00
Oskar Hahn
eb3adcd8ca update translation 2012-07-07 11:20:30 +02:00
Oskar Hahn
f8a1c58fff #277 throw an error, in the invalid-field or the votecast-field is lower -2 2012-07-07 11:14:04 +02:00
Oskar Hahn
1889cff68b #276 fix unicode Error in html_string() function 2012-07-07 10:35:29 +02:00
Oskar Hahn
b0f561d429 realy fix lineend in assignment/view 2012-07-06 18:00:43 +02:00
Oskar Hahn
719d12e333 fix lineend in assignment/view.py 2012-07-06 17:56:17 +02:00
Norman Jäckel
e29cf868a5 Always hide Group in Assignment PDF vote_results-table 2012-07-06 15:37:22 +02:00
Norman Jäckel
e4367051df Hide "Reason" in Application PDF if there is none. 2012-07-06 15:30:14 +02:00
Norman Jäckel
59e6218a80 First Draft for Assignment PDF with fixed vote_results table. 2012-07-06 15:02:31 +02:00
Norman Jäckel
c1e9540699 Fix #280 2012-07-05 01:15:04 +02:00
Norman Jäckel
812d7a3c83 Fix #275 2012-07-05 00:23:42 +02:00
Oskar Hahn
ff44439351 #266 fix assignment view on the projector 2012-07-04 16:14:19 +02:00
Oskar Hahn
ef5b9e3281 #253 don't show unpublished polls for nonmanager in assignment view 2012-07-04 16:05:31 +02:00
Oskar Hahn
47ff052c22 fix close and unclose link via ajax 2012-07-04 15:49:33 +02:00
Oskar Hahn
b8a77e5abe rename passwort change page 2012-07-04 15:48:56 +02:00
Oskar Hahn
4e0f8670f1 update translation 2012-07-04 15:48:40 +02:00
Oskar Hahn
4eb4d2ee8d use s for sec in projector-control 2012-07-04 15:47:52 +02:00
Oskar Hahn
67426f239b only refresh the projector, if the content has changed 2012-07-04 15:00:08 +02:00
Oskar Hahn
7f2d10c9ca fix hide-closed-item function for non-manager 2012-07-04 13:12:07 +02:00
Oskar Hahn
76d2a33fc2 merge 2012-07-04 12:52:09 +02:00
Oskar Hahn
29d25d30d6 cleanup the agenda app 2012-07-04 12:50:33 +02:00
Oskar Hahn
a72832842b #267 fixt typo.
syncdb is required
2012-07-04 11:00:58 +02:00
Norman Jäckel
d654c268f7 Zusammenführen 2012-07-04 03:26:27 +02:00
Oskar Hahn
03fe1f84dd clear overlay-message via ajax 2012-07-04 03:21:03 +02:00
Norman Jäckel
a149d5a6bc Ticket #229 2012-07-04 03:19:42 +02:00
Oskar Hahn
ad8d5585f1 merge 2012-07-04 02:43:46 +02:00
Oskar Hahn
198eefbfdd rewrote projector overlay widget 2012-07-04 02:43:26 +02:00
Norman Jäckel
40c2bf481f Fix #240 2012-07-04 02:10:06 +02:00
Norman Jäckel
32a5b61da8 Insert type of an related item in the agenda widget as string behind the name
of the item
2012-07-04 00:55:37 +02:00
Norman Jäckel
ad02cb05ae Draft for vote result table on assignment view and projector. Publishing still not working. 2012-07-04 00:40:25 +02:00
Oskar Hahn
2dc0cc83f1 rewrote assignment poll output 2012-07-03 00:05:48 +02:00
Oskar Hahn
a21a96026b fix yes-no-abstain-poll in assigmnet-projector 2012-07-02 20:32:13 +02:00
Oskar Hahn
ebc81d9236 #255 fixed assignment-poll delete message 2012-07-01 17:38:34 +02:00
Oskar Hahn
8d4df3236b #243 fixt but, which created a second version for a new application 2012-07-01 17:20:02 +02:00
Oskar Hahn
e1d13e31ae #214 seperate page for password change 2012-07-01 16:56:01 +02:00
Norman Jäckel
68e26ff8c5 Fix #256 2012-07-01 16:48:44 +02:00
Norman Jäckel
acd9ba1fd1 Zusammenführen 2012-07-01 16:30:56 +02:00
Norman Jäckel
d22118ac72 Fix #252 2012-07-01 16:28:11 +02:00
Oskar Hahn
f903f350b8 insert item-summary link in the widget 2012-07-01 16:13:34 +02:00
Oskar Hahn
ff19e6d2c8 #247 summary of items for the projector 2012-07-01 16:10:26 +02:00
Oskar Hahn
00eb365b91 rewrote active_slide in generic view
also reordert some imports
2012-07-01 15:35:05 +02:00
Oskar Hahn
6c206fa740 #246 open activate slide view ajax 2012-07-01 11:07:04 +02:00
Oskar Hahn
ea4da31b0c rewrite projector_edit view as class based view 2012-07-01 10:52:08 +02:00
Oskar Hahn
2ba1b7e3bc rewrote countdown view as class based view 2012-07-01 10:44:41 +02:00
Oskar Hahn
0a269ce601 help_text for the application config page 2012-06-30 16:28:15 +02:00
Oskar Hahn
60570ea962 #245 update translation 2012-06-30 15:21:27 +02:00
Oskar Hahn
0f42dd06fd #234 take 75 chars at maximum 2012-06-30 14:50:52 +02:00
Oskar Hahn
aeb8a40875 fix typo in trivial changes 2012-06-30 14:50:14 +02:00
Norman Jäckel
c19118e774 Fix #230 2012-06-30 14:17:15 +02:00
Oskar Hahn
35e112a7d7 update translation 2012-06-30 12:24:23 +02:00
Oskar Hahn
fe7266097f #249 improve assignment PDF 2012-06-30 12:07:55 +02:00
Oskar Hahn
a48c63c132 #249 improve application pdf 2012-06-30 12:04:58 +02:00
Oskar Hahn
1b108603ea #239 don't show supporters in the application PDF, if they are disabled 2012-06-30 11:57:07 +02:00
Oskar Hahn
039446a7ca #239 don't show supporters in application edit form, if there are not needed 2012-06-30 11:50:46 +02:00
Oskar Hahn
018d53b3df #236, #244 make trivial_changes optional, and only in the edit form 2012-06-30 11:31:35 +02:00
Oskar Hahn
b9f783e9f1 #237 translate the related type 2012-06-30 11:06:32 +02:00
Oskar Hahn
e8e664b92e #237, #238 only show the first line of a comment in the agenda 2012-06-30 10:39:58 +02:00
Norman Jäckel
818a15aa2b Cf. #249 but now for assignments. 2012-06-29 11:52:23 +02:00
Norman Jäckel
aa30a1900b Short message on PDF if there are no applications (#249) 2012-06-29 11:42:28 +02:00
Norman Jäckel
cb2a4b9897 Application PDF: Fix #241 and insert version number 2012-06-29 11:22:47 +02:00
Oskar Hahn
09e6eec6f2 fix translation error in professional support 2012-06-29 00:38:34 +02:00
Oskar Hahn
587ce4093d update translation 2012-06-29 00:27:27 +02:00
Oskar Hahn
6d3061f8af cleaned poll pdf for assignment and application 2012-06-29 00:19:06 +02:00
Oskar Hahn
a00fe2b241 fix yesnoababstain in views.py 2012-06-28 22:49:02 +02:00
Oskar Hahn
4af19d091b remove elected users from an election. 2012-06-28 20:12:49 +02:00
Oskar Hahn
2fdbad55f1 rename AssignmentPoll.yesnoababstain in .yesnoabstain 2012-06-28 20:11:16 +02:00
Oskar Hahn
eafff30c49 fixe error in reverse calls 2012-06-28 20:10:48 +02:00
Norman Jäckel
3156c8b4b5 Turn on Yes-No-Abstain Ballot for Assignments/Elections, #108 2012-06-28 18:45:00 +02:00
Norman Jäckel
59fb053283 Fix #260 2012-06-28 01:14:51 +02:00
Norman Jäckel
409bfda353 Fix #257 2012-06-27 23:29:06 +02:00
Oskar Hahn
5311c7ae31 fix problem by the assignment-poll view 2012-06-24 23:31:06 +02:00
Oskar Hahn
6c66e55fc0 show right label for posts in new assignments 2012-06-24 22:38:42 +02:00
Oskar Hahn
4339c3ae8a allow to save an empty poll 2012-06-24 22:34:11 +02:00
Oskar Hahn
48c53d3cd0 link for creating an application agenda item in the sidebare 2012-06-24 22:21:46 +02:00
Oskar Hahn
3c04f6af82 translate poll options for assignments 2012-06-24 22:21:15 +02:00
Oskar Hahn
3e7e894d62 fix #250 don't allow assignments with not posts.
But for the future, see #251
2012-06-24 22:10:14 +02:00
Oskar Hahn
e9c680f5e1 update translation 2012-06-24 21:55:46 +02:00
Oskar Hahn
1a4e164dd2 refresh the projector only ones a second 2012-06-24 21:55:31 +02:00
Oskar Hahn
6a0bdb7aa2 the submitter of an application must not edit the application, after it was accepted 2012-06-24 21:52:21 +02:00
Oskar Hahn
391a10bb03 fix typo in frontpage_title 2012-06-23 15:42:25 +02:00
Oskar Hahn
b963b61385 update german translation 2012-06-23 15:36:02 +02:00
Oskar Hahn
7df1264abf rearange the userprofile. Only show first line from the user.profile.comment in the overview 2012-06-23 15:02:13 +02:00
Oskar Hahn
442a24ccd8 #222 fix to small db collumns for assignment.status and config.value
db-reset necessary
2012-06-23 13:17:50 +02:00
Norman Jäckel
4edc4f503c Edit Symbol in Application 2012-06-23 13:17:24 +02:00
Norman Jäckel
654388117b #208 and other symbol things 2012-06-23 13:14:18 +02:00
Oskar Hahn
cc42792a38 #164 call a assignmentpoll by this ballot number 2012-06-23 12:43:18 +02:00
Oskar Hahn
ae8876425a min value for polls is -2 2012-06-23 12:05:09 +02:00
Oskar Hahn
3d1e4f5489 #216 delete releated agenda-item, if the releated object (application or assignment) is deleted 2012-06-23 11:41:32 +02:00
Norman Jäckel
d110934f62 Insert title tag to Clean Message Button (#219) 2012-06-23 11:39:07 +02:00
Norman Jäckel
b1ed56176e Edit and View Links and Symbols in Widgets fixed (#206) 2012-06-23 10:43:01 +02:00
Oskar Hahn
b12ae6b0a0 #191 Create assignment-agenda Items 2012-06-23 10:27:58 +02:00
Oskar Hahn
f13ee5f409 make application tests run again 2012-06-19 10:50:55 +02:00
Norman Jäckel
a439794874 Insert Edit Symbol (Ticket 207) 2012-06-23 09:32:21 +02:00
Oskar Hahn
b6cb4223f2 #217 show agenda text again. 2012-06-19 10:19:43 +02:00
Oskar Hahn
e8bf2fce1a yes-no-abstain elections in assignments 2012-06-18 09:48:27 +02:00
Oskar Hahn
bf46342d17 #205 show Application number in projector Tab 2012-06-11 14:22:09 +02:00
Oskar Hahn
239f328372 rewrote projector-widget system 2012-06-11 13:43:48 +02:00
Oskar Hahn
960543b64e load all models in projector.views 2012-06-10 10:43:50 +02:00
Oskar Hahn
53dd1687ca fixed last commit 2012-06-10 10:11:38 +02:00
Oskar Hahn
cdef473491 fixe last commit 2012-06-10 10:08:04 +02:00
Oskar Hahn
bb816e0999 load config on each request 2012-06-09 19:39:52 +02:00
Emanuel Schuetze
2ce9815218 Prepared 1.2-beta3 release. 2012-06-06 16:40:05 +02:00
Emanuel Schuetze
a2e1b77bd6 #213 fixed (User settings form - remove User groups and active
fields).
2012-06-06 14:28:37 +02:00
Emanuel Schuetze
07a682c436 Set is_active for new participants to True. 2012-06-06 13:59:46 +02:00
Emanuel Schuetze
a6c220ca02 Reverted wrong testing code (for participants) from last commit. 2012-06-06 13:51:54 +02:00
Emanuel Schuetze
d8cd0c2b6a Renamed logo files (typo). 2012-06-04 10:17:56 +02:00
Oskar Hahn
43e30057b3 delete item, not application by releated agenda-items 2012-06-03 10:19:08 +02:00
Oskar Hahn
2e498403cb #167 fallback slide, if the slide does not exist 2012-06-03 09:43:28 +02:00
Oskar Hahn
965b682abc edit, delete, slide for releated item in agenda 2012-06-03 09:35:26 +02:00
Oskar Hahn
79893687f3 fixed error by activating a message, if it was only on a specific slide. 2012-06-03 09:05:12 +02:00
Andy Kittner
7e7ab210ab Set system url on first run (#211) 2012-05-31 00:27:47 +02:00
Andy Kittner
29057b8b87 Fix exceptions if project path contains non-utf8 characters (#204)
Django converts byte strings in various places to unicode by decoding them from
utf-8, which will break if the filesystem encoding uses something else
(e.g. fileystem encoding is latin1 and the path contains german umlauts).

Avoid these problems by explicitly decoding all paths to unicode using an
appropriate encoding.
2012-05-30 23:30:24 +02:00
Emanuel Schuetze
8cdc062628 Set version number back to dev mercurial revision 2012-05-25 09:34:50 +02:00
Emanuel Schuetze
f7eab29ed5 Fixed missing translation in poll_view assignment template (table head). 2012-05-23 14:31:12 +02:00
Emanuel Schuetze
0ab900cb7a Fixed missing permission of agenda submenu. 2012-05-23 14:30:42 +02:00
Emanuel Schuetze
279dade5c4 Fixed missing SITE_ROOT import. 2012-05-23 14:30:06 +02:00
Emanuel Schuetze
44c4fffc25 Added missing default TIME_ZONE in default.settings.py. 2012-05-23 14:29:11 +02:00
Emanuel Schuetze
0acf6734e9 Updated translations. 2012-05-21 22:02:55 +02:00
Emanuel Schuetze
7933dd2d5c Minor fixes. 2012-05-21 22:01:09 +02:00
Emanuel Schuetze
58fc689f14 Updated overlay message style in projector template. 2012-05-21 09:21:36 +02:00
Emanuel Schuetze
a737ef7300 Prepared 1.2-beta2 release. 2012-05-21 08:16:40 +02:00
Andy Kittner
0007a1dfa8 Add log messages when poll is updated/deleted (#187) 2012-05-20 23:12:50 +02:00
Emanuel Schuetze
37619b0a80 #114: Set participants tab inactive if usersettings page is active 2012-05-20 22:34:41 +02:00
Emanuel Schuetze
f8137da055 #203: Fixed highlighting more than one active line. 2012-05-20 22:20:17 +02:00
Emanuel Schuetze
5eb29ba9dd Fixed width of countdown input field. 2012-05-20 22:06:07 +02:00
Emanuel Schuetze
5581ed1222 #168: Improved countdown control buttons. 2012-05-20 22:01:44 +02:00
Emanuel Schuetze
92a64d38cf Add projector view link on front page. Fixed column for can_manage_projector permission. 2012-05-20 20:51:11 +02:00
Emanuel Schuetze
4389f5f548 #89: Added missing control_customslide.html template. 2012-05-20 20:15:49 +02:00
Emanuel Schuetze
c4450bf14e Updated translations. 2012-05-20 20:02:48 +02:00
Emanuel Schuetze
97bea50b03 Use single url for toggle publish/unpublish election ballots. 2012-05-20 20:02:36 +02:00
Emanuel Schuetze
9b6640c2ae Removed unused link var. 2012-05-20 19:44:29 +02:00
Emanuel Schuetze
406a2d18e3 Fixed can_manage_projector permission. 2012-05-20 19:43:38 +02:00
Emanuel Schuetze
189c975137 Use same url to toggle participant status. 2012-05-19 19:22:20 +02:00
Emanuel Schuetze
3a52cd56c6 #165: Use AJAX instead of page reload to publish assignment polls 2012-05-19 16:25:55 +02:00
Andy Kittner
fbc603b748 Fix initial value for pollform is value is a "special" value (#135) 2012-05-19 14:19:32 +02:00
Andy Kittner
182f20308b Fix exception in polls with special values (fallout from translation fix) 2012-05-19 13:41:30 +02:00
Andy Kittner
e005863336 Changed/ added logmessages for applications (#184, #187)
- Added a logmessage when a version is accepted/ rejected

- Made logmessage for trivial changes more explicit and include
  the names of the changed fields

- Updated translations
2012-05-19 12:46:54 +02:00
Andy Kittner
5aead54a0c Improve error message for failed logins (#199)
While #199 was already closed I think passing on the original
error message is more userfriendly as it gives more details
what the actual error was (generates specific messages for
user inactive and disabled cookies)
2012-05-19 10:48:29 +02:00
Andy Kittner
d3cf5c9311 Correctly handle first time passwords (#194)
- Save User object after setting the password

- Only generate first time password if none was explicitly specified
2012-05-19 10:33:59 +02:00
Emanuel Schuetze
3f4119f182 #199: Changed login error message. Updated translation. 2012-05-19 08:44:46 +02:00
Emanuel Schuetze
23fb97c7a2 #170: Use second submenu for agenda items. 2012-05-19 08:26:59 +02:00
Emanuel Schuetze
188fe4cce5 Fixed missing check for activeline in assignment overview. 2012-05-19 08:15:20 +02:00
Emanuel Schuetze
07c587a025 #186: Fixed published polls/ballot column on projector template. 2012-05-19 08:09:18 +02:00
Emanuel Schuetze
2dc156ef74 Automated merge with ssh://openslides.org/openslides 2012-05-18 23:25:51 +02:00
Emanuel Schuetze
f2a93c4505 #89: Delete custom slides. 2012-05-18 23:24:54 +02:00
Emanuel Schuetze
90787b2597 #89: Edit custom slides. 2012-05-18 23:07:09 +02:00
Andy Kittner
3f722d3b27 Add --insecure to runserver args in order to always server static files
See: https://docs.djangoproject.com/en/1.4/ref/contrib/staticfiles/
2012-05-18 22:34:59 +02:00
Emanuel Schuetze
ebe5381439 Automated merge with ssh://openslides.org/openslides 2012-05-18 19:38:26 +02:00
Emanuel Schuetze
b81469703b #198: Optimized submenu of application and assignment. 2012-05-18 19:38:21 +02:00
Emanuel Schuetze
c99deb8a2a Increase max_length of agenda title field. 2012-05-18 10:24:43 +02:00
Emanuel Schuetze
8ec3099620 #197: Rename the default User Group "Delegierte" to "Delegierter" 2012-05-17 22:03:48 +02:00
Emanuel Schuetze
4cef2762fe Fixed style in empty agenda overview table. 2012-05-17 21:38:37 +02:00
Emanuel Schuetze
0351627234 Fixed title in assignment projector template. 2012-05-17 21:36:18 +02:00
Emanuel Schuetze
ca2900e9d1 #195: Fixed unicode string in pdf header. 2012-05-17 21:34:19 +02:00
Emanuel Schuetze
92562aef28 #188: Fixed projector template style error. 2012-05-15 20:36:49 +02:00
Andy Kittner
298cefcb45 Fix error when creating new applications (introduced by translation fix) 2012-05-15 20:10:54 +02:00
Emanuel Schuetze
61fe84a780 Removed LANGUAGE_CODE and TIME_ZONE from default.settings.py. LANGUAGE_CODE no longer required after fix of rev615. 2012-05-15 19:51:40 +02:00
Andy Kittner
3815ef26af Fix wrong translations in forms/ models
Converted utils.translation_ex.ugettext to use ugettext_lazy and changed
forms modules to import ugettext from there (models where already importing
it from there)
2012-05-15 01:08:08 +02:00
Emanuel Schuetze
c19025ceb3 #190: Fixed typo in translation. 2012-05-14 23:10:17 +02:00
Emanuel Schuetze
3324ce6131 Removed help text of active form field by overriding. 2012-05-14 23:07:24 +02:00
Emanuel Schuetze
1d6a0bee4e #174: Change form field 'groups' to 'user groups'. 2012-05-14 23:04:00 +02:00
Emanuel Schuetze
31ae7c38c9 #192: i18n-de: Beamer -> Projektor 2012-05-14 22:16:13 +02:00
Emanuel Schuetze
304013649b Changed default event description. Updated tranlsations. 2012-05-14 22:08:40 +02:00
Emanuel Schuetze
bc9765230c #185: Wrong permission to print assignments. 2012-05-14 22:02:45 +02:00
Emanuel Schuetze
bb5fcf4d6d #183: Wrong permission to print application. 2012-05-14 22:00:22 +02:00
Emanuel Schuetze
114b719cad Added comment column in agenda overview. 2012-05-14 21:55:36 +02:00
Emanuel Schuetze
fbf2256493 #182: Wrong permission for edit button in view template. 2012-05-14 21:55:02 +02:00
Emanuel Schuetze
d8807ba979 #180: Ballot description. Fixed ballot number function. 2012-05-14 21:34:46 +02:00
Emanuel Schuetze
911b7ebac8 Changed po file header. 2012-05-11 07:38:56 +02:00
Emanuel Schuetze
b65e21e08f #100: Fixed wrong permissions. 2012-04-30 08:50:35 +02:00