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 |
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
|
0c5459f96e
|
template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
|
2013-02-05 20:40:55 +01:00 |
Emanuel Schuetze
|
8f05ada6a1
|
template style and new icons
|
2013-02-05 17:05:40 +01:00 |
Emanuel Schuetze
|
80b0ab5252
|
template: Updated dashboard. Fixed ajax functionality. Adapted style.
|
2013-02-05 11:24:41 +01:00 |
Emanuel Schuetze
|
6db0210ef3
|
Updated jquery form plugin to v3.26.0-2013.01.28
|
2013-02-05 11:22:01 +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
|
0f7d0e349c
|
Fixed URLs in projector views
|
2013-02-02 00:26:08 +01:00 |
Emanuel Schuetze
|
82ad5e2de0
|
Major changes for new twitter bootstrap template (e.g. replaced icons)
|
2013-01-31 10:19:56 +01:00 |
Emanuel Schuetze
|
da4ed365bc
|
Updated js and css libraries (twitter bootstrap to 2.2.2 and jquery to 1.9.0).
|
2013-01-18 22:10:00 +01:00 |
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 |
Oskar Hahn
|
3229d86d4d
|
Import urls.py needed django functions from django.conf.urls
|
2013-01-05 01:05:38 +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 |
Oskar Hahn
|
804f842650
|
Updated the url template tag
|
2012-12-14 15:10:14 +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 |