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 |
|
Emanuel Schuetze
|
844b2892f1
|
Updated translation for professional support footer.
|
2012-11-19 23:05:38 +01:00 |
|
Emanuel Schuetze
|
5623bb6888
|
Move professional support message into base template footer.
|
2012-11-08 19:13:31 +01:00 |
|
Emanuel Schuetze
|
15ab01c9d1
|
Removed unused mainmenu and submenu blocks.
|
2012-09-10 23:43:33 +02:00 |
|
Emanuel Schuetze
|
94ffb3ab45
|
Redesign login template.
|
2012-09-07 21:25:18 +02:00 |
|
Emanuel Schuetze
|
6a3bead5f6
|
Cleanup template code and style.
|
2012-09-06 23:59:03 +02:00 |
|
Emanuel Schuetze
|
7c90206b3f
|
Adjusted new template for participant app. Added new generic form.
|
2012-09-06 22:41:24 +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
|
0b033271f8
|
fix some typos, mostly {%trans to {% trans
|
2012-07-16 14:00:29 +02:00 |
|
Oskar Hahn
|
96aca54f61
|
update user setting page
|
2012-07-10 02:46:00 +02:00 |
|
Emanuel Schuetze
|
37619b0a80
|
#114: Set participants tab inactive if usersettings page is active
|
2012-05-20 22:34:41 +02:00 |
|
Emanuel Schuetze
|
1089e61011
|
Modified support help text.
|
2012-04-29 21:58:16 +02:00 |
|
Emanuel Schuetze
|
4ecff16aba
|
copyright 2011 -> 2012.
|
2012-04-20 12:44:45 +02:00 |
|
Oskar Hahn
|
0a8d40e2ac
|
slideUp read messages
|
2012-04-17 14:45:25 +02:00 |
|
Oskar Hahn
|
56f1a15cac
|
added function to set messages in JavaScript
|
2012-04-17 13:41:43 +02:00 |
|
Oskar Hahn
|
80c5bfbba9
|
translation in JS-files
|
2012-04-16 11:12:21 +02:00 |
|
Emanuel Schuetze
|
195ddddf7e
|
Automated merge with ssh://openslides.org/openslides
|
2012-04-15 10:36:51 +02:00 |
|
Emanuel Schuetze
|
c07c2ac853
|
Print openslides version number in separat config template.
|
2012-04-15 10:36:37 +02:00 |
|
Oskar Hahn
|
3222e75ab5
|
debounds from buttons
|
2012-04-15 10:30:34 +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
|
a11ed6cfdb
|
Minor template fixes.
|
2012-03-22 17:30:02 +01:00 |
|
Oskar Hahn
|
c4c42611b4
|
generate tab liste by app list
|
2012-03-18 17:11:58 +01:00 |
|
Emanuel Schuetze
|
55c4299a7f
|
Updated projector control template. Fixed some slidemodel strings and urls.
Updated jquery to 1.7.1. Added jquery-ui.
|
2012-03-06 08:19:49 +01:00 |
|
Oskar Hahn
|
654b101dac
|
beamer setting page
|
2012-03-03 09:11:56 +01:00 |
|
Oskar Hahn
|
6498095e2b
|
create setup.py to install openslides
|
2012-02-09 16:57:10 +01:00 |
|
Oskar Hahn
|
21a13b4d1a
|
The Version of openslides can be written in openslides/__init__.py
|
2012-02-09 13:43:39 +01:00 |
|
Emanuel Schuetze
|
66c078b333
|
Typo.
|
2011-10-31 20:21:19 +01:00 |
|
Emanuel Schuetze
|
b7a1afd3a2
|
Changed url 'item' to 'agenda'.
|
2011-09-04 19:22:30 +02:00 |
|
Emanuel Schuetze
|
d1d0e7e9b4
|
Updated permissions.
|
2011-09-04 12:21:58 +02:00 |
|
Emanuel Schuetze
|
6a991dba0d
|
Removed language selector. Should be used via settings.py now.
|
2011-09-03 23:37:15 +02:00 |
|
Oskar Hahn
|
f5d2a503d0
|
Automated merge with ssh://oshahn.de/openslides
|
2011-09-03 11:46:22 +02:00 |
|
Oskar Hahn
|
dcbeb452fb
|
canidate in assignment can be marked as elected
|
2011-09-03 11:42:44 +02:00 |
|
Emanuel Schuetze
|
e752e05b0f
|
Removed unnecessary parts from poll system. Needs new development in future.
|
2011-09-03 01:40:06 +02:00 |
|
Oskar Hahn
|
3db6a12024
|
Add code
|
2011-07-31 10:46:29 +02:00 |
|