Emanuel Schuetze
8cdc062628
Set version number back to dev mercurial revision
2012-05-25 09:34:50 +02:00
Emanuel Schuetze
f7eab29ed5
Fixed missing translation in poll_view assignment template (table head).
2012-05-23 14:31:12 +02:00
Emanuel Schuetze
0ab900cb7a
Fixed missing permission of agenda submenu.
2012-05-23 14:30:42 +02:00
Emanuel Schuetze
279dade5c4
Fixed missing SITE_ROOT import.
2012-05-23 14:30:06 +02:00
Emanuel Schuetze
44c4fffc25
Added missing default TIME_ZONE in default.settings.py.
2012-05-23 14:29:11 +02:00
Emanuel Schuetze
0acf6734e9
Updated translations.
2012-05-21 22:02:55 +02:00
Emanuel Schuetze
7933dd2d5c
Minor fixes.
2012-05-21 22:01:09 +02:00
Emanuel Schuetze
58fc689f14
Updated overlay message style in projector template.
2012-05-21 09:21:36 +02:00
Emanuel Schuetze
a737ef7300
Prepared 1.2-beta2 release.
2012-05-21 08:16:40 +02:00
Andy Kittner
0007a1dfa8
Add log messages when poll is updated/deleted ( #187 )
2012-05-20 23:12:50 +02:00
Emanuel Schuetze
37619b0a80
#114 : Set participants tab inactive if usersettings page is active
2012-05-20 22:34:41 +02:00
Emanuel Schuetze
f8137da055
#203 : Fixed highlighting more than one active line.
2012-05-20 22:20:17 +02:00
Emanuel Schuetze
5eb29ba9dd
Fixed width of countdown input field.
2012-05-20 22:06:07 +02:00
Emanuel Schuetze
5581ed1222
#168 : Improved countdown control buttons.
2012-05-20 22:01:44 +02:00
Emanuel Schuetze
92a64d38cf
Add projector view link on front page. Fixed column for can_manage_projector permission.
2012-05-20 20:51:11 +02:00
Emanuel Schuetze
4389f5f548
#89 : Added missing control_customslide.html template.
2012-05-20 20:15:49 +02:00
Emanuel Schuetze
c4450bf14e
Updated translations.
2012-05-20 20:02:48 +02:00
Emanuel Schuetze
97bea50b03
Use single url for toggle publish/unpublish election ballots.
2012-05-20 20:02:36 +02:00
Emanuel Schuetze
9b6640c2ae
Removed unused link var.
2012-05-20 19:44:29 +02:00
Emanuel Schuetze
406a2d18e3
Fixed can_manage_projector permission.
2012-05-20 19:43:38 +02:00
Emanuel Schuetze
189c975137
Use same url to toggle participant status.
2012-05-19 19:22:20 +02:00
Emanuel Schuetze
3a52cd56c6
#165 : Use AJAX instead of page reload to publish assignment polls
2012-05-19 16:25:55 +02:00
Andy Kittner
fbc603b748
Fix initial value for pollform is value is a "special" value ( #135 )
2012-05-19 14:19:32 +02:00
Andy Kittner
182f20308b
Fix exception in polls with special values (fallout from translation fix)
2012-05-19 13:41:30 +02:00
Andy Kittner
e005863336
Changed/ added logmessages for applications ( #184 , #187 )
...
- Added a logmessage when a version is accepted/ rejected
- Made logmessage for trivial changes more explicit and include
the names of the changed fields
- Updated translations
2012-05-19 12:46:54 +02:00
Andy Kittner
5aead54a0c
Improve error message for failed logins ( #199 )
...
While #199 was already closed I think passing on the original
error message is more userfriendly as it gives more details
what the actual error was (generates specific messages for
user inactive and disabled cookies)
2012-05-19 10:48:29 +02:00
Andy Kittner
d3cf5c9311
Correctly handle first time passwords ( #194 )
...
- Save User object after setting the password
- Only generate first time password if none was explicitly specified
2012-05-19 10:33:59 +02:00
Emanuel Schuetze
3f4119f182
#199 : Changed login error message. Updated translation.
2012-05-19 08:44:46 +02:00
Emanuel Schuetze
23fb97c7a2
#170 : Use second submenu for agenda items.
2012-05-19 08:26:59 +02:00
Emanuel Schuetze
188fe4cce5
Fixed missing check for activeline in assignment overview.
2012-05-19 08:15:20 +02:00
Emanuel Schuetze
07c587a025
#186 : Fixed published polls/ballot column on projector template.
2012-05-19 08:09:18 +02:00
Emanuel Schuetze
2dc156ef74
Automated merge with ssh://openslides.org/openslides
2012-05-18 23:25:51 +02:00
Emanuel Schuetze
f2a93c4505
#89 : Delete custom slides.
2012-05-18 23:24:54 +02:00
Emanuel Schuetze
90787b2597
#89 : Edit custom slides.
2012-05-18 23:07:09 +02:00
Andy Kittner
3f722d3b27
Add --insecure to runserver args in order to always server static files
...
See: https://docs.djangoproject.com/en/1.4/ref/contrib/staticfiles/
2012-05-18 22:34:59 +02:00
Emanuel Schuetze
ebe5381439
Automated merge with ssh://openslides.org/openslides
2012-05-18 19:38:26 +02:00
Emanuel Schuetze
b81469703b
#198 : Optimized submenu of application and assignment.
2012-05-18 19:38:21 +02:00
Emanuel Schuetze
c99deb8a2a
Increase max_length of agenda title field.
2012-05-18 10:24:43 +02:00
Emanuel Schuetze
8ec3099620
#197 : Rename the default User Group "Delegierte" to "Delegierter"
2012-05-17 22:03:48 +02:00
Emanuel Schuetze
4cef2762fe
Fixed style in empty agenda overview table.
2012-05-17 21:38:37 +02:00
Emanuel Schuetze
0351627234
Fixed title in assignment projector template.
2012-05-17 21:36:18 +02:00
Emanuel Schuetze
ca2900e9d1
#195 : Fixed unicode string in pdf header.
2012-05-17 21:34:19 +02:00
Emanuel Schuetze
92562aef28
#188 : Fixed projector template style error.
2012-05-15 20:36:49 +02:00
Andy Kittner
298cefcb45
Fix error when creating new applications (introduced by translation fix)
2012-05-15 20:10:54 +02:00
Emanuel Schuetze
61fe84a780
Removed LANGUAGE_CODE and TIME_ZONE from default.settings.py. LANGUAGE_CODE no longer required after fix of rev615.
2012-05-15 19:51:40 +02:00
Andy Kittner
3815ef26af
Fix wrong translations in forms/ models
...
Converted utils.translation_ex.ugettext to use ugettext_lazy and changed
forms modules to import ugettext from there (models where already importing
it from there)
2012-05-15 01:08:08 +02:00
Emanuel Schuetze
c19025ceb3
#190 : Fixed typo in translation.
2012-05-14 23:10:17 +02:00
Emanuel Schuetze
3324ce6131
Removed help text of active form field by overriding.
2012-05-14 23:07:24 +02:00
Emanuel Schuetze
1d6a0bee4e
#174 : Change form field 'groups' to 'user groups'.
2012-05-14 23:04:00 +02:00
Emanuel Schuetze
31ae7c38c9
#192 : i18n-de: Beamer -> Projektor
2012-05-14 22:16:13 +02:00
Emanuel Schuetze
304013649b
Changed default event description. Updated tranlsations.
2012-05-14 22:08:40 +02:00
Emanuel Schuetze
bc9765230c
#185 : Wrong permission to print assignments.
2012-05-14 22:02:45 +02:00
Emanuel Schuetze
bb5fcf4d6d
#183 : Wrong permission to print application.
2012-05-14 22:00:22 +02:00
Emanuel Schuetze
114b719cad
Added comment column in agenda overview.
2012-05-14 21:55:36 +02:00
Emanuel Schuetze
fbf2256493
#182 : Wrong permission for edit button in view template.
2012-05-14 21:55:02 +02:00
Emanuel Schuetze
d8807ba979
#180 : Ballot description. Fixed ballot number function.
2012-05-14 21:34:46 +02:00
Emanuel Schuetze
911b7ebac8
Changed po file header.
2012-05-11 07:38:56 +02:00
Emanuel Schuetze
b65e21e08f
#100 : Fixed wrong permissions.
2012-04-30 08:50:35 +02:00
Emanuel Schuetze
eb7672074e
Some more style work for application projector template.
2012-04-30 08:30:04 +02:00
Emanuel Schuetze
e28c15eff9
Improve projector style of application voting results.
2012-04-30 08:23:50 +02:00
Emanuel Schuetze
3faa91f5a4
Updated translation.
2012-04-30 08:23:06 +02:00
Emanuel Schuetze
1089e61011
Modified support help text.
2012-04-29 21:58:16 +02:00
Emanuel Schuetze
8bdd57cada
Prepare 1.2-beta1 release.
2012-04-29 21:43:21 +02:00
Emanuel Schuetze
616a34e8a9
Changed style: td:hover to tr:hover.
2012-04-29 21:32:29 +02:00
Emanuel Schuetze
412e672ea1
Set default language for model/form translation strings. Have to changed for English installation!
...
(Template strings are translated automatically by selected browser language)
2012-04-29 21:17:15 +02:00
Emanuel Schuetze
8c8a3e9fc2
Updated translations.
2012-04-29 20:48:10 +02:00
Emanuel Schuetze
3a0d243a6c
Added agenda 'edit' button in view template.
2012-04-29 20:47:54 +02:00
Emanuel Schuetze
2186561b6e
Removed LANGUAGE_CODE ('de') because django uses language selected by browser. Default language is 'en'.
2012-04-29 19:33:57 +02:00
Emanuel Schuetze
79605531c5
Some minor style fixes for poll view templates.
2012-04-29 19:12:18 +02:00
Emanuel Schuetze
905d9d546c
Fixe pdf icon path.
2012-04-29 19:01:18 +02:00
Emanuel Schuetze
e1799b4c83
#155 : remove header/footer in first-password-pdf
2012-04-29 18:58:51 +02:00
Emanuel Schuetze
4e8e9b5407
#155 : Remove header/footer in frameless PDF.
2012-04-29 18:54:42 +02:00
Emanuel Schuetze
dd10a59533
#109 : New second submneu for election view.
2012-04-28 23:10:19 +02:00
Emanuel Schuetze
7eaf9899f6
Minor code comment changes.
2012-04-28 22:32:33 +02:00
Emanuel Schuetze
64eed5ff22
#90 : Projector control: Save portlet state in session.
2012-04-28 22:31:30 +02:00
René Köcher
842e8de065
#160 : Wrong scaling of projector live view in IE8/Konqueror
...
IE8 has a scaling bug - check the browser version and resize the iframe 4x bigger if needed..
2012-04-28 09:38:31 +02:00
René Köcher
4f98c0c571
#163 : Sorting by title or creation time returns one entry for each version of an application
2012-04-28 08:45:11 +02:00
Andy Kittner
7b8f882f0d
Fallback to localhost if IP of current hostname can't be determined
2012-04-27 22:54:20 +02:00
Emanuel Schuetze
2c2a99d738
Automated merge with ssh://openslides.org/openslides
2012-04-27 22:47:47 +02:00
Emanuel Schuetze
1a4a748e6c
#112 : Use monotype for printing first time password
2012-04-27 22:47:41 +02:00
René Köcher
537571ec69
#100 Delete applications by admin/superuser only: part2
2012-04-27 22:46:27 +02:00
Emanuel Schuetze
59c342ba8d
#158 : Move 'change tree' notification to correct position (above page title).
2012-04-27 21:53:50 +02:00
Emanuel Schuetze
20ce7579ce
#158 : Added from_invalid error notification for ItemCreate/Update.
2012-04-27 21:40:42 +02:00
Emanuel Schuetze
822264ef7b
#158 : Added success notification for ItemCreate/ItemUpdate View.
2012-04-27 21:36:12 +02:00
René Köcher
81bc19730b
#100 Delete applications by admin/superuser only: part1
2012-04-27 21:22:44 +02:00
Emanuel Schuetze
710882c28a
#96 Countdown: Improve control icons
2012-04-27 17:42:05 +02:00
Emanuel Schuetze
8ed8ca0c58
Automated merge with ssh://openslides.org/openslides
2012-04-27 08:04:53 +02:00
Emanuel Schuetze
f97529518e
Updated translations.
2012-04-27 08:04:16 +02:00
Emanuel Schuetze
804c3da59a
Updated tranlation string.
2012-04-27 08:02:01 +02:00
René Köcher
030ff09ec0
#97 : (Aftermath)
...
Quick cross-browser fix: remove the spin-buttons and use input type=number.
If your browser is HTML5 it should show a spin box, otherwise the fallback
(type=text) will work equally well.
2012-04-27 07:59:23 +02:00
René Köcher
7f54331d0c
Merge r559..
2012-04-27 07:52:53 +02:00
René Köcher
c3c7228ab9
#159 Countdown reset should change 'pause' back to 'play'.
2012-04-27 07:51:42 +02:00
René Köcher
c0b78f52ea
Backout changeset 3dafb78cc57f4ce55b8e4517eb48fd9e9e744e2d
2012-04-27 07:50:20 +02:00
René Köcher
f45eb68fb4
#159 Countdown reset should change 'pause' back to 'play'.
2012-04-27 07:46:47 +02:00
Andy Kittner
8da2f0f041
Fix start script broken by r550
...
Defer importing modules that require the DJANGO_SETTINGS_MODULE
to be available until prepare_openslides() had a chance to set
everything up.
2012-04-27 01:09:12 +02:00
Emanuel Schuetze
3bcf4fd9c3
Added missing 'required' helptext to all forms.
2012-04-26 17:50:46 +02:00
René Köcher
7b7f43b04a
#97 : Countdown: move countdown config input field from config tab to portlet
2012-04-26 12:43:35 +02:00
Emanuel Schuetze
aac48a0b02
Redesign overlays.
2012-04-26 08:52:20 +02:00
Emanuel Schuetze
8a4163b019
Fixed scroll bug in base.css.
2012-04-25 23:07:54 +02:00
Emanuel Schuetze
b0d64c2bcc
Updated jquery ui style.
2012-04-25 22:59:49 +02:00
Emanuel Schuetze
9b6b969f8a
Added missing license header (for js and css).
2012-04-25 22:48:27 +02:00
Emanuel Schuetze
7ef298881d
Updated license header.
2012-04-25 22:29:19 +02:00
Andy Kittner
dda3078fe0
Detect if the database was deleted and run syncdb if necessary ( fixes #156 )
2012-04-25 19:37:51 +02:00
René Köcher
053021a08f
#XX Countdown: Only show valid controls for the active countdown
...
When clicking on 'play' the button will morph into 'stop' and vice-versa.
This is persistent across clients e.g. when A starts the countdown and
then B opens the control page B will see a pause button.
(Updates for all but the local client happen only on page reload)
2012-04-25 18:45:02 +02:00
René Köcher
07b5614fac
#94 Countdown: support for pause/resume / #95 Countdown: show correct time format as mm:ss
2012-04-25 17:17:24 +02:00
Emanuel Schuetze
3cb7417028
Minor CSS fixes.
2012-04-25 09:18:10 +02:00
Emanuel Schuetze
719ea6ec79
#93 : Show application number in header of projector template.
...
Some more projetor style work.
2012-04-24 22:27:16 +02:00
Emanuel Schuetze
20f17d6235
Fixed untranslateable model string.
2012-04-23 22:17:45 +02:00
Emanuel Schuetze
dc863cc3b9
Added custom slides portlet.
2012-04-23 22:07:52 +02:00
Emanuel Schuetze
3d0fe9b565
Updated translations.
2012-04-23 22:07:34 +02:00
Emanuel Schuetze
cfcd2d10d7
Fixed wrong icon filename.
2012-04-23 21:48:20 +02:00
Emanuel Schuetze
d56dcba7d4
#119 : Adjusted icon filenames.
2012-04-23 21:27:22 +02:00
Emanuel Schuetze
81a0c9661e
#119 : Adjusted some icon filenames.
2012-04-23 08:07:21 +02:00
Emanuel Schuetze
61b9d476ab
Set default config values.
2012-04-22 16:55:16 +02:00
Emanuel Schuetze
1b8c1eda91
Updated translations.
2012-04-22 16:51:22 +02:00
Emanuel Schuetze
039bd4121c
Some assignment poll template fixes.
2012-04-21 22:27:11 +02:00
Emanuel Schuetze
99bfd7257b
#120 : Add CSS class for helptext in forms.
2012-04-21 22:23:46 +02:00
Emanuel Schuetze
61d4d1ca2f
#136 : Fixed missing polls in projector view
2012-04-21 21:38:59 +02:00
Emanuel Schuetze
5f3c6c4821
#111 : Move pdf creation code from utils to participant app.
2012-04-20 23:23:50 +02:00
Emanuel Schuetze
f1908bca89
Fixed permissions for action columns.
2012-04-20 22:58:57 +02:00
Emanuel Schuetze
f711f96265
#107 : New actions column for elections.
2012-04-20 22:58:34 +02:00
Emanuel Schuetze
667582cdfb
#106 : add pdf link to actions column
2012-04-20 22:47:44 +02:00
Emanuel Schuetze
3886449b2c
#106 : Action column for applications.
...
#121 (partly): Activate links for agenda and applications table.
2012-04-20 22:43:12 +02:00
Emanuel Schuetze
6125f1d88b
Minor javascript fix.
2012-04-20 22:41:57 +02:00
Emanuel Schuetze
ccc1d2b707
#104 : Updated second submneu for application.
2012-04-20 22:13:47 +02:00
Emanuel Schuetze
7a6eaf2660
Fixed building AssignmentPollPDF.
2012-04-20 14:33:40 +02:00
Emanuel Schuetze
f393789f2d
Show min. 1 application ballot.
2012-04-20 13:41:09 +02:00
Emanuel Schuetze
4ecff16aba
copyright 2011 -> 2012.
2012-04-20 12:44:45 +02:00
Emanuel Schuetze
42a2e44390
Updated translations.
2012-04-20 11:15:15 +02:00
Emanuel Schuetze
ae5efcfa9d
Some minor fixes for agenda, application, participant overview table.
2012-04-20 08:14:23 +02:00
Oskar Hahn
4e904c7356
now it is possible to create a item, witch is realted to another object, for example an application.
2012-04-19 12:46:04 +02:00
Oskar Hahn
e23c195388
show application title in presentation view
2012-04-19 11:10:36 +02:00
Oskar Hahn
74c704641c
fixed yes, no, abstain values in the presentation View of an Application
2012-04-19 11:08:22 +02:00
Oskar Hahn
1d285a1c15
remove print
2012-04-18 23:36:52 +02:00
Emanuel Schuetze
9849140d2e
Remove submenu from static slides.
2012-04-18 22:06:41 +02:00
Emanuel Schuetze
6be853f202
Removed default font from jquery-ui css.
2012-04-18 22:06:18 +02:00
Emanuel Schuetze
236bbfd3bc
Automated merge with ssh://openslides.org/openslides
2012-04-18 22:01:06 +02:00
Emanuel Schuetze
4adb221a9d
#92 : Projector control: Add projector preview icon for all entries.
2012-04-18 22:00:58 +02:00
Oskar Hahn
59225bf822
added default get_filename for PDFView
2012-04-18 20:57:44 +02:00
Oskar Hahn
07e9d8e9f9
rewrote application filters
2012-04-18 19:57:39 +02:00
Emanuel Schuetze
a35e1917a4
Removed unused icons.
2012-04-18 19:52:37 +02:00
Emanuel Schuetze
7eb410f093
#104 : Application submenu.
2012-04-18 19:50:51 +02:00
Emanuel Schuetze
ee4d7da04a
#105 : Show Ballot number for applications. Some application PDF work. Set default config values.
2012-04-18 19:30:32 +02:00
Oskar Hahn
9f70b2ff1c
rename ballout def in application and assignment
2012-04-18 19:02:41 +02:00
Oskar Hahn
a77038fbf4
removed some old countdown code, defined some default values
2012-04-18 18:55:33 +02:00
Emanuel Schuetze
4b2211d59f
Automated merge with ssh://openslides.org/openslides
2012-04-18 18:54:52 +02:00
Emanuel Schuetze
3812b5ebd1
#103 : Set application filename.
2012-04-18 18:54:48 +02:00
Oskar Hahn
23df763b1f
fix message issus: #134 , also defined some default config-values
2012-04-18 18:35:02 +02:00
Emanuel Schuetze
67db762575
Automated merge with ssh://openslides.org/openslides
2012-04-18 18:29:34 +02:00
Emanuel Schuetze
4ce8facd1a
#98 : Add new filter for active/inactive items.
2012-04-18 18:29:31 +02:00