Emanuel Schuetze
|
48e1282cb9
|
Show duration clock only if start/end time is set.
|
2013-03-09 14:15:03 +01:00 |
|
Stefan Frauenknecht
|
45856fc9b0
|
add signal callback to provide defaults
|
2013-02-20 23:50:34 +01:00 |
|
Stefan Frauenknecht
|
f81abe215f
|
Revert last changes
|
2013-02-20 23:48:04 +01:00 |
|
Oskar Hahn
|
4f3f917812
|
some small code design changes
|
2013-02-18 18:56:37 +01:00 |
|
Stefan Frauenknecht
|
1d1d72d45a
|
Fixed if condition with duration property which can be None
|
2013-02-16 11:55:40 +01:00 |
|
Stefan Frauenknecht
|
8103c09b81
|
PEP8 errors resolved
|
2013-02-16 10:41:22 +01:00 |
|
Emanuel Schuetze
|
0b3b91b8d5
|
Show item-tooltip in bootstrap tooltip style.
|
2013-02-15 08:51:08 +01:00 |
|
Emanuel Schuetze
|
4f60160667
|
Added missing success_url_name.
|
2013-02-15 08:50:42 +01:00 |
|
Emanuel Schuetze
|
e9c996340a
|
Used custom build jquery-ui javascript components file. Integrated required jquery-ui styles (no remote link). Added used jquery components/addons to THANKS file.
|
2013-02-15 08:39:36 +01:00 |
|
Emanuel Schuetze
|
e3428d3e83
|
Some style work.
|
2013-02-11 23:01:48 +01:00 |
|
Emanuel Schuetze
|
e101fb8212
|
Merge branch 'master' into agenda-orga-items
Conflicts:
openslides/agenda/static/styles/agenda.css
openslides/agenda/templates/agenda/config.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/static/styles/base.css
requirements.txt
|
2013-02-11 22:36:19 +01:00 |
|
Emanuel Schuetze
|
a51a296434
|
Changed agenda start/end time to djangos DATETIME_FORMAT.
|
2013-02-09 22:59:15 +01:00 |
|
Oskar Hahn
|
27c73092e1
|
Merge remote-tracking branch 'emanuel/newtemplate' into new_motion
Conflicts:
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
|
2013-02-06 09:25:27 +01:00 |
|
Emanuel Schuetze
|
6b4ee0e4f6
|
Updated translation.
|
2013-02-05 23:09:23 +01:00 |
|
Emanuel Schuetze
|
c8ddb21760
|
Fixed wrong hiding of open agenda child items if parent item is closed
|
2013-02-05 22:36:05 +01:00 |
|
Emanuel Schuetze
|
e49efb40d8
|
template: Added new css class for minimum column width.
|
2013-02-05 22:03:43 +01:00 |
|
Emanuel Schuetze
|
64e3c1f3cb
|
template: Removed unused 'load staticfiles'.
|
2013-02-05 21:41:26 +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 |
|
Stefan Frauenknecht
|
d6084f7c8b
|
Create items with duration loger than 23:59. Show start and end date. Duration has tooltip showing end date and time.
|
2013-02-05 16:36:57 +01:00 |
|
Oskar Hahn
|
90614cc637
|
Updated some views for the new utils.views style
|
2013-02-03 19:43:36 +01:00 |
|
Oskar Hahn
|
139ba74459
|
Merge remote-tracking branch 'emanuel/newtemplate' into new_template
Conflicts:
.travis.yml
INSTALL.txt
openslides/agenda/templates/agenda/base_agenda.html
openslides/agenda/templates/agenda/edit.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/agenda/templates/agenda/widget.html
openslides/assignment/templates/assignment/base_assignment.html
openslides/assignment/templates/assignment/config.html
openslides/assignment/templates/assignment/edit.html
openslides/assignment/templates/assignment/overview.html
openslides/assignment/templates/assignment/poll_view.html
openslides/assignment/templates/assignment/view.html
openslides/assignment/templates/assignment/widget.html
openslides/config/templates/config/general.html
openslides/motion/templates/motion/base_motion.html
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/motion/templates/motion/widget.html
openslides/motion/views.py
openslides/participant/templates/participant/base_participant.html
openslides/participant/templates/participant/config.html
openslides/participant/templates/participant/edit.html
openslides/participant/templates/participant/group_edit.html
openslides/participant/templates/participant/group_widget.html
openslides/participant/templates/participant/import.html
openslides/participant/templates/participant/login.html
openslides/participant/templates/participant/overview.html
openslides/participant/templates/participant/password_change.html
openslides/participant/templates/participant/settings.html
openslides/participant/templates/participant/user_widget.html
openslides/projector/templates/projector/base_projector.html
openslides/projector/templates/projector/control_countdown.html
openslides/projector/templates/projector/control_overlay_message.html
openslides/projector/templates/projector/custom_slide_widget.html
openslides/projector/templates/projector/live_view_widget.html
openslides/projector/templates/projector/new.html
openslides/projector/templates/projector/overlay_widget.html
openslides/templates/base.html
openslides/utils/template.py
openslides/utils/views.py
requirements.txt
|
2013-02-03 19:03:18 +01:00 |
|
Oskar Hahn
|
6c3eb0f765
|
fixed urls in views from the participant app
|
2013-02-01 17:35:27 +01:00 |
|
Stefan Frauenknecht
|
7f03e02e9a
|
Item type changed from CharField to IntegerField. Constant type names added.
|
2013-02-01 15:13:40 +01:00 |
|
Stefan Frauenknecht
|
9f3dae8059
|
ConfigForm: Base classes reordered
|
2013-02-01 14:47:51 +01:00 |
|
Stefan Frauenknecht
|
c595701597
|
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
|
2013-02-01 14:41:52 +01:00 |
|
Emanuel Schuetze
|
d3b679442c
|
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling.
|
2013-02-01 12:55:04 +01:00 |
|
Stefan Frauenknecht
|
5a9b7fdca5
|
Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
|
2013-01-31 20:37:55 +01:00 |
|
Stefan Frauenknecht
|
9746b3818f
|
Rework code to ommit unnecessary filter call.
|
2013-01-31 20:32:29 +01:00 |
|
Stefan Frauenknecht
|
3dfd16558a
|
Blanks removed
|
2013-01-31 18:35:52 +01:00 |
|
Emanuel Schuetze
|
82ad5e2de0
|
Major changes for new twitter bootstrap template (e.g. replaced icons)
|
2013-01-31 10:19:56 +01:00 |
|
Stefan Frauenknecht
|
65ebcbc991
|
#41 Time for each agenda item finished
|
2013-01-30 17:39:53 +01:00 |
|
Stefan Frauenknecht
|
bc9dcffff4
|
#41 Time for each agenda item
|
2013-01-29 14:28:42 +01:00 |
|
Emanuel Schuetze
|
a4592ec849
|
Reworked projector activate buttons in agenda widget.
|
2013-01-18 21:44:47 +01:00 |
|
Emanuel Schuetze
|
586425354d
|
Reworked new template, especially agenda and dashboard.
|
2013-01-08 23:05:35 +01:00 |
|
Stefan Frauenknecht
|
aee24425bc
|
Ticket 433 - Organisational items
|
2013-01-05 23:52:29 +01:00 |
|
Emanuel Schuetze
|
13cd52bd96
|
Merged (conflicts).
|
2013-01-05 15:29:57 +01:00 |
|
Stefan Frauenknecht
|
bb74674c41
|
Deprecated import django.conf.urls.defaults adjusted.
|
2013-01-05 12:39:20 +01:00 |
|
Oskar Hahn
|
3229d86d4d
|
Import urls.py needed django functions from django.conf.urls
|
2013-01-05 01:05:38 +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
|
804f842650
|
Updated the url template tag
|
2012-12-14 15:10:14 +01:00 |
|
Oskar Hahn
|
84324cf317
|
Updated translations
|
2012-12-09 12:59:56 +01:00 |
|
Oskar Hahn
|
6b2645d11c
|
reordered the tests
moved the tests from the openslides-module to an own module
configured coverage
|
2012-11-24 15:00:17 +01:00 |
|
Oskar Hahn
|
bd32994296
|
cleanup
Removed unused imports and fixed pep8 errors
|
2012-11-24 14:01:21 +01:00 |
|
Norman Jäckel
|
af6c403936
|
Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector.
|
2012-11-21 15:14:38 +01:00 |
|
Emanuel Schuetze
|
e601d8a5a3
|
Fixed display_name of widgets.
|
2012-11-08 09:43:04 +01:00 |
|
Oskar Hahn
|
79c5e93422
|
Redesigned the QuestioMixin
|
2012-10-28 19:59:41 +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
|
473c2c347f
|
Removed unused base_agenda.html template.
|
2012-09-10 23:37:59 +02:00 |
|
Emanuel Schuetze
|
ce233fc870
|
Updated config template.
|
2012-09-10 17:40:41 +02:00 |
|