Oskar Hahn
fa95119936
New Feature: List of speakers.
2013-04-15 19:23:37 +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
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
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
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
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
Oskar Hahn
43cd5aba00
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-14 22:44:11 +01:00
Oskar Hahn
545d4be04f
fixed update of person_api
2013-03-14 22:32:00 +01:00
Oskar Hahn
d21185a449
Merge branch 'master' of github.com:OpenSlides/OpenSlides into category
2013-03-12 22:05:20 +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
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
Oskar Hahn
51a9e41015
Set new django setting. Put tornado code in a seperate file.
2013-02-27 18:54:06 +01:00
Oskar Hahn
2822c39f8a
Merge branch 'master' into tornado
2013-02-18 19:08:58 +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
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
82e35bebff
Fixed wrong deletion if user clicks "no" in confirm form.
2013-02-05 21:31:45 +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
e7c65b3db1
Moved some methodes from utils.views.DeleteView to QuestionMixin
2013-02-03 13:23:55 +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
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
b6256b73e0
Changed utils.views.DeleteView
2013-02-01 13:24:30 +01:00
Oskar Hahn
adeaf248ef
Changed utils.- and poll.views
2013-02-01 12:51:01 +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
1f87749742
Save the submitters to the motion
2013-01-26 15:25:54 +01:00
Roland Geider
3bfead298d
Add custom management command to start the application with tornado
2013-01-23 21:12:36 +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
Norman Jäckel
deb0d5b2e5
Some fixes. Update requirements.txt and setup.py.
2013-01-05 23:20:38 +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
ae8641bcad
Raise an error if an CreateView does not define a apply_url
2013-01-05 01:48:03 +01:00
Oskar Hahn
2f28655a25
Show Tabs if there do not define some permissions
2013-01-05 01:03:42 +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
b79fedc215
fixed jsonfield for django 1.5
2012-12-14 15:36:57 +01:00
Oskar Hahn
366b8e0f1f
Droped support for python 2.5
2012-12-14 14:21:53 +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
e7c47395bb
Gave the empty user all the attributes it needs
2012-11-27 22:46:54 +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
b3806d8cdd
some tests for the agenda
2012-11-24 21:10:55 +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
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
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
5623bb6888
Move professional support message into base template footer.
2012-11-08 19:13:31 +01:00
Oskar Hahn
79c5e93422
Redesigned the QuestioMixin
2012-10-28 19:59:41 +01: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
413cd27d40
fixed deletion of motions. #391
2012-10-24 12:45:40 +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
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
Oskar Hahn
2984fd791c
small fix to the person api
2012-09-15 09:11:56 +02:00
Emanuel Schuetze
7fde53a09e
Updated template with twitter bootstrap. Step 1: agenda and application.
2012-09-05 00:20:28 +02: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
cdf160dfc3
fix some problems with the creation of new users
2012-08-11 11:09:20 +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
ddb5756868
rewrote the participant edit view as class based view
2012-08-10 13:22:09 +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
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
14bf6d0a35
user-api: updated the application-supporter system to new user-api
2012-08-04 12:19:31 +02:00
Oskar Hahn
c16d38d9a3
user-api: Load the User-List from UserFormField on any request
2012-08-03 16:25:04 +02:00
Oskar Hahn
1ae91d1130
changed user-api, so it can be filter the result for the prefix and the id
2012-08-03 14:23:13 +02:00
Oskar Hahn
93020f9ead
mark group to be teated as user
2012-08-03 12:44:34 +02:00
Oskar Hahn
4ffb701397
created new user-api
2012-08-03 00:11:53 +02:00
Emanuel Schuetze
1f3cfaf25a
Added ugettext_lazy for 403 error page.
2012-07-23 23:06:36 +02:00
Emanuel Schuetze
cdddc00d54
Improved else block.
2012-07-23 22:59:31 +02:00
Emanuel Schuetze
219b1e936e
Fixed two PDF build errors.
2012-07-23 12:35:15 +02:00
Oskar Hahn
93f9e2dc97
fix error in the translation of the participant-list
2012-07-20 11:40:36 +02:00
Oskar Hahn
84a78e8584
#290 fix unicode problem for python 2.5 in strftime
2012-07-14 09:19:45 +02:00
Oskar Hahn
68215e78d6
add Licence for django-jsonfield
2012-07-11 09:45:48 +02:00
Oskar Hahn
aa130ab2da
cleanup openslides base files.
...
Do not manipulate the pythonpath anymore.
2012-07-10 14:00:51 +02:00
Oskar Hahn
5fcef8aba4
cleanup utils
2012-07-10 13:19:12 +02:00
Oskar Hahn
debaa505fb
fix problems with reportlab and ugettext_lazy
2012-07-10 12:11:07 +02:00
Andy Kittner
5438b2c318
Add a workaround for django bug 18404 ( fixes #204 )
2012-07-08 18:09:23 +02:00
Oskar Hahn
e01d456e7b
clean up the config app. Use jsonfield to save the config values.
...
Syncdb necessary.
2012-07-07 14:48:21 +02:00
Oskar Hahn
15621b7702
clean up the projector App
2012-07-07 14:01:40 +02:00
Oskar Hahn
f8a1c58fff
#277 throw an error, in the invalid-field or the votecast-field is lower -2
2012-07-07 11:14:04 +02:00
Oskar Hahn
1889cff68b
#276 fix unicode Error in html_string() function
2012-07-07 10:35:29 +02:00
Oskar Hahn
29d25d30d6
cleanup the agenda app
2012-07-04 12:50:33 +02:00
Oskar Hahn
ebc81d9236
#255 fixed assignment-poll delete message
2012-07-01 17:38:34 +02:00
Oskar Hahn
00eb365b91
rewrote active_slide in generic view
...
also reordert some imports
2012-07-01 15:35:05 +02:00
Oskar Hahn
0f42dd06fd
#234 take 75 chars at maximum
2012-06-30 14:50:52 +02:00
Oskar Hahn
e8e664b92e
#237 , #238 only show the first line of a comment in the agenda
2012-06-30 10:39:58 +02:00
Oskar Hahn
239f328372
rewrote projector-widget system
2012-06-11 13:43:48 +02:00
Oskar Hahn
960543b64e
load all models in projector.views
2012-06-10 10:43:50 +02:00
Emanuel Schuetze
d8cd0c2b6a
Renamed logo files (typo).
2012-06-04 10:17:56 +02:00
Oskar Hahn
965b682abc
edit, delete, slide for releated item in agenda
2012-06-03 09:35:26 +02:00
Emanuel Schuetze
ca2900e9d1
#195 : Fixed unicode string in pdf header.
2012-05-17 21:34:19 +02:00
Andy Kittner
3815ef26af
Fix wrong translations in forms/ models
...
Converted utils.translation_ex.ugettext to use ugettext_lazy and changed
forms modules to import ugettext from there (models where already importing
it from there)
2012-05-15 01:08:08 +02:00
Emanuel Schuetze
4e8e9b5407
#155 : Remove header/footer in frameless PDF.
2012-04-29 18:54:42 +02:00
Emanuel Schuetze
1a4a748e6c
#112 : Use monotype for printing first time password
2012-04-27 22:47:41 +02:00
Emanuel Schuetze
20ce7579ce
#158 : Added from_invalid error notification for ItemCreate/Update.
2012-04-27 21:40:42 +02:00
Emanuel Schuetze
7ef298881d
Updated license header.
2012-04-25 22:29:19 +02:00
Emanuel Schuetze
5f3c6c4821
#111 : Move pdf creation code from utils to participant app.
2012-04-20 23:23:50 +02:00
Emanuel Schuetze
7a6eaf2660
Fixed building AssignmentPollPDF.
2012-04-20 14:33:40 +02:00
Oskar Hahn
4e904c7356
now it is possible to create a item, witch is realted to another object, for example an application.
2012-04-19 12:46:04 +02:00
Oskar Hahn
59225bf822
added default get_filename for PDFView
2012-04-18 20:57:44 +02:00
Emanuel Schuetze
3812b5ebd1
#103 : Set application filename.
2012-04-18 18:54:48 +02:00
Oskar Hahn
e9e9fa54b2
fixed problem with deleting the default permissions
2012-04-18 16:57:33 +02:00
Oskar Hahn
6798050ded
added help_message
2012-04-18 15:04:16 +02:00
Oskar Hahn
534a81c46c
rewrote projector_messages system. Recalled it projector_overlay and added a special overlay for unique messages
2012-04-16 16:35:30 +02:00
Oskar Hahn
c1cd0a2805
send class, not object, for template_manipulation
2012-04-16 11:11:45 +02:00
Emanuel Schuetze
abf7721f3f
Filled frontpage with config values.
2012-04-15 13:26:01 +02:00
Oskar Hahn
6f0fd91ec2
some permission problems
2012-04-15 12:52:59 +02:00
Emanuel Schuetze
4d7940cb12
Automated merge with ssh://openslides.org/openslides
2012-04-15 12:39:35 +02:00
Emanuel Schuetze
95d5929449
Added participant and version config page. Moved system settings to general. Some style work.
2012-04-15 12:39:28 +02:00
Oskar Hahn
1d5455f8f9
frontpage
2012-04-15 11:24:40 +02:00
Oskar Hahn
e752ddf3ee
fixe error with tabs in DetailView
2012-04-15 10:02:53 +02:00
Oskar Hahn
361bc40821
view for Agenda.item
2012-04-15 09:55:21 +02:00
Oskar Hahn
500b418f91
Automated merge with ssh://openslides.de/openslides
2012-04-14 20:10:56 +02:00
Oskar Hahn
3a849880fb
code for control view in apps
2012-04-14 20:10:49 +02:00
Emanuel Schuetze
a73b548032
Minor changes.
2012-04-14 18:13:55 +02:00
Oskar Hahn
fbdcc5e0b4
Automated merge with ssh://openslides.de/openslides
2012-04-14 14:31:15 +02:00
Oskar Hahn
535795391d
remove default permission after syncdb
2012-04-14 14:31:09 +02:00
Emanuel Schuetze
1528ab90c6
Merged.
2012-04-14 14:27:31 +02:00
Emanuel Schuetze
d192ac4952
Added AssignmentPollDelete View. Moved Assignment pdf functions to assignment's views.py
2012-04-14 14:24:13 +02:00
Oskar Hahn
6f377453bc
rename system in config. Add default config in each apps
2012-04-14 12:52:56 +02:00
Emanuel Schuetze
a4db8a49dd
Automated merge with ssh://openslides.org/openslides
2012-04-14 10:54:31 +02:00
Emanuel Schuetze
4abd79e7b5
Added PDF document title.
2012-04-14 10:54:22 +02:00
René Köcher
d2f9f630c7
Move AnonymousAuth from system to utils.
2012-04-14 09:49:37 +02:00
René Köcher
a792cd4c15
Support for localized permissions on top of the static django model.
2012-04-14 09:34:31 +02:00
Emanuel Schuetze
698697a75c
Applications: Moved pdf functions from pdf.py to new PDF view in views.py.
2012-04-13 23:52:34 +02:00
Oskar Hahn
f889c49c1b
some clean up in participant app
2012-04-13 11:35:53 +02:00
Oskar Hahn
d187f341b3
DeleteView in utils.views
2012-04-12 20:11:05 +02:00
Oskar Hahn
497a8cdb70
added AjaxView
2012-04-12 14:20:05 +02:00
Oskar Hahn
3eeae673c0
some small fixes
2012-04-11 10:58:59 +02:00
Oskar Hahn
c4c42611b4
generate tab liste by app list
2012-03-18 17:11:58 +01:00
Oskar Hahn
282778c8a0
fixed error with permission Mixin
2012-03-18 14:33:53 +01:00
