Emanuel Schuetze
82e35bebff
Fixed wrong deletion if user clicks "no" in confirm form.
2013-02-05 21:31:45 +01:00
Emanuel Schuetze
586425354d
Reworked new template, especially agenda and dashboard.
2013-01-08 23:05:35 +01:00
Emanuel Schuetze
13cd52bd96
Merged (conflicts).
2013-01-05 15:29:57 +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
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
4dfd4ac67f
fix _proper_unicode
2012-11-26 15:48:23 +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
c58d478151
rename render_to_forbitten to render_to_forbidden. #370
2012-10-24 11:39:27 +02:00
Emanuel Schuetze
7fde53a09e
Updated template with twitter bootstrap. Step 1: agenda and application.
2012-09-05 00:20:28 +02:00
Emanuel Schuetze
1f3cfaf25a
Added ugettext_lazy for 403 error page.
2012-07-23 23:06:36 +02:00
Oskar Hahn
5fcef8aba4
cleanup utils
2012-07-10 13:19:12 +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
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
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
7ef298881d
Updated license header.
2012-04-25 22:29:19 +02:00
Oskar Hahn
e9e9fa54b2
fixed problem with deleting the default permissions
2012-04-18 16:57:33 +02:00
Oskar Hahn
535795391d
remove default permission after syncdb
2012-04-14 14:31:09 +02:00
Oskar Hahn
f889c49c1b
some clean up in participant app
2012-04-13 11:35:53 +02:00
Oskar Hahn
c4c42611b4
generate tab liste by app list
2012-03-18 17:11:58 +01:00
Oskar Hahn
114a68b120
some additions in poll and application-poll
2012-02-15 13:44:55 +01:00
Oskar Hahn
21a13b4d1a
The Version of openslides can be written in openslides/__init__.py
2012-02-09 13:43:39 +01:00
Oskar Hahn
28170becb3
cleand the apenda-app
2012-02-09 02:29:38 +01:00
Emanuel Schuetze
8ed81db9f2
Application import: Added propper_unicode function to handle
...
unicode/ascii mix. Thanks to Rene Koecher!
2011-11-29 12:10:06 +01:00
Oskar Hahn
2973ec1f33
set cookie in @template decorator
...
if the dict has the value cookie, set a cookie with dict['cookie'][0] as Name and ['cookie'][1] as value
2011-09-10 00:16:39 +02:00
Oskar Hahn
a9775bdd73
api for ajax requests
2011-09-02 20:46:24 +02:00
Oskar Hahn
3db6a12024
Add code
2011-07-31 10:46:29 +02:00
