Emanuel Schuetze
473c2c347f
Removed unused base_agenda.html template.
2012-09-10 23:37:59 +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
Emanuel Schuetze
b705df8c5f
Changed redirect to dashboard after changing password.
2012-09-10 21:02:58 +02:00
Emanuel Schuetze
e50abbbf03
Restructured base.css.
2012-09-10 18:03:33 +02:00
Emanuel Schuetze
ce233fc870
Updated config template.
2012-09-10 17:40:41 +02:00
Emanuel Schuetze
74ffad6ced
Minor changes for template style.
2012-09-10 17:17:22 +02:00
Emanuel Schuetze
65840d4261
Minor changes in assigment view template.
2012-09-10 17:15:43 +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
ae51d9e7da
Adjusted template for assignment app.
2012-09-06 23:58:20 +02:00
Emanuel Schuetze
7c90206b3f
Adjusted new template for participant app. Added new generic form.
2012-09-06 22:41:24 +02:00
Oskar Hahn
75eb596547
block a user to be a candidate from a assignment, if he delete his
...
candidation by him self
2012-09-06 15:57:42 +02:00
Norman Jäckel
d1c12ea0e5
Sorting applications in the widget by number
2012-09-05 22:42:44 +02:00
Norman Jäckel
2ecd552d2b
Default Sorting of applications by number
2012-09-05 22:38:40 +02:00
Norman Jäckel
d84a8d2bdd
Sorting assignments by name in the widget
2012-09-05 22:19:53 +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
8da28310f7
Hide optional columns on mobile devices (with small window width).
2012-09-05 07:54:01 +02:00
Emanuel Schuetze
13cfdb36af
Updated login form to new template style.
2012-09-05 00:43:19 +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
34a690c713
Merge pull request #10 from andkit/master
...
Update portable version to set a suitable default location for settings file
2012-08-28 10:43:52 -07:00
Andy Kittner
1b65044223
Remove a few spaces for pep8 conformance
2012-08-28 19:07:40 +02:00
Andy Kittner
ce87353cd4
Update instructions for building the portable
2012-08-27 21:54:12 +02:00
Andy Kittner
7f6f7a9340
Rebuild openslides.exe
2012-08-27 21:49:05 +02:00
Andy Kittner
cc20ec3456
Add special handling to determine default settings for portable version
...
The portable version will prefer to create it's settings in it's own
directory and only fallback to a user-specific path
($LOCAL_APPDATA/openslides) if this directory is not writable
2012-08-27 21:48:46 +02:00
Andy Kittner
14ba868df4
Treat openslides the same way as other packages
...
OpenSlides will now be copied from (and to) site-packages in the same
way as it's dependencies
2012-08-27 20:24:41 +02:00
Oskar Hahn
7321de2400
Merge pull request #8 from normanjaeckel/master
...
Fix encoding error #349
2012-08-24 09:19:55 -07:00
Norman Jäckel
6d1c356ffd
Name openslides_personal_settings.py and openslides_global_settings.oy
2012-08-24 14:23:12 +02:00
Norman Jäckel
32cfa6c914
Fix encoding error in settings.py #349
2012-08-23 23:34:30 +02:00
Oskar Hahn
72f82454ec
Merge pull request #7 from emanuelschuetze/master
...
Dashboard drag'n'drop fix.
2012-08-22 01:59:47 -07: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
705fb972b1
removed projector link from agenda
2012-08-15 13:44:15 +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
dfb24ba61a
Merge branch 'master' into dashboard
2012-08-15 11:05:29 +02:00
Oskar Hahn
9c031768f8
fix merge errors
2012-08-15 11:01:38 +02:00
Oskar Hahn
c6bc50e2fd
rename projector to dashboard
2012-08-15 10:58:29 +02:00
Oskar Hahn
b7a0e83c68
changed the main script
2012-08-14 14:19:59 +02:00
Oskar Hahn
a2be848932
Merge branch 'master' into install
2012-08-13 19:35:14 +02:00
Oskar Hahn
bd64a6cb5c
Merge branch 'stable/1.2.x'
...
Conflicts:
openslides/application/models.py
openslides/application/views.py
openslides/participant/forms.py
openslides/participant/views.py
2012-08-13 19:16:42 +02:00
Oskar Hahn
d0e7419666
Merge remote-tracking branch 'openslides/stable/1.2.x'
2012-08-13 18:36:23 +02:00
Oskar Hahn
5178363127
Merge pull request #6 from ostcar/translation
...
Translation
2012-08-13 09:30:17 -07:00
Oskar Hahn
3995765dc5
Merge pull request #5 from ostcar/participant
...
Participant
2012-08-13 09:23:55 -07:00
Oskar Hahn
31ca01563e
some corrective actions
2012-08-13 14:37:49 +02:00
Oskar Hahn
df40de67b0
rename openslidesuser to user and openslidesgroup to group
2012-08-12 12:52:38 +02:00
Oskar Hahn
0a8ee9cbad
changed request.user to be the openslidesuser
2012-08-12 10:12:26 +02:00
Oskar Hahn
6795ccd25b
change the users in the groupform
2012-08-11 11:36:55 +02:00
Oskar Hahn
cdf160dfc3
fix some problems with the creation of new users
2012-08-11 11:09:20 +02:00
Oskar Hahn
f01fe5a894
removed unused imports from participant and did some pep8 changes
2012-08-11 10:51:52 +02:00
Oskar Hahn
bc3e7fdaab
rewrote the group views as class based views
2012-08-11 10:09:54 +02:00
