0549d22ec8
Fixed manage.py runserver.
...
The reload function did not work
2013-04-21 18:42:58 +02:00
2d7bf8ca9a
fixed #558
2013-04-19 19:56:59 +02:00
10b51f6897
Fixed #595
2013-04-19 19:39:33 +02:00
db1503ad7b
Format fix
2013-04-19 19:15:57 +02:00
56844d93f2
Move CKeditor configuration to a separate JS file
...
Remove unneeded try-except block
2013-04-18 13:26:01 +02:00
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
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
ce333d4c40
Initial attempt to integrate CKEditor into OpenSlides
2013-04-18 13:20:27 +02:00
e81ed882ca
Fixed #553 : Switch projector control scroll arrows
2013-04-15 22:04:59 +02:00
33f74c3025
List of speakers. Part 2
2013-04-15 19:28:44 +02:00
1a416e5726
Updated template and some minor fixed for list of speakers. Updated projector slide.
2013-04-15 19:23:37 +02:00
fa95119936
New Feature: List of speakers.
2013-04-15 19:23:37 +02:00
f52df88cd6
fixed error on new overlay api
2013-04-15 15:47:18 +02:00
bbf4b33086
New Overlay API
2013-04-15 13:24:08 +02:00
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
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
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
2c5bae7b01
#560 fixed: FormField to choose permissions is too small
2013-04-09 20:12:57 +02:00
9f6da9f33b
Reorder GroupDetailView code in view.py.
2013-04-09 19:53:18 +02:00
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
051f9af1f7
#436 : New participant field 'title'
2013-04-09 08:51:31 +02:00
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
e40a2e9332
Restart tornado on file changes, respect port and adress flags
2013-04-03 23:20:56 +02:00
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
5d472b274a
Update tests to extend test cover by coverage
2013-04-03 17:55:30 +02:00
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
b310d6077e
Move personal info widget to a new app: account.
2013-04-03 00:17:23 +02:00
e3eabada8b
Update default groups and permissions.
2013-04-02 15:50:40 +02:00
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
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
f5e6f736dc
Merge pull request #572 from normanjaeckel/Fileupload_3
...
Mediafile (new)
2013-03-20 03:23:50 -07:00
156acc451f
Insert whitespace. Fix docstrings.
2013-03-20 11:17:24 +01:00
d81c3bb1f8
Change order of classes for User and Group
2013-03-18 22:43:46 +01:00
d82bb6ee33
Small modifications. Enhencement of tests.
2013-03-18 22:41:42 +01:00
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
571649d5a6
Fix typo in assignment.
2013-03-18 21:31:24 +01:00
4e6818fb1a
Compressed jquery-ui files (for agenda config).
2013-03-18 20:22:54 +01:00
b3fca8f6f2
Updated bootstrap from 2.2.2 to 2.3.1
2013-03-18 20:19:17 +01:00
3832aa4178
Tests for the motion views
2013-03-15 12:18:27 +01:00
c46ec570bf
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-15 02:16:26 +01:00
81eb92a761
fixed pep8
2013-03-15 02:14:15 +01:00
1a2ebf7b3b
removed some unused functions
2013-03-15 01:34:17 +01:00
d180b4f331
Reverted support/unsupport changes (question)
2013-03-14 23:45:17 +01:00
20118ae833
Improved version.get command
2013-03-14 23:35:57 +01:00
2a2c704bf2
GetVersionMixin not required. Fixed htmldiff function.
2013-03-14 23:26:41 +01:00
3f4df58807
Moved htmldiff function to utils.py. Fixed travis build error (pep8).
2013-03-14 23:22:11 +01:00
49765bbe6e
Merge remote branch 'upstream/master' into motiontemplate
2013-03-14 23:05:38 +01:00
b2dc3820bd
Changed motion.number to motion.identifier.
2013-03-14 23:04:32 +01:00
88a32dc546
Updated motion version warnings (not latest/authorized version)
2013-03-14 22:56:25 +01:00
73430e45d8
Changed style for empty category table.
2013-03-14 22:54:33 +01:00
fa098f6bd3
Typo.
2013-03-14 22:54:00 +01:00
43cd5aba00
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-14 22:44:11 +01:00
63932a348e
Merge pull request #561 from emanuelschuetze/datatables-participants
...
Datatables for participants table (reworked)
2013-03-14 14:40:01 -07:00
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
545d4be04f
fixed update of person_api
2013-03-14 22:32:00 +01:00
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
a1a11ff53c
New motion version diff view. Improved version history table in motion detail template.
2013-03-14 21:28:03 +01:00
2944b6ded3
fixed travis
2013-03-13 00:29:53 +01:00
71b9bd0a08
dont set identifier prefix, if it is empty
2013-03-12 23:54:37 +01:00
b2c888b151
set identifier
2013-03-12 23:35:08 +01:00
304887e8f3
Changed comlex workflow automaticly set the identifier
2013-03-12 22:13:17 +01:00
d21185a449
Merge branch 'master' of github.com:OpenSlides/OpenSlides into category
2013-03-12 22:05:20 +01:00
9cd69f59e0
Motion Identifier
2013-03-12 22:03:56 +01:00
03fff46517
Add new TestCase class in utils to call the signal on running every test.
2013-03-12 21:38:22 +01:00
9679be1867
Move builtin groups to a signal.
2013-03-12 20:58:22 +01:00
196ad217b0
Fixed version history.
2013-03-11 23:58:45 +01:00
d41ce146e2
Added category_delete function to template.
2013-03-11 21:50:16 +01:00
db97d3c312
Merge pull request #2 from ostcar/category
...
Category Delete View
2013-03-11 13:45:54 -07:00
31ba70efd1
Category Delete View
2013-03-11 21:38:07 +01:00
514577f7c6
Built-in Workflows are created by listening to a signal which is sent after syncdb.
2013-03-11 21:32:09 +01:00
d9fbaf9aa7
Updated motion category template.
2013-03-11 21:29:56 +01:00
ff848a865a
Merge pull request #1 from ostcar/category
...
Category
2013-03-11 12:46:42 -07:00
f411040c3a
Append missing files
2013-03-11 20:43:23 +01:00
bc7be27131
Add CategoryFormField to the MotionForm
2013-03-11 20:41:02 +01:00
2614a1cb2f
Categories for Motions
2013-03-11 20:17:19 +01:00
1b93cec209
Merge remote branch 'upstream/master'
...
Conflicts:
openslides/motion/models.py
2013-03-11 19:16:16 +01:00
42c847dfba
Update motion templates to new template design. Added some missing model and view functions.
2013-03-11 18:26:22 +01:00
5c70b4a044
Update after comments: Removed user context var. Removed condition in unupport state check.
2013-03-11 16:56:56 +01:00
ee0e599a6c
Update motion templates to new template design. Added some missing model and view functions.
2013-03-09 14:29:40 +01:00
71b1bede6f
Set new button als primary/blue button.
2013-03-09 14:17:30 +01:00
c3c200b423
Changed link to new csv import wiki page on github.
2013-03-09 14:16:28 +01:00
48e1282cb9
Show duration clock only if start/end time is set.
2013-03-09 14:15:03 +01:00
56a510e89c
Removed link to professional support in base template (footer).
2013-03-08 08:31:52 +01:00
51a9e41015
Set new django setting. Put tornado code in a seperate file.
2013-02-27 18:54:06 +01:00
757b97e4cb
Merge pull request #542 from frauenknecht/master
...
Issue #539 Default config value in agenda app
2013-02-22 03:54:30 -08:00
45856fc9b0
add signal callback to provide defaults
2013-02-20 23:50:34 +01:00
f81abe215f
Revert last changes
2013-02-20 23:48:04 +01:00
343aa018e4
Fixed Issue #539 - Default config value in agenda app
2013-02-20 22:09:40 +01:00
03d57d17b0
Fix state attributes in motion pdf.
2013-02-19 23:43:20 +01:00
6b71142747
Recover commit 6a639fe498
2013-02-18 22:08:21 +01:00
853dcf8334
fixed pep8
2013-02-18 20:06:46 +01:00
f388f3d41a
handle static files with tornado
2013-02-18 19:58:18 +01:00
2822c39f8a
Merge branch 'master' into tornado
2013-02-18 19:08:58 +01:00
ce1e1c112f
fixed pep8
2013-02-18 18:59:24 +01:00
4f3f917812
some small code design changes
2013-02-18 18:56:37 +01:00
cb5b735565
Merge branch 'master' into HEAD
2013-02-18 18:34:52 +01:00
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
2603d93d69
Fix PEP8 and tests.
2013-02-17 17:07:44 +01:00
1d1d72d45a
Fixed if condition with duration property which can be None
2013-02-16 11:55:40 +01:00
8103c09b81
PEP8 errors resolved
2013-02-16 10:41:22 +01:00
0b3b91b8d5
Show item-tooltip in bootstrap tooltip style.
2013-02-15 08:51:08 +01:00
4f60160667
Added missing success_url_name.
2013-02-15 08:50:42 +01:00
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
8363b06fc1
Move motion exceptions to its own file in the motion app.
2013-02-14 19:27:36 +01:00
2e37e4c18b
Comment the dev-file workflow.py
2013-02-14 11:16:46 +01:00
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
e3428d3e83
Some style work.
2013-02-11 23:01:48 +01:00
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
a51a296434
Changed agenda start/end time to djangos DATETIME_FORMAT.
2013-02-09 22:59:15 +01:00
6a639fe498
Add todos
2013-02-06 11:11:49 +01:00
5573077b88
fixed pep8
2013-02-06 09:34:44 +01:00
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
ce51f0ef7e
template: minor style changes
2013-02-05 23:42:30 +01:00
6b4ee0e4f6
Updated translation.
2013-02-05 23:09:23 +01:00
c8ddb21760
Fixed wrong hiding of open agenda child items if parent item is closed
2013-02-05 22:36:05 +01:00
e49efb40d8
template: Added new css class for minimum column width.
2013-02-05 22:03:43 +01:00
bfd01e67b6
template: Removed unused 'cycle' template tag.
2013-02-05 21:55:41 +01:00
d809ff95bb
template: Removed unused participant.css
2013-02-05 21:51:09 +01:00
64e3c1f3cb
template: Removed unused 'load staticfiles'.
2013-02-05 21:41:26 +01:00
8388774f12
template: Minor style changes.
2013-02-05 21:33:07 +01:00
82e35bebff
Fixed wrong deletion if user clicks "no" in confirm form.
2013-02-05 21:31:45 +01:00
0c5459f96e
template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
2013-02-05 20:40:55 +01:00
042f1a8571
Fixed typo
2013-02-05 18:49:32 +01:00
a08cf84ab8
Wrote docstrings to the motion app
2013-02-05 18:46:46 +01:00
8f05ada6a1
template style and new icons
2013-02-05 17:05:40 +01:00
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
80b0ab5252
template: Updated dashboard. Fixed ajax functionality. Adapted style.
2013-02-05 11:24:41 +01:00
6db0210ef3
Updated jquery form plugin to v3.26.0-2013.01.28
2013-02-05 11:22:01 +01:00
5e44bba941
Updated jquery from 1.9.0 to 1.9.1.
2013-02-05 11:15:23 +01:00
404bf7f0b5
template: Added missing back link.
2013-02-04 13:38:29 +01:00
36f5c97dbe
Added assignment context menu (more actions). Fixed 'back to election' link.
2013-02-04 13:18:10 +01:00
e822efdc81
Some template style work.
2013-02-04 13:06:36 +01:00
a34731c00e
fixed pep8 in motion.pdf
2013-02-03 20:12:44 +01:00
90614cc637
Updated some views for the new utils.views style
2013-02-03 19:43:36 +01:00
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
b8a353fa7c
Added PDF view for the motions
2013-02-03 18:18:29 +01:00
42082ae3c2
fixed pep8
2013-02-03 14:14:07 +01:00
cbd4acbd4b
fixed motion tests
2013-02-03 13:55:42 +01:00
ef7f6cf476
Permission system for MotionVersions
2013-02-03 13:24:29 +01:00
e7c65b3db1
Moved some methodes from utils.views.DeleteView to QuestionMixin
2013-02-03 13:23:55 +01:00
f4ea611fb8
Wrote log messages for motion changes
2013-02-03 10:02:06 +01:00
65a18953bd
Added translatable log to the new motion system
2013-02-02 21:40:23 +01:00
15b13c2bcd
Handel null=True in PersonField
2013-02-02 21:19:37 +01:00
2e430b4406
check permission in motion view
2013-02-02 10:59:07 +01:00
3ffb16d4d8
Fixed pep8 errors
2013-02-02 10:52:13 +01:00
4cc6539f0c
Added get_allowed_actions to new motion app
2013-02-02 10:24:28 +01:00
a27bd7eade
Add motion to agenda
2013-02-02 00:51:08 +01:00
910e0f17e7
Add slide Date to the motion
2013-02-02 00:37:43 +01:00
1518543a9a
Added motion widget and deletion of motions
2013-02-02 00:27:16 +01:00
0f7d0e349c
Fixed URLs in projector views
2013-02-02 00:26:08 +01:00
bd317aed31
Wrote tests for openslides.motion.models.Motion
2013-02-01 19:19:18 +01:00
6c3eb0f765
fixed urls in views from the participant app
2013-02-01 17:35:27 +01:00
1a2f0a1b5a
Added links to set and reset the state of a motion
2013-02-01 17:20:11 +01:00
ac41a02ac5
Block supporting, unsupporting and creation of poll in some states
2013-02-01 16:44:06 +01:00
fb82a1787b
Add workflows for motions
2013-02-01 16:33:45 +01:00
7f03e02e9a
Item type changed from CharField to IntegerField. Constant type names added.
2013-02-01 15:13:40 +01:00
9f3dae8059
ConfigForm: Base classes reordered
2013-02-01 14:47:51 +01:00
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
3f02a28002
Added a poll delete view to the new motion app
2013-02-01 13:24:44 +01:00
b6256b73e0
Changed utils.views.DeleteView
2013-02-01 13:24:30 +01:00
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
da7a7a9d68
Add Poll-system to the new motion app
2013-02-01 12:51:54 +01:00
adeaf248ef
Changed utils.- and poll.views
2013-02-01 12:51:01 +01:00
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
9746b3818f
Rework code to ommit unnecessary filter call.
2013-01-31 20:32:29 +01:00
3dfd16558a
Blanks removed
2013-01-31 18:35:52 +01:00
033ecd9497
Added new glyphicons icons.
2013-01-31 10:20:53 +01:00
82ad5e2de0
Major changes for new twitter bootstrap template (e.g. replaced icons)
2013-01-31 10:19:56 +01:00
65ebcbc991
#41 Time for each agenda item finished
2013-01-30 17:39:53 +01:00
bc9dcffff4
#41 Time for each agenda item
2013-01-29 14:28:42 +01:00
d911e311d6
Let the user support and unsupport the motion
2013-01-26 18:18:02 +01:00
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
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
0702d49e2e
Save the supporter
2013-01-26 16:42:23 +01:00
d3b340769b
Added motion config tab
2013-01-26 16:33:55 +01:00
ecb6419f8c
fixed apply and success url in utils.views
2013-01-26 16:19:53 +01:00
567e6c975a
Show initial submitters in the update-form
2013-01-26 16:05:30 +01:00
8708ba5da6
Only save new version, when version-data has changed
2013-01-26 15:39:35 +01:00
1f87749742
Save the submitters to the motion
2013-01-26 15:25:54 +01:00
1ae140c11e
Add docstrings to the motion class
2013-01-26 12:28:51 +01:00
bebaadf850
Actually do the right check for further args
2013-01-23 21:24:02 +01:00
3bfead298d
Add custom management command to start the application with tornado
2013-01-23 21:12:36 +01:00
a14f9b30ad
Fix help text
2013-01-23 19:37:12 +01:00
22e8457894
Add an option to suppress starting of web browser ( closes #436 )
2013-01-22 21:04:07 +01:00
70407feab8
Use the tornado server to serve the application
2013-01-19 10:51:42 +01:00
b8532fabe4
Removed files from images to img dir.
2013-01-18 22:23:31 +01:00
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
a4592ec849
Reworked projector activate buttons in agenda widget.
2013-01-18 21:44:47 +01:00
586425354d
Reworked new template, especially agenda and dashboard.
2013-01-08 23:05:35 +01:00
0231fe37f5
Start to rewrite the motion app
2013-01-08 20:22:03 +01:00
aee24425bc
Ticket 433 - Organisational items
2013-01-05 23:52:29 +01:00
deb0d5b2e5
Some fixes. Update requirements.txt and setup.py.
2013-01-05 23:20:38 +01:00
369f418b0e
Fixed missing endif
2013-01-05 15:43:52 +01:00
13cd52bd96
Merged (conflicts).
2013-01-05 15:29:57 +01:00
6417f5f107
fixed pep8 error
2013-01-05 14:56:22 +01:00
2fcf0b3a07
fixed typo in utils/views.py
2013-01-05 14:46:05 +01:00
56510f94a8
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-01-05 13:44:35 +01:00
bb74674c41
Deprecated import django.conf.urls.defaults adjusted.
2013-01-05 12:39:20 +01:00
ae8641bcad
Raise an error if an CreateView does not define a apply_url
2013-01-05 01:48:03 +01:00
3229d86d4d
Import urls.py needed django functions from django.conf.urls
2013-01-05 01:05:38 +01:00
2f28655a25
Show Tabs if there do not define some permissions
2013-01-05 01:03:42 +01:00
d842214e26
Fix typo in template.
2013-01-04 19:14:56 +01:00
5d754984a3
fixed pep8 errors
2013-01-04 12:39:42 +01:00
c1903848f2
Update openslides/__init__.py
2013-01-04 11:49:43 +01:00
d671740966
Fixed merged errors.
2013-01-02 23:22:12 +01:00
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
8a84f72891
fixed more url-template-tags
2012-12-16 17:35:06 +01:00
5ea863ca81
Let the user choose the language in his settings
2012-12-16 17:26:53 +01:00
b79fedc215
fixed jsonfield for django 1.5
2012-12-14 15:36:57 +01:00
804f842650
Updated the url template tag
2012-12-14 15:10:14 +01:00
366b8e0f1f
Droped support for python 2.5
2012-12-14 14:21:53 +01:00
a07146098b
Changed Version to 1.4.dev
2012-12-14 14:14:01 +01:00
c83348923a
Set version number to 1.3.1a0-dev (unreleased)
2012-12-10 22:36:18 +01:00
bf98224ebd
Fixed missing translation.
2012-12-10 20:34:37 +01:00
9a0bca7fea
Set 1.3 final release.
2012-12-10 20:30:32 +01:00
56a5778260
Updated translation (fixed minor typo).
2012-12-10 20:06:17 +01:00
c48c4e0e90
Added missing remove icon (for unsupport motion button).
2012-12-10 19:44:35 +01:00
67f6b36ebc
Updated fr translation from transifex
2012-12-09 14:17:52 +01:00
84324cf317
Updated translations
2012-12-09 12:59:56 +01:00
0369edae1e
Added translationcontext for posts in assignment
2012-12-09 10:48:45 +01:00
442e5fba60
Added fr translation
2012-12-09 10:40:41 +01:00
fc4c4c3f95
Revert "Updated fr translation"
...
This reverts commit 7ff0825dc3
2012-12-05 20:07:11 +01:00
05c029d8e5
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-12-04 00:20:41 +01:00
7ff0825dc3
Updated fr translation
2012-12-04 00:20:11 +01:00
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
a5022a3f00
Fix pep8 in openslides/__init__.py
2012-12-01 14:05:19 +01:00
4410e454c8
Update test for version string.
2012-12-01 13:39:29 +01:00
e7744f8210
Merge branch 'master' into Version_String
2012-12-01 13:10:29 +01:00
e76ec5e975
Added a new command to the startscript to show the version
2012-11-29 15:01:49 +01:00
d53017eea8
Get git commit id also in detached head mode.
2012-11-28 18:02:33 +01:00
589c209c79
Merge branch 'master' into Version_String
...
Conflicts:
openslides/__init__.py
openslides/config/views.py
2012-11-28 17:54:29 +01:00
ab4c5791ad
Merge pull request #61 from ostcar/master
...
Forbid the deletion of the registered group
2012-11-28 05:16:10 -08:00
8306e7bf6e
Don't allow to remove the registered group
2012-11-28 13:59:14 +01:00
48b530487b
Merge pull request #59 from emanuelschuetze/master
...
Prepared 1.3-rc1
2012-11-27 13:59:38 -08:00
a010df5d1f
Reverted person.sort_name AttributeError fix ( e0ce1052c0)
2012-11-27 22:54:07 +01:00
e7c47395bb
Gave the empty user all the attributes it needs
2012-11-27 22:46:54 +01:00
ae35a8c719
Updated translations
2012-11-27 21:30:45 +01:00
94928c20c5
Updated translation msg strings.
2012-11-27 21:22:57 +01:00
301a379fa6
Prepared 1.3-rc1 release.
2012-11-27 20:13:18 +01:00
40984a6508
Merge remote branch 'upstream/master'
2012-11-27 20:10:13 +01:00
4dfd4ac67f
fix _proper_unicode
2012-11-26 15:48:23 +01:00
bdfb714013
fixed pep8 in pdf.py
2012-11-26 10:35:29 +01:00
c276bce780
Let travis test pep8
2012-11-26 10:11:36 +01:00
abd21dd345
Added more tests for the agenda
2012-11-26 10:05:51 +01:00
fddf929ab5
Load groups_de when creating the database
2012-11-25 01:07:39 +01:00
ab4b117a93
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-25 00:55:37 +01:00
a31a67c32e
removed initial_data
2012-11-25 00:55:25 +01:00
804b514597
Merge pull request #57 from andkit/bug-409
...
Fix #409
2012-11-24 12:29:44 -08:00
3f469ab9d6
Commited the fix for get_version
2012-11-24 21:26:09 +01:00
b3806d8cdd
some tests for the agenda
2012-11-24 21:10:55 +01:00
5979b23b04
Merge remote-tracking branch 'origin/master' into bug-409
...
Conflicts:
openslides/main.py
2012-11-24 20:49:04 +01:00
21a51523a4
Make pep8.py happy
2012-11-24 20:35:06 +01:00
ec60207cfd
Fixed typo (candidation -> candidature)
2012-11-24 17:39:28 +01:00
e0ce1052c0
Catch AttributeError for 'person.sort_name' in assignment/models.py
2012-11-24 17:34:56 +01:00
c405e9b648
Rework default settings handling ( fixes #409 )
2012-11-24 15:00:36 +01:00
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
bd32994296
cleanup
...
Removed unused imports and fixed pep8 errors
2012-11-24 14:01:21 +01:00
f5a438cf9f
cleanup in utils
2012-11-24 01:42:10 +01:00
4c97291598
Remove non-used revision template var.
2012-11-23 11:33:34 +01:00
baebfbb585
Fix get_version, insert and use get_git_commit_id.
2012-11-23 11:31:30 +01:00
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
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
c115ea59a0
Fixed typo in comment.
2012-11-22 21:48:49 +01:00
fa1c384d28
made use of defaults in get_or_create
2012-11-22 18:47:50 +01:00
1049141483
Created a default group for registered users
2012-11-22 18:39:54 +01:00
e168445497
fixed error, which allowed admins to delete the anonymous grou
2012-11-22 17:29:49 +01:00
1dc7d45670
sort persons in motions
2012-11-22 17:00:09 +01:00
8014f327a2
Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api
2012-11-22 16:35:26 +01:00
fbf81e7780
sort persons
2012-11-22 16:19:09 +01:00
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
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
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
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
8aec947303
Removed unused widget file (duplicate of welcome_widget.html).
2012-11-21 23:05:38 +01:00
830f85109d
Minor formatting work.
2012-11-21 23:03:14 +01:00
d5ee6d69b6
Enlarged users select box in new/edit group form.
2012-11-21 22:06:22 +01:00
4877eed46c
Updated translation.
2012-11-21 21:45:27 +01:00
ec1a15a835
#175 : Adjusted group slide; analog to user slide.
2012-11-21 21:45:19 +01:00
2acfd02144
Merge pull request #45 from normanjaeckel/GroupSlide
...
Insert a slide for groups
2012-11-21 12:18:17 -08:00
f3c865ee3c
#176 : Adjusted user slide. Show only relevant information in a nice and clear layout.
2012-11-21 21:05:56 +01:00
c5a2f896e2
Fixed typo in identifier 'assignment_candidates'.
2012-11-21 20:12:08 +01:00
da0757e40f
#417 : Don't hide vote results table if status is reset
2012-11-21 19:39:55 +01:00
17d813e08b
Show error message for NameError.
2012-11-21 19:36:12 +01:00
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
06af94fb91
Fix assignment poll choosing the right method (yes-no-abstain True or False)
2012-11-21 15:03:29 +01:00
8e886a22ef
Insert a slide for groups
2012-11-21 14:22:30 +01:00
00e77ba0fc
Use join for the group list also in the participant view
2012-11-21 14:09:47 +01:00
5939b98772
Use join for group list in UserSlide.html
2012-11-21 14:07:14 +01:00
d69e5a246b
Fix urls.py - Redirect from / to the dahsboard
2012-11-21 13:41:16 +01:00
7fa86f7de0
Used blocktrans instead of trans
2012-11-20 12:37:16 +01:00
ec10f357cf
Used RedirectView from openslides.utils.views. Used reverse_lazy
...
instead of hard coded redirect url.
2012-11-20 12:19:12 +01:00
5e97ece5f4
#278 : Used cycle rowcolor in vote results table also for inavlid votes row
2012-11-19 23:52:48 +01:00
0fbb7dced3
Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!)
2012-11-19 23:30:09 +01:00
844b2892f1
Updated translation for professional support footer.
2012-11-19 23:05:38 +01:00
c5595effef
Updated translation.
2012-11-19 22:59:13 +01:00
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
0cf4191934
Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty.
2012-11-17 23:44:41 +01:00
b10cf331ab
Updated translation
2012-11-17 22:24:29 +01:00
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
e338529865
#296 : Localised the datetime in PDF header
2012-11-17 21:44:17 +01:00
Oskar Hahn