Oskar Hahn
|
fa95119936
|
New Feature: List of speakers.
|
2013-04-15 19:23:37 +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 |
Norman Jäckel
|
571649d5a6
|
Fix typo in assignment.
|
2013-03-18 21:31:24 +01:00 |
Emanuel Schuetze
|
71b1bede6f
|
Set new button als primary/blue button.
|
2013-03-09 14:17:30 +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
|
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
|
0c5459f96e
|
template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
|
2013-02-05 20:40:55 +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 |
Emanuel Schuetze
|
82ad5e2de0
|
Major changes for new twitter bootstrap template (e.g. replaced icons)
|
2013-01-31 10:19:56 +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 |
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
|
0369edae1e
|
Added translationcontext for posts in assignment
|
2012-12-09 10:48:45 +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
|
7fa86f7de0
|
Used blocktrans instead of trans
|
2012-11-20 12:37:16 +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
|
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
|
005cb2f15e
|
Updated translations.
|
2012-11-03 08:59:34 +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 |
Norman Jäckel
|
0ec106a034
|
Fix message on assignment slide, ticket #389
|
2012-10-25 22:18:20 +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
|
a0242c3c74
|
Show linebreaks in assignment description. #392
|
2012-10-24 12:48:11 +02:00 |
Emanuel Schuetze
|
613956b62a
|
Fixed missing blue 'candidate elected' line in assignment projector template.
|
2012-09-18 22:55:31 +02:00 |
Oskar Hahn
|
e64f4f5efc
|
show blocked candidates of an assignment
|
2012-09-13 14:59:14 +02:00 |
Emanuel Schuetze
|
2f3e57bf4a
|
Removed unused base_assignment.html template.
|
2012-09-10 23:40:08 +02:00 |
Emanuel Schuetze
|
ce233fc870
|
Updated config template.
|
2012-09-10 17:40:41 +02:00 |
Emanuel Schuetze
|
65840d4261
|
Minor changes in assigment view template.
|
2012-09-10 17:15:43 +02:00 |
Emanuel Schuetze
|
ae51d9e7da
|
Adjusted template for assignment app.
|
2012-09-06 23:58:20 +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
|
1719aa588d
|
rename some user api and participant names
|
2012-08-07 22:43:57 +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
|
1a1bcb2358
|
updated some parts of OpenSlides to the new user-api
|
2012-08-04 15:15:11 +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
|
4f61c763d7
|
started to rewrite the assignment-code for the new user-api
|
2012-08-03 13:49:05 +02:00 |
Emanuel Schuetze
|
d428841735
|
Fixed translation.
|
2012-07-16 22:26:07 +02:00 |
Oskar Hahn
|
76e52cf01a
|
#300 dont show votecast and voteinvalid symbols, if the vote has no votes
|
2012-07-16 14:29:30 +02:00 |
Oskar Hahn
|
0b033271f8
|
fix some typos, mostly {%trans to {% trans
|
2012-07-16 14:00:29 +02:00 |
Norman Jäckel
|
bd9c609dc0
|
Change design of assignment poll view (see #292)
|
2012-07-15 23:17:10 +02:00 |
Oskar Hahn
|
88cb44e0c3
|
#287 fix elected candidate in assignment-slide
|
2012-07-13 11:33:56 +02:00 |
Norman Jäckel
|
e99e5ab290
|
Clean up browsertitles (#282) in assignment and participant tab
|
2012-07-13 01:10:58 +02:00 |
Oskar Hahn
|
333349a1f2
|
Only show voteresult-table where there is at least one published poll.
Also fix AssignmentPDF-Poll-Table
|
2012-07-10 00:47:00 +02:00 |
Norman Jäckel
|
c1e9540699
|
Fix #280
|
2012-07-05 01:15:04 +02:00 |
Oskar Hahn
|
ff44439351
|
#266 fix assignment view on the projector
|
2012-07-04 16:14:19 +02:00 |
Oskar Hahn
|
ef5b9e3281
|
#253 don't show unpublished polls for nonmanager in assignment view
|
2012-07-04 16:05:31 +02:00 |
Norman Jäckel
|
ad02cb05ae
|
Draft for vote result table on assignment view and projector. Publishing still not working.
|
2012-07-04 00:40:25 +02:00 |