Oskar Hahn 424d10cb63 Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1' ... Conflicts: openslides/__init__.py openslides/projector/views.py		2012-10-31 15:27:47 +01:00
..
base_projector.html	added select widgets view	2012-08-15 13:42:25 +02:00
control_countdown.html	use s for sec in projector-control	2012-07-04 15:47:52 +02:00
control_overlay_message.html	send overlay message data to own view	2012-08-15 18:00:22 +02:00
custom_slide_widget.html	rewrote widgets for the dashboard	2012-08-15 11:56:43 +02:00
dashboard.html	Fixed drag'n'drop of widgets into empty dashboard column. Renamed	2012-08-22 09:39:20 +02:00
default.html	Ticket #229	2012-07-04 03:19:42 +02:00
live_view_widget.html	rewrote widgets for the dashboard	2012-08-15 11:56:43 +02:00
new.html	rename projector to dashboard	2012-08-15 10:58:29 +02:00
overlay_widget.html	rewrote widgets for the dashboard	2012-08-15 11:56:43 +02:00
ProjectorSlide.html	Clean up browsertitles (#282) in config projector	2012-07-13 00:47:53 +02:00
select_widgets.html	added select widgets view	2012-08-15 13:42:25 +02:00
static_info_widget.html	Insert widget with static welcome text (see frontpage and config tab), ticket #387	2012-10-25 21:47:59 +02:00
welcome_widget.html	for pull request #23: Removed "You have access to apps" code from welcome widget.	2012-10-30 20:18:16 +01:00