OpenSlides

Author	SHA1	Message	Date
Emanuel Schuetze	cf773c34a8	Updated translations.	2013-06-26 21:36:06 +02:00
Oskar Hahn	bf8482fc03	Merge pull request #786 from emanuelschuetze/1.4-fixes Some template and doc fixes	2013-06-26 10:11:28 -07:00
Oskar Hahn	7d1eb5207a	Fixes #765 . Avoids the django AbstracUser username validator Also changed added a white-space in the default username again	2013-06-26 19:00:52 +02:00
Emanuel Schuetze	64e7cfd98e	Some template and doc fixes - Fixed #766 (agenda overview parent item look). - Fixed #767 (Documentation sphinx bootstrap theme: html header) - Fixed #785 (Enlarged doc screenshots by hover via CSS) - Updated sphinx-bootstrap-theme to 0.2.4 - Add btn class for agenda end time tooltip	2013-06-25 22:15:51 +02:00
Norman Jäckel	7dddd70493	Fix whitespaces in translated strings.	2013-06-25 17:44:31 +02:00
Emanuel Schuetze	4a0c40a333	Fixed white projector live view in IE 10 (missing transform-origin).	2013-06-25 14:03:36 +02:00
Norman Jäckel	c3d0c0f852	Update translation source files	2013-06-21 23:36:23 +02:00
Oskar Hahn	00d57e3011	Fixed #463 , typo in urls.py	2013-06-21 09:01:56 +02:00
Norman Jäckel	bad64144da	Fix translation of messages with additional content	2013-06-20 23:36:23 +02:00
Norman Jäckel	989f6b2d84	Space in Motion Log	2013-06-20 22:37:32 +02:00
Norman Jäckel	96c5b1d2dc	Fix numbering with category prefix in simple workflow, fix #769	2013-06-20 18:03:22 +02:00
Oskar Hahn	08a71c17a3	Fixed #770 . Ordering of Users in GroupForm regulated by the config var.	2013-06-20 08:33:55 +02:00
Norman Jäckel	c5beb07fbc	Update version to 1.4-dev (final)	2013-06-17 20:19:02 +02:00
Norman Jäckel	0039207899	Release 1.4c1	2013-06-17 20:17:32 +02:00
Oskar Hahn	32771d946e	Merge pull request #754 from emanuelschuetze/fixes-for-1.4c1 IE-Template fix and README/main.py updates.	2013-06-17 11:13:05 -07:00
Emanuel Schuetze	42809048f9	Updated and adjusted options help text in main.py and README.	2013-06-17 19:59:58 +02:00
Emanuel Schuetze	f191d3687b	Updated French translations (by Moira via transifex).	2013-06-17 17:54:05 +02:00
Emanuel Schuetze	7dc2b0d904	Fixed #753 (Wrong scaling of projector live view in Internet Explorer) Supports IE8+ only. Dropped IE7 support.	2013-06-17 17:30:46 +02:00
Emanuel Schuetze	c450dfb1d5	Fixed typo.	2013-06-17 10:44:55 +02:00
Oskar Hahn	c14302dd6f	small translation update	2013-06-16 18:44:14 +02:00
Oskar Hahn	64af0b162f	Create admin-user after syncdb	2013-06-16 17:07:55 +02:00
Emanuel Schuetze	5237e1d90d	Fixed #745 and #744 : Make widgets fixable and collapsable. Fixed widget header style issues.	2013-06-16 12:15:52 +02:00
Oskar Hahn	fd731d68fa	Merge pull request #733 from normanjaeckel/Fix_Syncdb Disable interactive mode of the syncdb command, fixed #696	2013-06-16 02:31:27 -07:00
Norman Jäckel	31547f8e1a	Save identifier in MotionSetStateView, fixed #739	2013-06-16 01:06:47 +02:00
Norman Jäckel	dfc160af5b	Disable interactive mode of the syncdb command, fixed #696	2013-06-16 01:05:22 +02:00
Oskar Hahn	575da78f3a	Editview for releated agenda items. Releated Agenda Items need there own edit view to edit some agenda specifc values. Also added a new filter 'trans' to translate variables. Fixes #710	2013-06-16 00:55:07 +02:00
Oskar Hahn	9853f2c433	Change the Workflow of a motion in CreateView. The Manager can choose the workflow in the createview. The default value is the workflow from the config. In the UpdateView the workflow in which the motion is, is choosen by default. The workflow will only be reset, if it is changed.	2013-06-16 00:53:49 +02:00
Emanuel Schuetze	a383a4305b	Fixed some (pdf) template issues and updated (DE) translation. - Fixed #737 (Motion edit link is missing for normal delegate users) - Fixed motion pdf filename errors (now use motion-<identifier>.pdf or if no identifier: motion-<title>.pdf with using djangos slugify for special chars in title) - Fixed motion pdf build error if there is an unauthorized version - Enlarge max_length of event name field to 50 chars. - Align participant import instruction with motion import page. - Added title field to particpants-demo_en.csv. - participant overview: Show comma after last_name only if first_name and last_name are given. - Changed all page titles to "<specific action page> - <event-name>" (moved event-name to the end of the string) - Updated EN tranlation string. - Updated DE translations.	2013-06-15 17:50:30 +02:00
Oskar Hahn	e630d600ed	Fixes #648 delete function for the motion versions	2013-06-15 09:18:21 +02:00
Norman Jäckel	3afc58be9e	Add request to all widgets, fixed #653	2013-06-13 23:45:30 +02:00
Norman Jäckel	48f237a92f	Print listening info to command line	2013-06-13 16:58:34 +02:00
Oskar Hahn	6dad2e5161	Listen per default to the public	2013-06-13 16:58:34 +02:00
Oskar Hahn	efd10eaecc	Fixed #718 An string argument was not used in the assignment app	2013-06-13 16:47:35 +02:00
Norman Jäckel	a0c023cf45	Use ordinal numbers in assignment and motion polls, fixes #456 . Include humanize app to portable	2013-06-13 15:48:55 +02:00
Oskar Hahn	42ad1113fa	Fixed #724 The motion updated view now uses the last_versio instead of the active_Version	2013-06-11 11:42:20 +02:00
Norman Jäckel	aa0728ff60	User lockout protection, fixed #666 Protection of updating and deleting users and groups if this caused a lockout of the requesting user.	2013-06-11 11:02:40 +02:00
Oskar Hahn	4b0c62d29a	Fixes #721 Saving the anonymous user into a list of speakers. Also raises an AttributeError if someone tries to save the anonymous user into any person field.	2013-06-09 18:57:42 +02:00
Norman Jäckel	0d1db941b8	Insert LocalizedModelChoiceField for use in MotionSetWorkflowMixin. Fixed #713 .	2013-06-09 16:41:58 +02:00
Emanuel Schuetze	a3038f3eb2	Set version to 1.4rc1-dev.	2013-06-04 01:05:15 +02:00
Emanuel Schuetze	27ed6a7c1d	1.4b2 release.	2013-06-04 01:02:25 +02:00
Emanuel Schütze	37da0cc7bb	Merge pull request #709 from emanuelschuetze/fixes-for-1.4b2 Fixes and improvements for 1.4b2	2013-06-03 15:58:13 -07:00
Emanuel Schuetze	a96b8a7833	Updated FR translations (Thanks to Moira).	2013-06-04 00:47:29 +02:00
Emanuel Schuetze	880b3cd19b	Updated DE translations.	2013-06-04 00:47:29 +02:00
Andy Kittner	9826e3ec06	Add a simple wxPython based gui frontend for openslides	2013-06-04 00:07:22 +02:00
Andy Kittner	fb91317ce1	Add command to backup the database	2013-06-04 00:07:22 +02:00
Andy Kittner	21c739a94f	Add --no-run parameter This parameter allows e.g. to synchronize the database without starting the webserver.	2013-06-04 00:07:22 +02:00
Emanuel Schuetze	cf791e599a	Updated EN translation strings and updated EN po files. Template fixes and improvements.	2013-06-03 23:33:01 +02:00
Emanuel Schuetze	bdfdb4c064	Fixed #652 : Button for ageda item with related sid.	2013-06-03 22:42:16 +02:00
Emanuel Schuetze	4126c180c8	Fixed #701 : Check bootstrap tooltips on all buttons.	2013-06-03 22:42:16 +02:00
Emanuel Schuetze	cd84d64071	Fixed #702 : list of speakers projetor/overlay style.	2013-06-03 22:42:15 +02:00
Emanuel Schuetze	ef6eaf8fa4	Fixed #703 : Mcrophon icons for list of speakers	2013-06-03 22:42:14 +02:00
Emanuel Schuetze	e5e7e1bcce	Template improvements. Improved agenda and participants overview.	2013-06-03 22:38:45 +02:00
Emanuel Schütze	d615c63eb1	Merge pull request #705 from normanjaeckel/ChangeMotionDefaultNumbering Motion: Change default numbering method	2013-06-03 13:35:34 -07:00
Norman Jäckel	dc5b1e0893	Motion: Change default numbering method	2013-06-03 19:18:59 +02:00
Norman Jäckel	5c18635418	Change order of agenda fields	2013-06-03 19:16:42 +02:00
Norman Jäckel	a575a7a8c6	Fix #696	2013-06-03 00:23:47 +02:00
Norman Jäckel	93b02fa62b	Update docstrings, small enhancements to Oskar's motion rework.	2013-06-02 23:28:17 +02:00
Oskar Hahn	cd19920223	Rework of the motion model, to make it more explcit.	2013-06-02 23:28:17 +02:00
Norman Jäckel	d4739f5dd7	Fixed #130 : New config var for removal of supports when a motion is edited by the submitter in early state.	2013-06-02 15:48:21 +02:00
Emanuel Schuetze	5643065b84	Added en po files and updated en and fr po files (makemessages only) for transifex.	2013-06-01 21:58:25 +02:00
Oskar Hahn	4faf91424b	Fixed #682 Error if a group was added to a list of speakers	2013-06-01 09:10:15 +02:00
Norman Jäckel	e5db00b637	Add tests for the list of speakers global links. Add end_speach link on the list of speakers widget.	2013-05-31 17:25:48 +02:00
Oskar Hahn	4aeb329d7c	Merge pull request #690 from normanjaeckel/DeleteFeatureRejectVersion Fix #679	2013-05-31 06:44:59 -07:00
Norman Jäckel	31c04c280a	Fix #679	2013-05-31 14:54:53 +02:00
Norman Jäckel	7624dc67af	Fixed #687	2013-05-31 14:34:49 +02:00
Stefan Frauenknecht	1e188761d4	Validator for agenda_start_time aded. PEP8 issue 'missing whitespace after ','' resolved	2013-05-31 14:01:30 +02:00
Norman Jäckel	9e5088d49e	Fixed #683	2013-05-31 13:15:55 +02:00
Emanuel Schuetze	d5becd5c18	Fixed #431 : Template improvements (removed unused loaded tags and check of all html template files)	2013-05-30 23:25:49 +02:00
Emanuel Schuetze	17778ac80f	Fixed #574 : Changed DOCTYPE to HTML5 (for base.html and base-projector.html).	2013-05-30 22:23:48 +02:00
Emanuel Schuetze	a97cf4a680	Motion import improved: - add semicolon support (use utils/csv_ext.py as participant import) - show all warnings of each line in one warning message - show success message with total counter (x of n motions imported). - improved warning and error strings	2013-05-30 22:23:38 +02:00
Emanuel Schuetze	4ec33106ed	Fixed #680 (Open all PDFs in new tab).	2013-05-29 22:59:33 +02:00
Emanuel Schuetze	9fb2052b3d	Bugfixing, template improvements, translation updates. - Fixed #649: Clean old motion fragments in template and pdf (about motion notes). - Fixed motion pdf issues: missing submitters, voting result and make motion state translateable- Added post_save function also for UserUpdateView.	2013-05-29 22:59:24 +02:00
Norman Jäckel	9d698854a9	Insert Next Speaker Button in speaker widget	2013-05-24 01:44:58 +02:00
Norman Jäckel	6566a2897c	Fixed #675 : CSS for list of speakers slide and overlay	2013-05-24 00:52:09 +02:00
Norman Jäckel	00910b218e	Fix appearance of agenda items with related sid, also some other small fixes and template fixes	2013-05-24 00:31:52 +02:00
Norman Jäckel	099ed76d0e	Insert info to list of speakers overlay widget checkbox	2013-05-23 23:31:57 +02:00
Norman Jäckel	c94f78c430	Fix message_list loop with a map	2013-05-23 23:19:53 +02:00
Norman Jäckel	894f16ec53	Several template and bug fixes, some minor view behavior changes	2013-05-23 00:32:32 +02:00
Emanuel Schuetze	c59f729a80	Set version to 1.4b2	2013-05-17 01:33:04 +02:00
Emanuel Schuetze	d5221d2ab5	Release 1.4b1.	2013-05-17 01:31:45 +02:00
Emanuel Schuetze	eedc79ca8f	Added non_field.errors in form.html.	2013-05-16 23:59:22 +02:00
Norman Jäckel	bf58f2a6cc	Ensure that the user has either a first name or a last name	2013-05-16 23:59:22 +02:00
Norman Jäckel	a65a4662ae	Fixed Pep 8 Error	2013-05-16 23:44:07 +02:00
Emanuel Schuetze	fa8b9d3888	Fixed translation issue for motion state.	2013-05-16 22:53:38 +02:00
Emanuel Schütze	6dbd606232	Merge pull request #660 from normanjaeckel/TranslatedStateChanged Translate changed state in motion log (Fixed #656)	2013-05-16 13:37:09 -07:00
Norman Jäckel	148ac53d11	Translate changed state in motion log (Fixed #656 ) The database has to be reset.	2013-05-16 21:51:11 +02:00
Emanuel Schuetze	b5a5acbf2c	Some last (template) improvements for next release - Added dataTable function for group overview table. - Added default form help text for groups and an explanation for group overview table. - Updated translation. - Translate group name in form. - Username: FirstName instead of First_Name - Hide group 'registered' from UserForm - Linked persons/candidates/submitter etc. to UserView - Fixed permissions in template Translation	2013-05-16 21:03:42 +02:00
Oskar Hahn	e76aa499f3	Merge pull request #659 from normanjaeckel/LogMotionImport Log Entry for imported motions Fixed #655	2013-05-16 04:36:39 -07:00
Oskar Hahn	9a881eceeb	Merge pull request #651 from normanjaeckel/Workflow_Adjustablility_2 Workflow adjustablility (new feature)	2013-05-16 04:35:58 -07:00
Oskar Hahn	1dab39012c	Merge pull request #661 from normanjaeckel/PermitRejectVersionLog Log permitting and rejecting motion versions (Fixed #657)	2013-05-16 04:31:41 -07:00
Norman Jäckel	c163d6984d	Insert motion preamble in text field of the form of new motions (Fixed #643 )	2013-05-16 01:38:51 +02:00
Norman Jäckel	5adf55bc8c	Log permitting and rejecting motion versions (Fixed #657 )	2013-05-16 01:28:39 +02:00
Norman Jäckel	27da18f489	Fixed #655 Log Entry for imported motions	2013-05-16 00:58:37 +02:00
Norman Jäckel	bca8d3af15	Update view contains possibility for managers to change the workflow. Also other small fixes.	2013-05-16 00:25:44 +02:00
Emanuel Schuetze	c1996b81fc	Updated translation.	2013-05-15 09:43:59 +02:00
Emanuel Schuetze	4849955a16	Some more template improvements - Better config icon. - Renamed media to files (only for GUI). - Add datatable function for motion and asssignemnt overview table. Removed old filter/sorting code. - Some more template styling work.	2013-05-15 09:43:11 +02:00
Oskar Hahn	cefd509ae4	Merge pull request #650 from emanuelschuetze/template-improvements Template improvements	2013-05-14 14:31:53 -07:00
Emanuel Schuetze	d1b6c38880	Fixed #627 (Open Link in new Tab) by setting back bootstrap.min.js to 2.3.0 release. (bootstrap*.css are still from 2.3.1)	2013-05-14 23:21:46 +02:00
Emanuel Schuetze	b082f8a8fc	A lot of template improvements - Translate group name in participant overview table. - Move 'status_link' function from participants.js to utils.js for using in VoteCollector plugin. - Added hook 'post_js' for VoteCollector plugin. - Fixed poll id in poll_form. - Improved 'show log' button - Used welcome_title for default custom slide - Used bootstraps' fluid grid nesting for responsive layout of widgets. - Added microphone icon for 'add-me-to-list-of-speakers' button. - Format motion identifier and title in (motion and account) widgets. - Format list of speakers (slide, overlay, view, overview) - Format list of speakers widget and view. Added view to link to current list of speakers (without add to list). - Fixed motion slide. Made up/down animation faster and the scroll way shorter. - Fixed icon name. - Set default context of 'extra_javascript' to use kwargs['context']['extra_javascript'].append('...') without error. - Fixed translation of motion state. Moved css code.	2013-05-14 23:20:54 +02:00
Norman Jäckel	f07485627f	Motion identifier setting and versioning. Now the view decides, whether to setup a new version or not. Automatic identifier setting is the default. Also some fixes of the motion save method.	2013-05-13 23:13:14 +02:00
Oskar Hahn	b8b5acd5f2	Merge pull request #639 from normanjaeckel/Url_name_args Fixed 'Can't create agenda item of a motion'	2013-05-13 11:51:15 -07:00
Norman Jäckel	0f17f74fee	Fix and update motion csv import.	2013-05-13 18:30:20 +02:00
Oskar Hahn	485518975a	motion csv import	2013-05-13 18:25:59 +02:00
Norman Jäckel	864d20274e	Fixed #636 . Insert general url_name_args attribute to some generic views in utils.views.	2013-05-13 18:15:53 +02:00
Oskar Hahn	865860a96f	Merge pull request #640 from normanjaeckel/Fixes Some Fixes	2013-05-13 05:06:29 -07:00
Oskar Hahn	e9a361cfea	Merge pull request #637 from normanjaeckel/ShowCategory Show category in motion table. Fix template when a motion has no category.	2013-05-12 13:58:47 -07:00
Norman Jäckel	a469831f1f	Fixed link 'Put me on the list of speakers' when the list is already closed.	2013-05-12 02:06:55 +02:00
Norman Jäckel	af493d28e8	Items now appear also in the personal info widget (where someone is on the list of speakers).	2013-05-12 01:46:40 +02:00
Norman Jäckel	af6659a67e	Hide list of speakers overlay on list of speakers slide	2013-05-12 01:16:41 +02:00
Norman Jäckel	3ba5fd2dc6	Fixed bad typo in import users function	2013-05-12 00:56:40 +02:00
Norman Jäckel	411f8d0892	Fixed hiding of orga items on summary slides	2013-05-11 16:26:43 +02:00
Norman Jäckel	76d7409830	Change version view. New way to get name and version from plugins.	2013-05-11 14:27:46 +02:00
Norman Jäckel	98c7611622	Fixed wrong permission on agenda detail view	2013-05-11 13:53:43 +02:00
Norman Jäckel	96f5122c00	Show category in motion table. Fix template when a motion has no category.	2013-05-11 00:20:42 +02:00
Norman Jäckel	719b6ff790	Rework on list of speakers. Insert a method to get a formated list for various use in the templates.	2013-04-29 20:17:50 +02:00
Oskar Hahn	52e16d2e34	Show a defined value of last speakers Some work on the design of the speaker-list on the projector	2013-04-29 20:05:42 +02:00
Norman Jäckel	0b85164b84	Add second time field for list of speakers. Now you can click begin and end speach.	2013-04-29 20:05:42 +02:00
Oskar Hahn	b0e5854833	Fixed #629	2013-04-28 10:21:31 +02:00
Oskar Hahn	04edef9d8a	Fixed #604	2013-04-28 10:02:19 +02:00
Oskar Hahn	100238bc66	Fixed #580	2013-04-28 09:37:15 +02:00
Oskar Hahn	04b3a196ad	Merge pull request #620 from CatoTH/ckeditor-4.1.1 Upgrade CKEditor from 4.1rc to 4.1.1	2013-04-25 06:17:07 -07:00
Oskar Hahn	017561572d	Merge pull request #621 from CatoTH/Issue615 sortable and disableSelection are not always defined; lead to issue #615	2013-04-25 06:16:32 -07:00
Norman Jäckel	b6f2176cc8	Move Version page out of config menu. Insert Link into the footer.	2013-04-25 12:37:44 +02:00
Tobias Hößl	5865a73a3e	sortable and disableSelection are not always defined; lead to issue #615	2013-04-24 19:51:33 +02:00
Tobias Hößl	4aa033989a	Upgrade CKEditor from 4.1rc to 4.1.1	2013-04-24 19:04:02 +02:00
Emanuel Schuetze	8ca8b6911d	Set version to 1.4b1-dev	2013-04-24 15:50:49 +02:00
Emanuel Schuetze	b43a6ae1f6	Release 1.4-alpha1	2013-04-24 15:31:55 +02:00
Emanuel Schuetze	e268d43580	Fixed motion poll pdf (use correct delegates group, use template without header/footer)	2013-04-24 15:14:29 +02:00
Emanuel Schuetze	5071daa148	Updated translations.	2013-04-24 14:36:04 +02:00
Emanuel Schuetze	210df06c76	Minor template fixes.	2013-04-24 11:58:09 +02:00
Emanuel Schuetze	81b82c559d	Updated jQuery UI to v1.10.2. Changed link in agenda view to static file.	2013-04-24 11:34:24 +02:00
Emanuel Schuetze	abad75c129	A lot of template improvements and translation fixes - Fixed agenda widget for special slide views (e.g. list of speakers, summary). - Fixed back to motion(s) link - Set icon for list of speakers widget. - Fixed overlay widget layout of form elements. - Added submenu with other config_pages to version.html. - Updated completly DE translations, fixed EN strings. - Coding style: Use correct ugettext and ugettext_lazy strings. Use "as _" for ugettext only. Updated translation. - Improved projector template (clock image, fixed facicon, added subtitle for list of speakers) - Changed permission strings ('oneself'). Added check if group(pk=3) exists. - Added event name and description to base template. Some minor template layout fixes. - Use static subtile (no context var). Show last 2 old_speakers for projector. - Cut old_speakers. - Projektor template style changes (e.g. overlay list of speakers).	2013-04-24 10:38:03 +02:00
Oskar Hahn	f581169e1e	Fixed saving anonymous user in a PersonField	2013-04-24 09:28:58 +02:00
Tobias Hößl	acba281581	Sorting agenda items with nestedSortable.	2013-04-23 17:24:27 +02:00
Norman Jäckel	7fbe609d04	Rename the state flag dont_set_new_version_active to leave_old_version_active.	2013-04-22 22:31:58 +02:00
Oskar Hahn	ba75a34017	Fixed list of speakers overlay cache problem	2013-04-22 22:09:09 +02:00
Oskar Hahn	02d1025346	Motion poll PDF	2013-04-22 21:47:40 +02:00
Oskar Hahn	4f9041df65	Merge pull request #603 from ostcar/participant_name Fixed username	2013-04-22 12:38:09 -07:00
Oskar Hahn	6b558907c0	Fixed username	2013-04-22 13:49:13 +02:00
Oskar Hahn	0549d22ec8	Fixed manage.py runserver. The reload function did not work	2013-04-21 18:42:58 +02:00
Oskar Hahn	2d7bf8ca9a	fixed #558	2013-04-19 19:56:59 +02:00
Oskar Hahn	10b51f6897	Fixed #595	2013-04-19 19:39:33 +02:00
Oskar Hahn	db1503ad7b	Format fix	2013-04-19 19:15:57 +02:00
Roland Geider	56844d93f2	Move CKeditor configuration to a separate JS file Remove unneeded try-except block	2013-04-18 13:26:01 +02:00
Emanuel Schuetze	1d1f5fa218	Added html support for motion text. Use html parser 'beautifulsoup' to replace html tags which not supported by reportlab pdf. 'pip install bs4' required. Fixed nested ol lists and unicode warning. New requirement: beautifulsoup4 HTML support for reportlab. Move parse html code into new function. Added missing html support in pdf for motion reason. Added version number for bleach and beautifulsoup4. Moved to core requirements block. Added bs4, bleach and html5lib requirements to portable build script. Updated portable readme for 1.4.	2013-04-18 13:23:40 +02:00
Roland Geider	01885c9304	Add first version of server-side filtering of HTML with bleach Fix formatting (pep8 and otherwise) Make the CleanHtml a mixin so it can be used easier, add a test case Mark HTML fields as 'safe' in the template Update list of allowed HTML tags, take special care for reportlab Add heading tags to white list Rename get_clean_html to get_clean_html_fields	2013-04-18 13:20:27 +02:00
Tobias Hößl	ce333d4c40	Initial attempt to integrate CKEditor into OpenSlides	2013-04-18 13:20:27 +02:00
Emanuel Schuetze	e81ed882ca	Fixed #553 : Switch projector control scroll arrows	2013-04-15 22:04:59 +02:00
Oskar Hahn	33f74c3025	List of speakers. Part 2	2013-04-15 19:28:44 +02:00
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
René Köcher	ed33b47666	Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides Conflicts: openslides/locale/de/LC_MESSAGES/django.po Signed-off-by: René Köcher <shirk@bitspin.org>	2012-11-22 12:52:11 +01:00
René Köcher	9f51a24311	#419 - aftermath - remove accidental print statements left over from debugging - create missing groups on import Signed-off-by: René Köcher <shirk@bitspin.org>	2012-11-22 10:26:44 +01:00
René Kö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: René Kö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

... 11 12 13 14 15 ...

2053 Commits