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
|
84324cf317
|
Updated translations
|
2012-12-09 12:59:56 +01:00 |
|
Oskar Hahn
|
56e3fe7a37
|
fix translation
|
2012-09-13 21:56:50 +02:00 |
|
Oskar Hahn
|
ef7deb90c9
|
translate agenda hidden filter in js
|
2012-09-13 15:21:43 +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
|
969816be37
|
Use new close icon to keep old done icon.
|
2012-07-13 07:58:00 +02:00 |
|
Emanuel Schuetze
|
0c64309c91
|
Rename summary icon.
|
2012-07-12 17:11:33 +02:00 |
|
Oskar Hahn
|
47ff052c22
|
fix close and unclose link via ajax
|
2012-07-04 15:49:33 +02:00 |
|
Oskar Hahn
|
7f2d10c9ca
|
fix hide-closed-item function for non-manager
|
2012-07-04 13:12:07 +02:00 |
|
Oskar Hahn
|
f903f350b8
|
insert item-summary link in the widget
|
2012-07-01 16:13:34 +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 |
|
Emanuel Schuetze
|
9b6b969f8a
|
Added missing license header (for js and css).
|
2012-04-25 22:48:27 +02:00 |
|
Emanuel Schuetze
|
d56dcba7d4
|
#119: Adjusted icon filenames.
|
2012-04-23 21:27:22 +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
|
a35e1917a4
|
Removed unused icons.
|
2012-04-18 19:52:37 +02:00 |
|
Emanuel Schuetze
|
4ce8facd1a
|
#98: Add new filter for active/inactive items.
|
2012-04-18 18:29:31 +02:00 |
|
Emanuel Schuetze
|
f44f2723dc
|
Added link to activate agenda item in overview table.
|
2012-04-15 15:53:05 +02:00 |
|
Emanuel Schuetze
|
0657ff340d
|
Show clickable done action in first column in agenda overview.
|
2012-04-15 14:28:01 +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 |
|