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
|
c52f8f3ca7
|
changed application to motion and permitted to authorized in message-strings
|
2012-08-05 22:31:20 +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
|
70b161c539
|
added name for participant app in __init__
removed some files, added though branch merge
|
2012-07-19 11:11:07 +02:00 |
|
Oskar Hahn
|
8f4970e16c
|
merge 1.2-dev with default branch
|
2012-07-18 10:37:23 +00:00 |
|
Oskar Hahn
|
0b033271f8
|
fix some typos, mostly {%trans to {% trans
|
2012-07-16 14:00:29 +02:00 |
|
Norman Jäckel
|
16e829a05d
|
Change application widget - Set number behind the title.
Fix wrong application title in the beamer template
|
2012-07-16 00:12:12 +02:00 |
|
Emanuel Schuetze
|
92562aef28
|
#188: Fixed projector template style error.
|
2012-05-15 20:36:49 +02:00 |
|
Emanuel Schuetze
|
eb7672074e
|
Some more style work for application projector template.
|
2012-04-30 08:30:04 +02:00 |
|
Emanuel Schuetze
|
e28c15eff9
|
Improve projector style of application voting results.
|
2012-04-30 08:23:50 +02:00 |
|
Emanuel Schuetze
|
719ea6ec79
|
#93: Show application number in header of projector template.
Some more projetor style work.
|
2012-04-24 22:27:16 +02:00 |
|
Emanuel Schuetze
|
3886449b2c
|
#106: Action column for applications.
#121 (partly): Activate links for agenda and applications table.
|
2012-04-20 22:43:12 +02:00 |
|
Emanuel Schuetze
|
42a2e44390
|
Updated translations.
|
2012-04-20 11:15:15 +02:00 |
|
Oskar Hahn
|
e23c195388
|
show application title in presentation view
|
2012-04-19 11:10:36 +02:00 |
|
Oskar Hahn
|
74c704641c
|
fixed yes, no, abstain values in the presentation View of an Application
|
2012-04-19 11:08:22 +02:00 |
|
Oskar Hahn
|
da8c3c0bba
|
show pollresults in application projector
|
2012-04-16 17:21:41 +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 |
|
René Köcher
|
f674897505
|
Split static files in application specific directories and use django 1.4 staticfiles app.
|
2012-04-14 14:51:56 +02:00 |
|
Emanuel Schuetze
|
c14dcb1679
|
Added missing template tags (i18n).
|
2012-02-21 08:21:59 +01:00 |
|
Oskar Hahn
|
16c37661f7
|
renamed beamer in projector
|
2012-02-06 22:08:08 +01:00 |
|