Norman Jäckel
|
3ba04e10b4
|
Fix typo in default permissions for anonymous-group
|
2012-08-10 00:37:23 +02:00 |
|
Oskar Hahn
|
b19f6a7d74
|
Merge branch 'master' into install
Conflicts:
openslides/__init__.py
|
2012-08-08 13:45:32 +02:00 |
|
Oskar Hahn
|
5353053d29
|
Merge branch 'stable/1.2.x'
Conflicts:
openslides/application/views.py
|
2012-08-08 11:21:36 +02:00 |
|
Oskar Hahn
|
75443808af
|
fix some errors in participant
|
2012-08-08 10:52:13 +02:00 |
|
Oskar Hahn
|
d1ab2f2e85
|
some pep8 corections for the participant app
|
2012-08-08 10:34:23 +02:00 |
|
Oskar Hahn
|
f22362df9d
|
made participant-test run again
|
2012-08-08 10:07:36 +02:00 |
|
Oskar Hahn
|
1719aa588d
|
rename some user api and participant names
|
2012-08-07 22:43:57 +02:00 |
|
Oskar Hahn
|
b55ceddb82
|
append tests for the participant app
|
2012-08-07 10:15:39 +02:00 |
|
Oskar Hahn
|
ab33b9f05a
|
fix error in application-supporters an assignment-candidates, for non admin users
|
2012-08-06 14:58:52 +02:00 |
|
Oskar Hahn
|
f8f6e712a7
|
added LOCALE_PATHS to openslides_settings to avoid deprication in Django 1.5
|
2012-08-05 22:35:09 +02:00 |
|
Oskar Hahn
|
c52f8f3ca7
|
changed application to motion and permitted to authorized in message-strings
|
2012-08-05 22:31:20 +02:00 |
|
Oskar Hahn
|
008c743650
|
fixt #334. Let the anonymous user see the assignments by default
|
2012-08-05 11:58:11 +02:00 |
|
Oskar Hahn
|
998fb3e1ee
|
fix #336. The admin could not edit the supporters from applications
|
2012-08-05 11:48:03 +02:00 |
|
Oskar Hahn
|
4873cd7163
|
fixted #330. Error if the related slide for an Agenda Item does not exists
|
2012-08-05 11:28:56 +02:00 |
|
Oskar Hahn
|
bcd98301a9
|
remove mercurial_version from openslides.__init__
|
2012-08-05 10:59:25 +02:00 |
|
Oskar Hahn
|
feb1aa4138
|
make start.py script run again
|
2012-08-05 09:52:00 +02:00 |
|
Oskar Hahn
|
e3f8bfcfd0
|
update setup.py to make an openslides module
|
2012-08-04 20:59:27 +02:00 |
|
Oskar Hahn
|
1a1bcb2358
|
updated some parts of OpenSlides to the new user-api
|
2012-08-04 15:15:11 +02:00 |
|
Oskar Hahn
|
465497ab30
|
some pep8 changes for the user-api
|
2012-08-04 14:47:09 +02:00 |
|
Oskar Hahn
|
72e41fe286
|
user-api: reorderd the user-api
|
2012-08-04 13:18:06 +02:00 |
|
Oskar Hahn
|
fe1ebf806a
|
user-api: Use the right Exception in get_user()
|
2012-08-04 12:51:07 +02:00 |
|
Oskar Hahn
|
8da09bb985
|
user-api: fix an error with deactivated supporters in application
|
2012-08-04 12:46:32 +02:00 |
|
Oskar Hahn
|
14bf6d0a35
|
user-api: updated the application-supporter system to new user-api
|
2012-08-04 12:19:31 +02:00 |
|
Oskar Hahn
|
2bc2dad7a5
|
user-api: small fix for the second poll in assignment
|
2012-08-03 19:15:14 +02:00 |
|
Oskar Hahn
|
8fcf65e829
|
user-api: make the assignments work with the new user-api
|
2012-08-03 18:56:00 +02:00 |
|
Oskar Hahn
|
c16d38d9a3
|
user-api: Load the User-List from UserFormField on any request
|
2012-08-03 16:25:04 +02:00 |
|
Oskar Hahn
|
1ae91d1130
|
changed user-api, so it can be filter the result for the prefix and the id
|
2012-08-03 14:23:13 +02:00 |
|
Oskar Hahn
|
4f61c763d7
|
started to rewrite the assignment-code for the new user-api
|
2012-08-03 13:49:05 +02:00 |
|
Oskar Hahn
|
93020f9ead
|
mark group to be teated as user
|
2012-08-03 12:44:34 +02:00 |
|
Oskar Hahn
|
4ffb701397
|
created new user-api
|
2012-08-03 00:11:53 +02:00 |
|
Oskar Hahn
|
e34f90aad1
|
update german translation
|
2012-07-28 11:09:00 +02:00 |
|
Oskar Hahn
|
47a40150e6
|
added " befor permitted.
This changes a translation string
|
2012-07-28 11:01:57 +02:00 |
|
Oskar Hahn
|
b2ce59080e
|
#332 use an specific name for the session cookie
|
2012-07-27 23:18:31 +02:00 |
|
Oskar Hahn
|
ecfeb170f3
|
we can not redirect from a poll, that does not exists to an assignment.
|
2012-07-27 22:49:38 +02:00 |
|
Oskar Hahn
|
9a87db61cc
|
#329 fix attribute error for anonymous users in the application view
|
2012-07-27 11:56:20 +02:00 |
|
Emanuel Schuetze
|
feb82bd531
|
Updated translation.
|
2012-07-25 23:21:30 +02:00 |
|
Emanuel Schuetze
|
8b39a4dfeb
|
Hide div container of tabledrag to eleminate space between table and number of items.
|
2012-07-25 21:37:20 +02:00 |
|
Emanuel Schuetze
|
5d367dd635
|
Prepared 1.2 release.
|
2012-07-25 14:10:55 +02:00 |
|
Emanuel Schuetze
|
172b90ea1b
|
#328: Translated application status error message.
|
2012-07-24 07:32:20 +02:00 |
|
Emanuel Schuetze
|
0c0f3d09da
|
#328: Show error message if application status is already set.
|
2012-07-23 23:17:03 +02:00 |
|
Emanuel Schuetze
|
1f3cfaf25a
|
Added ugettext_lazy for 403 error page.
|
2012-07-23 23:06:36 +02:00 |
|
Emanuel Schuetze
|
f3d656c98d
|
#325: participant/passwords/print/ raises server-error
|
2012-07-23 23:03:42 +02:00 |
|
Emanuel Schuetze
|
f12d155651
|
Added linebreak.
|
2012-07-23 23:00:00 +02:00 |
|
Emanuel Schuetze
|
cdddc00d54
|
Improved else block.
|
2012-07-23 22:59:31 +02:00 |
|
Emanuel Schuetze
|
f36ad67bb9
|
Removed additional <hr> tag from custom slides widget.
|
2012-07-23 19:21:47 +02:00 |
|
Emanuel Schuetze
|
d58e8f4c84
|
Fixed filename of assignment poll pdf.
|
2012-07-23 12:58:46 +02:00 |
|
Emanuel Schuetze
|
bf5181e241
|
Fixed missing translation in PDF title and filename.
|
2012-07-23 12:57:47 +02:00 |
|
Emanuel Schuetze
|
219b1e936e
|
Fixed two PDF build errors.
|
2012-07-23 12:35:15 +02:00 |
|
Oskar Hahn
|
9d2a011958
|
update translation
|
2012-07-23 09:33:19 +02:00 |
|
Oskar Hahn
|
797396d94d
|
#322 remove the dot at the end of a assignment-model verbose-name
|
2012-07-23 09:30:34 +02:00 |
|
Emanuel Schuetze
|
0ce6627756
|
Fixed csv import error.
|
2012-07-23 08:55:05 +02:00 |
|
Norman Jäckel
|
e74e80299f
|
Fix application links in the widgets.
|
2012-07-23 00:41:44 +02:00 |
|
Oskar Hahn
|
fedfe802e3
|
#315 remove 'application' from agenda/widget.html, too
|
2012-07-20 13:26:45 +02:00 |
|
Oskar Hahn
|
93f9e2dc97
|
fix error in the translation of the participant-list
|
2012-07-20 11:40:36 +02:00 |
|
Oskar Hahn
|
8854f7f9ba
|
#319 sort participants by there last_name by default
|
2012-07-20 11:34:37 +02:00 |
|
Oskar Hahn
|
e1a2f18f74
|
#316 fix translation of the confirm message in the general config page
|
2012-07-20 11:31:28 +02:00 |
|
Oskar Hahn
|
e2d658b0d8
|
#321 change assignment string for the comment on the ballot paper
|
2012-07-20 11:24:34 +02:00 |
|
Oskar Hahn
|
ff4529d8eb
|
#315 remove application from agenda by appending a new methode get_application_title_supplement
|
2012-07-20 11:22:09 +02:00 |
|
Oskar Hahn
|
078125a1a2
|
update translation
|
2012-07-20 11:05:04 +02:00 |
|
Oskar Hahn
|
0c834532db
|
#317 change string for the automatic methode of choosind the right assignment-poll-methode
|
2012-07-20 10:59:34 +02:00 |
|
Oskar Hahn
|
469e93e21d
|
rm beamer.html from agenda. created by merging the 1.2-dev branch in the default branch
|
2012-07-20 10:55:57 +02:00 |
|
Oskar Hahn
|
ba783489f2
|
changle end of line to windows for some files
|
2012-07-20 10:55:07 +02:00 |
|
Emanuel Schuetze
|
189d0bf5e1
|
Merged.
|
2012-07-19 14:55:58 +02:00 |
|
Norman Jäckel
|
fd0f3d68fa
|
Fix typo in participant/views.py
|
2012-07-19 12:27:45 +02:00 |
|
Oskar Hahn
|
834c30321b
|
#310 Redirect to the password-change-page if the admin has not changed his password yet
|
2012-07-19 11:43:48 +02:00 |
|
Oskar Hahn
|
f928abd006
|
merge
|
2012-07-19 11:16:38 +02:00 |
|
Oskar Hahn
|
70b161c539
|
added name for participant app in __init__
removed some files, added though branch merge
|
2012-07-19 11:11:07 +02:00 |
|
Emanuel Schuetze
|
90905d3e53
|
Updated jquery from 1.7.1 to 1.7.2.
|
2012-07-19 08:45:48 +02:00 |
|
Emanuel Schuetze
|
7a9d475dae
|
Updated css property border-radius.
|
2012-07-19 08:37:41 +02:00 |
|
Emanuel Schuetze
|
c678b557fa
|
#311: Updated first login message and translations.
|
2012-07-19 08:21:51 +02:00 |
|
Emanuel Schuetze
|
7ff3d1382d
|
#304: Added link to projector-view for non-admins
|
2012-07-19 07:54:49 +02:00 |
|
Emanuel Schuetze
|
4fe77f89d3
|
Updated translations.
|
2012-07-18 21:15:12 +02:00 |
|
Emanuel Schuetze
|
9b3103d4a8
|
#284: Updated i18n links and added gettext requirement note.
|
2012-07-18 20:44:02 +02:00 |
|
Oskar Hahn
|
8f4970e16c
|
merge 1.2-dev with default branch
|
2012-07-18 10:37:23 +00:00 |
|
Oskar Hahn
|
365f844164
|
update translation
|
2012-07-18 10:53:19 +02:00 |
|
Oskar Hahn
|
9b8517faeb
|
default value for the config value admin_password
|
2012-07-18 10:46:26 +02:00 |
|
Oskar Hahn
|
b327d41ee6
|
#306 show admin password if it hasn't changed
|
2012-07-18 10:46:07 +02:00 |
|
Emanuel Schuetze
|
db22ecfde8
|
Prepared 1.2-rc1 release.
|
2012-07-16 22:47:59 +02:00 |
|
Emanuel Schuetze
|
2a0e7ef2c4
|
Updated translation.
|
2012-07-16 22:37:59 +02:00 |
|
Emanuel Schuetze
|
0d3dcaf433
|
Merged.
|
2012-07-16 22:26:48 +02:00 |
|
Emanuel Schuetze
|
d428841735
|
Fixed translation.
|
2012-07-16 22:26:07 +02:00 |
|
Emanuel Schuetze
|
80d16a2852
|
Fixed missing error/condition ('candidate list already closed') for participants without manager permissions.
|
2012-07-16 22:21:23 +02:00 |
|
Oskar Hahn
|
fd6961234a
|
set DEBUG=False in default.settings.py
|
2012-07-16 18:13:53 +02:00 |
|
Oskar Hahn
|
76e52cf01a
|
#300 dont show votecast and voteinvalid symbols, if the vote has no votes
|
2012-07-16 14:29:30 +02:00 |
|
Oskar Hahn
|
4e5884bda4
|
#298 fix problem with a votecast of 0, -1 and -2
|
2012-07-16 14:10:56 +02:00 |
|
Oskar Hahn
|
07c4649243
|
#297 fix error in ApplicationPDF with changes in the poll API
|
2012-07-16 14:05:51 +02:00 |
|
Oskar Hahn
|
0b033271f8
|
fix some typos, mostly {%trans to {% trans
|
2012-07-16 14:00:29 +02:00 |
|
Norman Jäckel
|
5d5e7c10f5
|
Change strings in agenda overview and agenda widget concerning application items
|
2012-07-16 00:39:46 +02:00 |
|
Norman Jäckel
|
16e829a05d
|
Change application widget - Set number behind the title.
Fix wrong application title in the beamer template
|
2012-07-16 00:12:12 +02:00 |
|
Norman Jäckel
|
0279c07b15
|
Change design of application view and poll view (see #292)
|
2012-07-16 00:01:26 +02:00 |
|
Norman Jäckel
|
bd9c609dc0
|
Change design of assignment poll view (see #292)
|
2012-07-15 23:17:10 +02:00 |
|
Norman Jäckel
|
bee6fa7147
|
Set initial value for posts in assingment.
|
2012-07-15 22:46:20 +02:00 |
|
Oskar Hahn
|
84a78e8584
|
#290 fix unicode problem for python 2.5 in strftime
|
2012-07-14 09:19:45 +02:00 |
|
Oskar Hahn
|
a1152af7ea
|
#288 fix type error if a poll has no votecast
|
2012-07-14 08:48:25 +02:00 |
|
Emanuel Schuetze
|
e4250b6ba1
|
Some style fixes.
|
2012-07-13 16:04:00 +02:00 |
|
Emanuel Schuetze
|
c8eb4d26d9
|
#232: Removed spaces from links via CSS.
|
2012-07-13 15:59:58 +02:00 |
|
Oskar Hahn
|
88cb44e0c3
|
#287 fix elected candidate in assignment-slide
|
2012-07-13 11:33:56 +02:00 |
|
Oskar Hahn
|
1b0a9b27ef
|
#294 harmonize the name of the passwort settings page.
|
2012-07-13 11:24:41 +02:00 |
|
Oskar Hahn
|
66b853a10a
|
redesign the poll api, so it don't creates poll-tables. Also, it is easier to get the poll for a vote object.
#288 show percent after the vote results
|
2012-07-13 11:16:06 +02:00 |
|
Emanuel Schuetze
|
969816be37
|
Use new close icon to keep old done icon.
|
2012-07-13 07:58:00 +02:00 |
|