5fcef8aba4
cleanup utils
2012-07-10 13:19:12 +02:00
debaa505fb
fix problems with reportlab and ugettext_lazy
2012-07-10 12:11:07 +02:00
e22467b06e
cleanup poll app
2012-07-10 11:48:03 +02:00
01f0823ed7
cleanup the assignment app
2012-07-10 11:27:06 +02:00
81fc7ae560
update translation
2012-07-10 02:53:49 +02:00
85bddf6872
use "forname lastname" as default username, with a space
2012-07-10 02:50:42 +02:00
96aca54f61
update user setting page
2012-07-10 02:46:00 +02:00
403f8e7917
update translation
2012-07-10 02:21:27 +02:00
25df1b8693
Deactivate the projector message overlay by default
2012-07-10 01:44:42 +02:00
8d961f4940
fix translation by using ugettext_lazy
2012-07-10 01:33:03 +02:00
333349a1f2
Only show voteresult-table where there is at least one published poll.
...
Also fix AssignmentPDF-Poll-Table
2012-07-10 00:47:00 +02:00
cd245e4605
Convert MEDIA_ROOT to unicode to avoid UnicodeWarning
2012-07-08 18:09:25 +02:00
5438b2c318
Add a workaround for django bug 18404 ( fixes #204 )
2012-07-08 18:09:23 +02:00
f074cb5bfd
cleanup the imports of the application app
2012-07-08 09:21:39 +02:00
8feb195067
fix typo
2012-07-08 09:01:01 +02:00
dc9dabff6d
cleaned up the participant app. Sort of...
2012-07-07 15:26:00 +02:00
e01d456e7b
clean up the config app. Use jsonfield to save the config values.
...
Syncdb necessary.
2012-07-07 14:48:21 +02:00
15621b7702
clean up the projector App
2012-07-07 14:01:40 +02:00
eb3adcd8ca
update translation
2012-07-07 11:20:30 +02:00
f8a1c58fff
#277 throw an error, in the invalid-field or the votecast-field is lower -2
2012-07-07 11:14:04 +02:00
1889cff68b
#276 fix unicode Error in html_string() function
2012-07-07 10:35:29 +02:00
b0f561d429
realy fix lineend in assignment/view
2012-07-06 18:00:43 +02:00
719d12e333
fix lineend in assignment/view.py
2012-07-06 17:56:17 +02:00
e29cf868a5
Always hide Group in Assignment PDF vote_results-table
2012-07-06 15:37:22 +02:00
e4367051df
Hide "Reason" in Application PDF if there is none.
2012-07-06 15:30:14 +02:00
59e6218a80
First Draft for Assignment PDF with fixed vote_results table.
2012-07-06 15:02:31 +02:00
c1e9540699
Fix #280
2012-07-05 01:15:04 +02:00
812d7a3c83
Fix #275
2012-07-05 00:23:42 +02:00
ff44439351
#266 fix assignment view on the projector
2012-07-04 16:14:19 +02:00
ef5b9e3281
#253 don't show unpublished polls for nonmanager in assignment view
2012-07-04 16:05:31 +02:00
47ff052c22
fix close and unclose link via ajax
2012-07-04 15:49:33 +02:00
b8a77e5abe
rename passwort change page
2012-07-04 15:48:56 +02:00
4e0f8670f1
update translation
2012-07-04 15:48:40 +02:00
4eb4d2ee8d
use s for sec in projector-control
2012-07-04 15:47:52 +02:00
67426f239b
only refresh the projector, if the content has changed
2012-07-04 15:00:08 +02:00
7f2d10c9ca
fix hide-closed-item function for non-manager
2012-07-04 13:12:07 +02:00
76d2a33fc2
merge
2012-07-04 12:52:09 +02:00
29d25d30d6
cleanup the agenda app
2012-07-04 12:50:33 +02:00
a72832842b
#267 fixt typo.
...
syncdb is required
2012-07-04 11:00:58 +02:00
d654c268f7
Zusammenführen
2012-07-04 03:26:27 +02:00
03fe1f84dd
clear overlay-message via ajax
2012-07-04 03:21:03 +02:00
a149d5a6bc
Ticket #229
2012-07-04 03:19:42 +02:00
ad8d5585f1
merge
2012-07-04 02:43:46 +02:00
198eefbfdd
rewrote projector overlay widget
2012-07-04 02:43:26 +02:00
40c2bf481f
Fix #240
2012-07-04 02:10:06 +02:00
32a5b61da8
Insert type of an related item in the agenda widget as string behind the name
...
of the item
2012-07-04 00:55:37 +02:00
ad02cb05ae
Draft for vote result table on assignment view and projector. Publishing still not working.
2012-07-04 00:40:25 +02:00
2dc0cc83f1
rewrote assignment poll output
2012-07-03 00:05:48 +02:00
a21a96026b
fix yes-no-abstain-poll in assigmnet-projector
2012-07-02 20:32:13 +02:00
ebc81d9236
#255 fixed assignment-poll delete message
2012-07-01 17:38:34 +02:00
8d4df3236b
#243 fixt but, which created a second version for a new application
2012-07-01 17:20:02 +02:00
e1d13e31ae
#214 seperate page for password change
2012-07-01 16:56:01 +02:00
68e26ff8c5
Fix #256
2012-07-01 16:48:44 +02:00
acd9ba1fd1
Zusammenführen
2012-07-01 16:30:56 +02:00
d22118ac72
Fix #252
2012-07-01 16:28:11 +02:00
f903f350b8
insert item-summary link in the widget
2012-07-01 16:13:34 +02:00
ff19e6d2c8
#247 summary of items for the projector
2012-07-01 16:10:26 +02:00
00eb365b91
rewrote active_slide in generic view
...
also reordert some imports
2012-07-01 15:35:05 +02:00
6c206fa740
#246 open activate slide view ajax
2012-07-01 11:07:04 +02:00
ea4da31b0c
rewrite projector_edit view as class based view
2012-07-01 10:52:08 +02:00
2ba1b7e3bc
rewrote countdown view as class based view
2012-07-01 10:44:41 +02:00
0a269ce601
help_text for the application config page
2012-06-30 16:28:15 +02:00
60570ea962
#245 update translation
2012-06-30 15:21:27 +02:00
0f42dd06fd
#234 take 75 chars at maximum
2012-06-30 14:50:52 +02:00
aeb8a40875
fix typo in trivial changes
2012-06-30 14:50:14 +02:00
c19118e774
Fix #230
2012-06-30 14:17:15 +02:00
35e112a7d7
update translation
2012-06-30 12:24:23 +02:00
fe7266097f
#249 improve assignment PDF
2012-06-30 12:07:55 +02:00
a48c63c132
#249 improve application pdf
2012-06-30 12:04:58 +02:00
1b108603ea
#239 don't show supporters in the application PDF, if they are disabled
2012-06-30 11:57:07 +02:00
039446a7ca
#239 don't show supporters in application edit form, if there are not needed
2012-06-30 11:50:46 +02:00
018d53b3df
#236 , #244 make trivial_changes optional, and only in the edit form
2012-06-30 11:31:35 +02:00
b9f783e9f1
#237 translate the related type
2012-06-30 11:06:32 +02:00
e8e664b92e
#237 , #238 only show the first line of a comment in the agenda
2012-06-30 10:39:58 +02:00
818a15aa2b
Cf. #249 but now for assignments.
2012-06-29 11:52:23 +02:00
aa30a1900b
Short message on PDF if there are no applications ( #249 )
2012-06-29 11:42:28 +02:00
cb2a4b9897
Application PDF: Fix #241 and insert version number
2012-06-29 11:22:47 +02:00
09e6eec6f2
fix translation error in professional support
2012-06-29 00:38:34 +02:00
587ce4093d
update translation
2012-06-29 00:27:27 +02:00
6d3061f8af
cleaned poll pdf for assignment and application
2012-06-29 00:19:06 +02:00
a00fe2b241
fix yesnoababstain in views.py
2012-06-28 22:49:02 +02:00
4af19d091b
remove elected users from an election.
2012-06-28 20:12:49 +02:00
2fdbad55f1
rename AssignmentPoll.yesnoababstain in .yesnoabstain
2012-06-28 20:11:16 +02:00
eafff30c49
fixe error in reverse calls
2012-06-28 20:10:48 +02:00
3156c8b4b5
Turn on Yes-No-Abstain Ballot for Assignments/Elections, #108
2012-06-28 18:45:00 +02:00
59fb053283
Fix #260
2012-06-28 01:14:51 +02:00
409bfda353
Fix #257
2012-06-27 23:29:06 +02:00
5311c7ae31
fix problem by the assignment-poll view
2012-06-24 23:31:06 +02:00
6c66e55fc0
show right label for posts in new assignments
2012-06-24 22:38:42 +02:00
4339c3ae8a
allow to save an empty poll
2012-06-24 22:34:11 +02:00
48c53d3cd0
link for creating an application agenda item in the sidebare
2012-06-24 22:21:46 +02:00
3c04f6af82
translate poll options for assignments
2012-06-24 22:21:15 +02:00
3e7e894d62
fix #250 don't allow assignments with not posts.
...
But for the future, see #251
2012-06-24 22:10:14 +02:00
e9c680f5e1
update translation
2012-06-24 21:55:46 +02:00
1a4e164dd2
refresh the projector only ones a second
2012-06-24 21:55:31 +02:00
6a0bdb7aa2
the submitter of an application must not edit the application, after it was accepted
2012-06-24 21:52:21 +02:00
391a10bb03
fix typo in frontpage_title
2012-06-23 15:42:25 +02:00
b963b61385
update german translation
2012-06-23 15:36:02 +02:00
7df1264abf
rearange the userprofile. Only show first line from the user.profile.comment in the overview
2012-06-23 15:02:13 +02:00
442a24ccd8
#222 fix to small db collumns for assignment.status and config.value
...
db-reset necessary
2012-06-23 13:17:50 +02:00
4edc4f503c
Edit Symbol in Application
2012-06-23 13:17:24 +02:00
654388117b
#208 and other symbol things
2012-06-23 13:14:18 +02:00
cc42792a38
#164 call a assignmentpoll by this ballot number
2012-06-23 12:43:18 +02:00
ae8876425a
min value for polls is -2
2012-06-23 12:05:09 +02:00
3d1e4f5489
#216 delete releated agenda-item, if the releated object (application or assignment) is deleted
2012-06-23 11:41:32 +02:00
d110934f62
Insert title tag to Clean Message Button ( #219 )
2012-06-23 11:39:07 +02:00
b1ed56176e
Edit and View Links and Symbols in Widgets fixed ( #206 )
2012-06-23 10:43:01 +02:00
b12ae6b0a0
#191 Create assignment-agenda Items
2012-06-23 10:27:58 +02:00
f13ee5f409
make application tests run again
2012-06-19 10:50:55 +02:00
a439794874
Insert Edit Symbol (Ticket 207)
2012-06-23 09:32:21 +02:00
b6cb4223f2
#217 show agenda text again.
2012-06-19 10:19:43 +02:00
e8bf2fce1a
yes-no-abstain elections in assignments
2012-06-18 09:48:27 +02:00
bf46342d17
#205 show Application number in projector Tab
2012-06-11 14:22:09 +02:00
239f328372
rewrote projector-widget system
2012-06-11 13:43:48 +02:00
960543b64e
load all models in projector.views
2012-06-10 10:43:50 +02:00
53dd1687ca
fixed last commit
2012-06-10 10:11:38 +02:00
cdef473491
fixe last commit
2012-06-10 10:08:04 +02:00
bb816e0999
load config on each request
2012-06-09 19:39:52 +02:00
2ce9815218
Prepared 1.2-beta3 release.
2012-06-06 16:40:05 +02:00
a2e1b77bd6
#213 fixed (User settings form - remove User groups and active
...
fields).
2012-06-06 14:28:37 +02:00
07a682c436
Set is_active for new participants to True.
2012-06-06 13:59:46 +02:00
a6c220ca02
Reverted wrong testing code (for participants) from last commit.
2012-06-06 13:51:54 +02:00
d8cd0c2b6a
Renamed logo files (typo).
2012-06-04 10:17:56 +02:00
43e30057b3
delete item, not application by releated agenda-items
2012-06-03 10:19:08 +02:00
2e498403cb
#167 fallback slide, if the slide does not exist
2012-06-03 09:43:28 +02:00
965b682abc
edit, delete, slide for releated item in agenda
2012-06-03 09:35:26 +02:00
79893687f3
fixed error by activating a message, if it was only on a specific slide.
2012-06-03 09:05:12 +02:00
7e7ab210ab
Set system url on first run ( #211 )
2012-05-31 00:27:47 +02:00
29057b8b87
Fix exceptions if project path contains non-utf8 characters ( #204 )
...
Django converts byte strings in various places to unicode by decoding them from
utf-8, which will break if the filesystem encoding uses something else
(e.g. fileystem encoding is latin1 and the path contains german umlauts).
Avoid these problems by explicitly decoding all paths to unicode using an
appropriate encoding.
2012-05-30 23:30:24 +02:00
8cdc062628
Set version number back to dev mercurial revision
2012-05-25 09:34:50 +02:00
f7eab29ed5
Fixed missing translation in poll_view assignment template (table head).
2012-05-23 14:31:12 +02:00
0ab900cb7a
Fixed missing permission of agenda submenu.
2012-05-23 14:30:42 +02:00
279dade5c4
Fixed missing SITE_ROOT import.
2012-05-23 14:30:06 +02:00
44c4fffc25
Added missing default TIME_ZONE in default.settings.py.
2012-05-23 14:29:11 +02:00
0acf6734e9
Updated translations.
2012-05-21 22:02:55 +02:00
7933dd2d5c
Minor fixes.
2012-05-21 22:01:09 +02:00
58fc689f14
Updated overlay message style in projector template.
2012-05-21 09:21:36 +02:00
a737ef7300
Prepared 1.2-beta2 release.
2012-05-21 08:16:40 +02:00
0007a1dfa8
Add log messages when poll is updated/deleted ( #187 )
2012-05-20 23:12:50 +02:00
37619b0a80
#114 : Set participants tab inactive if usersettings page is active
2012-05-20 22:34:41 +02:00
f8137da055
#203 : Fixed highlighting more than one active line.
2012-05-20 22:20:17 +02:00
5eb29ba9dd
Fixed width of countdown input field.
2012-05-20 22:06:07 +02:00
5581ed1222
#168 : Improved countdown control buttons.
2012-05-20 22:01:44 +02:00
92a64d38cf
Add projector view link on front page. Fixed column for can_manage_projector permission.
2012-05-20 20:51:11 +02:00
4389f5f548
#89 : Added missing control_customslide.html template.
2012-05-20 20:15:49 +02:00
c4450bf14e
Updated translations.
2012-05-20 20:02:48 +02:00
97bea50b03
Use single url for toggle publish/unpublish election ballots.
2012-05-20 20:02:36 +02:00
9b6640c2ae
Removed unused link var.
2012-05-20 19:44:29 +02:00
406a2d18e3
Fixed can_manage_projector permission.
2012-05-20 19:43:38 +02:00
189c975137
Use same url to toggle participant status.
2012-05-19 19:22:20 +02:00
3a52cd56c6
#165 : Use AJAX instead of page reload to publish assignment polls
2012-05-19 16:25:55 +02:00
fbc603b748
Fix initial value for pollform is value is a "special" value ( #135 )
2012-05-19 14:19:32 +02:00
182f20308b
Fix exception in polls with special values (fallout from translation fix)
2012-05-19 13:41:30 +02:00
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
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
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
3f4119f182
#199 : Changed login error message. Updated translation.
2012-05-19 08:44:46 +02:00
23fb97c7a2
#170 : Use second submenu for agenda items.
2012-05-19 08:26:59 +02:00
188fe4cce5
Fixed missing check for activeline in assignment overview.
2012-05-19 08:15:20 +02:00
07c587a025
#186 : Fixed published polls/ballot column on projector template.
2012-05-19 08:09:18 +02:00
2dc156ef74
Automated merge with ssh://openslides.org/openslides
2012-05-18 23:25:51 +02:00
f2a93c4505
#89 : Delete custom slides.
2012-05-18 23:24:54 +02:00
90787b2597
#89 : Edit custom slides.
2012-05-18 23:07:09 +02:00
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
ebe5381439
Automated merge with ssh://openslides.org/openslides
2012-05-18 19:38:26 +02:00
b81469703b
#198 : Optimized submenu of application and assignment.
2012-05-18 19:38:21 +02:00
c99deb8a2a
Increase max_length of agenda title field.
2012-05-18 10:24:43 +02:00
8ec3099620
#197 : Rename the default User Group "Delegierte" to "Delegierter"
2012-05-17 22:03:48 +02:00
4cef2762fe
Fixed style in empty agenda overview table.
2012-05-17 21:38:37 +02:00
0351627234
Fixed title in assignment projector template.
2012-05-17 21:36:18 +02:00
ca2900e9d1
#195 : Fixed unicode string in pdf header.
2012-05-17 21:34:19 +02:00
92562aef28
#188 : Fixed projector template style error.
2012-05-15 20:36:49 +02:00
298cefcb45
Fix error when creating new applications (introduced by translation fix)
2012-05-15 20:10:54 +02:00
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
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
c19025ceb3
#190 : Fixed typo in translation.
2012-05-14 23:10:17 +02:00
3324ce6131
Removed help text of active form field by overriding.
2012-05-14 23:07:24 +02:00
1d6a0bee4e
#174 : Change form field 'groups' to 'user groups'.
2012-05-14 23:04:00 +02:00
31ae7c38c9
#192 : i18n-de: Beamer -> Projektor
2012-05-14 22:16:13 +02:00
304013649b
Changed default event description. Updated tranlsations.
2012-05-14 22:08:40 +02:00
bc9765230c
#185 : Wrong permission to print assignments.
2012-05-14 22:02:45 +02:00
bb5fcf4d6d
#183 : Wrong permission to print application.
2012-05-14 22:00:22 +02:00
114b719cad
Added comment column in agenda overview.
2012-05-14 21:55:36 +02:00
fbf2256493
#182 : Wrong permission for edit button in view template.
2012-05-14 21:55:02 +02:00
d8807ba979
#180 : Ballot description. Fixed ballot number function.
2012-05-14 21:34:46 +02:00
911b7ebac8
Changed po file header.
2012-05-11 07:38:56 +02:00
b65e21e08f
#100 : Fixed wrong permissions.
2012-04-30 08:50:35 +02:00
eb7672074e
Some more style work for application projector template.
2012-04-30 08:30:04 +02:00
e28c15eff9
Improve projector style of application voting results.
2012-04-30 08:23:50 +02:00
3faa91f5a4
Updated translation.
2012-04-30 08:23:06 +02:00
1089e61011
Modified support help text.
2012-04-29 21:58:16 +02:00
8bdd57cada
Prepare 1.2-beta1 release.
2012-04-29 21:43:21 +02:00
616a34e8a9
Changed style: td:hover to tr:hover.
2012-04-29 21:32:29 +02:00
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
8c8a3e9fc2
Updated translations.
2012-04-29 20:48:10 +02:00
3a0d243a6c
Added agenda 'edit' button in view template.
2012-04-29 20:47:54 +02:00
2186561b6e
Removed LANGUAGE_CODE ('de') because django uses language selected by browser. Default language is 'en'.
2012-04-29 19:33:57 +02:00
79605531c5
Some minor style fixes for poll view templates.
2012-04-29 19:12:18 +02:00
905d9d546c
Fixe pdf icon path.
2012-04-29 19:01:18 +02:00
e1799b4c83
#155 : remove header/footer in first-password-pdf
2012-04-29 18:58:51 +02:00
Oskar Hahn