ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,406 Commits 6 Branches 42 Tags 64 MiB
a4592ec849
Commit Graph

159 Commits

Author SHA1 Message Date
Emanuel Schuetze
a4592ec849 Reworked projector activate buttons in agenda widget. 2013-01-18 21:44:47 +01:00
Emanuel Schuetze
13cd52bd96 Merged (conflicts). 2013-01-05 15:29:57 +01:00
Emanuel Schuetze
d671740966 Fixed merged errors. 2013-01-02 23:22:12 +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
Norman Jäckel
046db10d3a Hide group registered in the group widget. 
Make custom slides text scrollable.

Fix template of personal_info_widget.
 2012-12-01 19:32:58 +01:00
Oskar Hahn
abd21dd345 Added more tests for the agenda 2012-11-26 10:05:51 +01:00
Oskar Hahn
bd32994296 cleanup 
Removed unused imports and fixed pep8 errors
 2012-11-24 14:01:21 +01:00
Emanuel Schuetze
8aec947303 Removed unused widget file (duplicate of welcome_widget.html). 2012-11-21 23:05:38 +01:00
Emanuel Schuetze
f3c865ee3c #176: Adjusted user slide. Show only relevant information in a nice and clear layout. 2012-11-21 21:05:56 +01:00
Emanuel Schuetze
27fa32b718 Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard) 2012-11-17 22:14:49 +01:00
Emanuel Schuetze
71eb529adf Fixed #403: Moved projector control icons into projector live widget (Added RequestContext to check perms in template.) 2012-11-17 20:59:30 +01:00
Emanuel Schuetze
81570b61e6 Rename submenu titel 'projector' to 'dashboard'. 2012-11-08 20:11:06 +01:00
Emanuel Schuetze
216ac95cfb Redirect to dashboard after submit widget selection form. 2012-11-08 20:08:09 +01:00
Andy Kittner
32a76e2aad Fix UnicodeError on widgets page 2012-11-07 21:12:52 +01:00
Oskar Hahn
2d9b0a8848 delete the projector cache after 1 second. 2012-11-07 10:05:38 +01:00
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
Emanuel Schuetze
8ffeadfe88 Cleared projector cache if countdown enabled or overlay message changed. 2012-10-30 23:45:06 +01:00
Emanuel Schuetze
d9fbfeff84 for pull request #23: Removed "You have access to apps" code from welcome widget. 2012-10-30 20:18:16 +01:00
Emanuel Schuetze
0c797aa476 Merge remote branch 'upstream/master' 2012-10-30 20:03:17 +01:00
Oskar Hahn
9dc799ef5e fixed projector_cache. 
It still does not work, but it does show changes on slides now
 2012-10-29 23:26:10 +01:00
Norman Jäckel
1849e14dbf Insert widget with static welcome text (see frontpage and config tab), ticket #387 2012-10-25 21:47:59 +02:00
Oskar Hahn
c4e6466926 Added cache for the ajax-version of the projector 2012-10-25 15:17:25 +02:00
Emanuel Schuetze
fa9874038e New welcome widget. 2012-09-20 20:45:37 +02:00
Oskar Hahn
5b97250df2 Small fix with the overlay message 2012-09-20 09:55:27 +02:00
Oskar Hahn
eb267acf08 removed scrollbar in projector-template 2012-09-15 09:13:36 +02:00
Emanuel Schuetze
7376b7a692 Updated translations. 2012-09-11 20:50:53 +02:00
Emanuel Schuetze
51ab5e3850 Minor style for widgets. 2012-09-11 00:05:20 +02:00
Emanuel Schuetze
2bf992117c Updated widget titel and icons. 2012-09-11 00:00:44 +02:00
Emanuel Schuetze
a77bb31a2a Clean template code. 2012-09-10 23:38:20 +02:00
Emanuel Schuetze
889bd66e04 Adjusted dashboard templates for twitter bootstrap. 
Reduced jquery-ui stuff to really neccessary files.
 2012-09-10 23:28:19 +02:00
Norman Jäckel
55073494fc Insert weight field in custom slides and order custom slides in the widget 2012-09-05 21:54:34 +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
777d2266bc Fixed drag'n'drop of widgets into empty dashboard column. Renamed 
projector-control{js|css} files into dashboard{js|css}.
 2012-08-22 09:39:20 +02:00
Oskar Hahn
423f04d0be send overlay message data to own view 2012-08-15 18:00:22 +02:00
Oskar Hahn
416f3f6ff3 added select widgets view 2012-08-15 13:42:25 +02:00
Oskar Hahn
6b7ea558fc rewrote widgets for the dashboard 2012-08-15 11:56:43 +02:00
Oskar Hahn
c6bc50e2fd rename projector to dashboard 2012-08-15 10:58:29 +02:00
Emanuel Schuetze
f36ad67bb9 Removed additional <hr> tag from custom slides widget. 2012-07-23 19:21:47 +02:00
Oskar Hahn
0b033271f8 fix some typos, mostly {%trans to {% trans 2012-07-16 14:00:29 +02:00
Emanuel Schuetze
e4250b6ba1 Some style fixes. 2012-07-13 16:04:00 +02:00
Norman Jäckel
28d6fb54a7 Clean up browsertitles (#282) in config projector 2012-07-13 00:47:53 +02:00
Emanuel Schuetze
accb329a44 #232: Removed spaces from links. 2012-07-12 17:24:37 +02:00
Oskar Hahn
aa130ab2da cleanup openslides base files. 
Do not manipulate the pythonpath anymore.
 2012-07-10 14:00:51 +02:00
Norman Jäckel
25df1b8693 Deactivate the projector message overlay by default 2012-07-10 01:44:42 +02:00
Oskar Hahn
8d961f4940 fix translation by using ugettext_lazy 2012-07-10 01:33:03 +02:00
Oskar Hahn
15621b7702 clean up the projector App 2012-07-07 14:01:40 +02:00
Oskar Hahn
4eb4d2ee8d use s for sec in projector-control 2012-07-04 15:47:52 +02:00
Oskar Hahn
67426f239b only refresh the projector, if the content has changed 2012-07-04 15:00:08 +02:00
Norman Jäckel
d654c268f7 Zusammenführen 2012-07-04 03:26:27 +02:00
Oskar Hahn
03fe1f84dd clear overlay-message via ajax 2012-07-04 03:21:03 +02:00