0fbb7dced3
Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!)
2012-11-19 23:30:09 +01:00
844b2892f1
Updated translation for professional support footer.
2012-11-19 23:05:38 +01:00
c5595effef
Updated translation.
2012-11-19 22:59:13 +01:00
93d2dc8d7d
Restructuring and optimization of assignment templates.
...
(Now: elected candidates are marked in candidate list; blocked candidates not visible for status 'finished')
2012-11-19 22:54:09 +01:00
0cf4191934
Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty.
2012-11-17 23:44:41 +01:00
b10cf331ab
Updated translation
2012-11-17 22:24:29 +01:00
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
e338529865
#296 : Localised the datetime in PDF header
2012-11-17 21:44:17 +01:00
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
f1fb68a569
#375 : Missing translation of participant type in participant PDF list. (Now get_type_display() is used.)
2012-11-17 20:02:16 +01:00
28cf531e4d
Pass along database path to create_settings if started as portable version
2012-11-09 13:45:52 +01:00
b8bbec3a04
Merge pull request #42 from emanuelschuetze/master
...
Several minor fixes for 1.3-beta2
2012-11-09 01:16:37 -08:00
6719cca7e1
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-09 09:52:00 +01:00
54fb61d211
fixed main.py and manage.py for the openslides.exe
2012-11-09 09:51:10 +01:00
81570b61e6
Rename submenu titel 'projector' to 'dashboard'.
2012-11-08 20:11:06 +01:00
216ac95cfb
Redirect to dashboard after submit widget selection form.
2012-11-08 20:08:09 +01:00
5623bb6888
Move professional support message into base template footer.
2012-11-08 19:13:31 +01:00
533c65562d
Don't allow to deactivate or delete the superuser or yourself.
...
Otherwise it's very danger to lock out your current (superuser) session.
2012-11-08 18:57:53 +01:00
e601d8a5a3
Fixed display_name of widgets.
2012-11-08 09:43:04 +01:00
7c75f42d85
Updated translations.
2012-11-08 09:42:35 +01:00
cbea48ab7e
Merge pull request #40 from emanuelschuetze/master
...
Fixed type in pdf list
2012-11-08 00:26:12 -08:00
de7d4ed6cd
Merge pull request #34 from normanjaeckel/UserSlide
...
Add UserSlide with new template.
2012-11-08 00:25:04 -08:00
8d599d6428
Fixed type in participants PDF list.
2012-11-08 09:22:23 +01:00
f551b2fa6d
Merge pull request #39 from emanuelschuetze/master
...
Last translation update for 1.3-beta2
2012-11-07 13:43:02 -08:00
71790a345b
Fixed some English strings. Updated translations.
2012-11-07 22:37:33 +01:00
030058fb7c
Merge pull request #37 from andkit/master
...
Fix UnicodeError on widgets page
2012-11-07 13:35:24 -08:00
a3627b77b4
Added new allowed language (French).
2012-11-07 22:24:39 +01:00
b66a57d341
Prepared 1.3-beta2 release.
2012-11-07 22:21:55 +01:00
9d183e9746
Rename user group to group. Updated translations. Clean up new french po file.
2012-11-07 22:16:11 +01:00
7b64d464f5
Added user view url also for last_name.
2012-11-07 21:27:59 +01:00
32a76e2aad
Fix UnicodeError on widgets page
2012-11-07 21:12:52 +01:00
af4f923527
Fixed KeyError in main.py.
2012-11-07 20:48:07 +01:00
0330f74d1b
Merge pull request #35 from andkit/master
...
Fix missing translations (#415 )
2012-11-07 01:24:54 -08:00
4b2fddc9ce
Merge pull request #36 from ostcar/fr
...
Added fr translation. The work was done from Moira.
2012-11-07 01:24:09 -08:00
a691db5d30
updated fr translation
...
Thx to Moira
2012-11-07 10:22:32 +01:00
2d9b0a8848
delete the projector cache after 1 second.
2012-11-07 10:05:38 +01:00
13b5336af9
Merge pull request #33 from ostcar/manage
...
fixed manage.py
2012-11-07 00:59:35 -08:00
fbd77da788
Fix missing translations ( #415 )
...
- The text "motions" was used with a plural here, but it was also
present in other places without a plural, therefore the .po file
contained only a singular translation. Solved by disambiguating the
uses with a context
- The submitter field of the MotionManagerForm was missing a label
2012-11-07 00:12:15 +01:00
35e41873a0
Add UserSlide with new template.
2012-11-06 00:02:44 +01:00
41c1c5a2c8
Added fr translation
2012-11-05 18:41:53 +01:00
a363efe2ef
Fixed #390 : Added new user field 'about me'
2012-11-03 09:34:42 +01:00
005cb2f15e
Updated translations.
2012-11-03 08:59:34 +01:00
3c58d8d64b
fixed manage.py
2012-11-02 20:57:59 +01:00
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
3b4e19ad3b
Enhence template of UserView and GroupView
2012-10-31 14:47:42 +01:00
ac25e02e2d
Catch another IOError in get_version()
2012-10-31 14:38:06 +01:00
d9ccb02969
Changed version number string. Important for building portable version.
...
Used alpha|beta|rc without git commit hash.
Added 'dev' suffix which use git hash only. It is easier to handle in file names of releases.
2012-10-31 07:11:53 +01:00
8ffeadfe88
Cleared projector cache if countdown enabled or overlay message changed.
2012-10-30 23:45:06 +01:00
3dd5ce9e73
Fixed default password generation while CSV import.
2012-10-30 23:10:23 +01:00
9a522f3835
Use participant_sort_users_by_first_name config var for overview table, participant list (pdf) and first time passwords (pdf).
2012-10-30 23:00:24 +01:00
4ee518dd96
Updated translations (for sorting participants).
2012-10-30 22:59:37 +01:00
aa0abec970
Fixed motion csv import error.
2012-10-30 22:30:32 +01:00
145a52eb24
Updated translations.
2012-10-30 22:16:43 +01:00
85771c4af6
Fixed participant CSV import.
2012-10-30 22:05:03 +01:00
f62b7f299b
Changed admin full name to "Adminstrator".
2012-10-30 21:02:39 +01:00
d9fbfeff84
for pull request #23 : Removed "You have access to apps" code from welcome widget.
2012-10-30 20:18:16 +01:00
51a762b4c6
Prepared 1.3-beta1 release.
2012-10-30 20:05:54 +01:00
0c797aa476
Merge remote branch 'upstream/master'
2012-10-30 20:03:17 +01:00
c13f4ba52d
Add UserView and GroupView part 2
2012-10-30 00:07:25 +01:00
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
f4e1f83f15
rename test_name_surfix in test_name_suffix in participant/tests.py
2012-10-29 16:27:15 +01:00
b213e75223
Enhancement to ticket # 389 (Message on assignment slide when no vote results yet available)
2012-10-29 10:16:12 +01:00
79c5e93422
Redesigned the QuestioMixin
2012-10-28 19:59:41 +01:00
21c12a6d32
Fix POST request in SupportView
2012-10-28 17:44:15 +01:00
a100fd5d78
Merge pull request #30 from normanjaeckel/SupportView_in_motion
...
New: Support view in motion
2012-10-28 07:19:10 -07:00
9d3d095162
Clean up SupportView. Raise error message at GET request instead of POST.
2012-10-28 02:09:47 +02:00
015dc159ed
Add UserView and GroupView part 1
2012-10-27 18:17:22 +02:00
3f0c31d12b
Add user widget and group widget, see # 379
2012-10-26 18:16:09 +02:00
1063e7011a
Change query for assignments in personal_info_widget
2012-10-26 17:14:46 +02:00
510aca54eb
Add widget with personal info, ticket #25
2012-10-25 23:58:32 +02:00
0ec106a034
Fix message on assignment slide, ticket #389
2012-10-25 22:18:20 +02:00
d6ebbdc541
Fix plural-error on ballot paper, ticket #393
2012-10-25 21:57:02 +02:00
1849e14dbf
Insert widget with static welcome text (see frontpage and config tab), ticket #387
2012-10-25 21:47:59 +02:00
4052e137a2
Insert new list with all elected candidates, see ticket #374
2012-10-25 21:28:13 +02:00
d0771063b3
Fix assignment overview table, ticket #372
2012-10-25 21:08:29 +02:00
c4e6466926
Added cache for the ajax-version of the projector
2012-10-25 15:17:25 +02:00
1002ecc6e6
Remove redundant keyword for the SupportView class
2012-10-25 10:25:59 +02:00
2e41dcdefe
Fixt problems with the permission of supporting and unsupporting a motion
...
Ticket #377
2012-10-25 10:15:41 +02:00
7dcc2374f4
Merge remote-tracking branch 'openslides/master' into supporter
...
Conflicts:
openslides/application/urls.py
openslides/motion/models.py
openslides/motion/views.py
2012-10-25 09:23:24 +02:00
87d5f4b6f8
Updated german translation
2012-10-24 12:55:25 +02:00
a0242c3c74
Show linebreaks in assignment description. #392
2012-10-24 12:48:11 +02:00
413cd27d40
fixed deletion of motions. #391
2012-10-24 12:45:40 +02:00
57d591fee8
Renamed category to detail
2012-10-24 12:30:45 +02:00
56b9e831c8
Allowd access to the dashboard per default. #361
2012-10-24 12:21:44 +02:00
3e1938941f
Append a default class for the person-api.
...
Also fixed the assignment-ballot-paper for group-persons
2012-10-24 12:15:29 +02:00
c58d478151
rename render_to_forbitten to render_to_forbidden. #370
2012-10-24 11:39:27 +02:00
17afa3c5d1
fixed #326 whitespace in allready used names
2012-10-24 11:35:07 +02:00
681d909fa3
rename application to motion
2012-10-24 11:07:36 +02:00
c036be05bf
Fix new class based view for support/unsupport motions. Fix strange error in QuestionMixin.
2012-10-23 11:54:18 +02:00
fe69973dcc
Change version number to 1.3a1. Insert git hash as suffix of the version number. (Ticket #388 )
2012-10-23 02:03:47 +02:00
fa9874038e
New welcome widget.
2012-09-20 20:45:37 +02:00
3aefd252ff
Merge remote-tracking branch 'emanuel/master'
2012-09-20 10:05:00 +02:00
5b97250df2
Small fix with the overlay message
2012-09-20 09:55:27 +02:00
a60f03aebc
Fixed: Application is deleted if user clicks 'No' in confirm form.
2012-09-19 17:00:40 +02:00
9f9ea81fc6
Fixed attribute error if anonymous opens application/assignment view.
2012-09-19 14:16:17 +02:00
4cd1ad5954
Fixed missing supporters number
2012-09-19 11:58:24 +02:00
3bde0a8af9
Use Class-based View to support or unsupport an application. Use QuestionMixin for a confirm message
2012-09-19 03:10:15 +02:00
613956b62a
Fixed missing blue 'candidate elected' line in assignment projector template.
2012-09-18 22:55:31 +02:00
1548479069
Fixed application and assigment ballot paper: don't use old profile object.
2012-09-18 22:47:12 +02:00
12d8527255
Updated translations.
2012-09-18 22:40:30 +02:00
9cb9270df3
Assignment: Fixed generating ballot pdf paper (typo: surfix).
2012-09-18 22:37:53 +02:00
5aa2bc650f
Merge pull request #18 from normanjaeckel/Default_Sorting
...
Default sorting using Meta Class option and new config var
2012-09-15 00:23:50 -07:00
eb267acf08
removed scrollbar in projector-template
2012-09-15 09:13:36 +02:00
2984fd791c
small fix to the person api
2012-09-15 09:11:56 +02:00
0db8af15b7
Clean up the code for pull request
2012-09-14 23:53:59 +02:00
269b093b28
Enhence use of config var and Meta Class for default sorting of users
2012-09-14 03:02:00 +02:00
e5c132e34c
Use new config var for sorting users
2012-09-14 02:46:43 +02:00
f41fe87656
Insert new config var for sorting Users by first_name
2012-09-14 02:40:40 +02:00
f8d3390c78
Docstrings and sorting of Users and Groups in the UsersAndGroupsToPersons class object (was: UsersConnector)
2012-09-14 02:24:02 +02:00
811b780fb9
Fix typo TYPE_CHOICE to TYPE_CHOICES
2012-09-14 01:52:20 +02:00
cb3b26c45d
Default sorting of applications using Meta Class
2012-09-14 01:14:25 +02:00
77ae543ff2
Using Meta Class for ordering assignments by name
2012-09-14 00:21:59 +02:00
eac23ecd99
remove confusing image
2012-09-13 22:02:42 +02:00
56e3fe7a37
fix translation
2012-09-13 21:56:50 +02:00
f0f14861e8
fixed message for unblocking users
2012-09-13 21:51:50 +02:00
d8136045bb
update application pdf
2012-09-13 21:33:57 +02:00
0cf0e58af9
Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides
...
Conflicts:
openslides/assignment/models.py
2012-09-13 15:28:35 +02:00
ef7deb90c9
translate agenda hidden filter in js
2012-09-13 15:21:43 +02:00
20ac817d49
Fixed error message when delrun after the list is closed
2012-09-13 15:07:24 +02:00
e64f4f5efc
show blocked candidates of an assignment
2012-09-13 14:59:14 +02:00
0725003377
clarify the submitter name in the application pdf
...
It was not clear, that the submitter should sign the formular
2012-09-13 12:16:46 +02:00
48a992119a
Fixted permissions for editing an application
...
The suppmitter could edit an application after it was finished by
manipulating the url
2012-09-13 12:09:17 +02:00
b15d70d13d
typo
2012-09-13 11:52:04 +02:00
bcfceccb09
dont use simular passwords in gen_password (no Il10oO)
2012-09-13 11:50:06 +02:00
63835e7443
fixed application deletion
2012-09-13 11:43:11 +02:00
760f8e042e
some fixes
2012-09-12 10:17:51 +02:00
7376b7a692
Updated translations.
2012-09-11 20:50:53 +02:00
e9ac336b61
Fixed wrong permissions: can_create_applications instead of can_manage_applications
2012-09-11 20:20:58 +02:00
bc25937aa0
Updated translations.
2012-09-11 19:57:22 +02:00
93ee260856
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-09-11 19:30:50 +02:00
38d53bbb92
fixed first-time-pdf
2012-09-11 19:30:12 +02:00
8732b67bd8
Merge pull request #14 from ostcar/no_recandidate
...
block a user to be a candidate from a assignment, if he delete his candidation by him self
2012-09-11 00:52:50 -07:00
d6a0ec5893
Merge pull request #11 from normanjaeckel/custom_slides
...
Insert weight field in custom slides and order custom slides in the
2012-09-11 00:47:07 -07:00
51ab5e3850
Minor style for widgets.
2012-09-11 00:05:20 +02:00
2bf992117c
Updated widget titel and icons.
2012-09-11 00:00:44 +02:00
15ab01c9d1
Removed unused mainmenu and submenu blocks.
2012-09-10 23:43:33 +02:00
2f3e57bf4a
Removed unused base_assignment.html template.
2012-09-10 23:40:08 +02:00
a77bb31a2a
Clean template code.
2012-09-10 23:38:20 +02:00
473c2c347f
Removed unused base_agenda.html template.
2012-09-10 23:37:59 +02:00
889bd66e04
Adjusted dashboard templates for twitter bootstrap.
...
Reduced jquery-ui stuff to really neccessary files.
2012-09-10 23:28:19 +02:00
b705df8c5f
Changed redirect to dashboard after changing password.
2012-09-10 21:02:58 +02:00
e50abbbf03
Restructured base.css.
2012-09-10 18:03:33 +02:00
ce233fc870
Updated config template.
2012-09-10 17:40:41 +02:00
74ffad6ced
Minor changes for template style.
2012-09-10 17:17:22 +02:00
65840d4261
Minor changes in assigment view template.
2012-09-10 17:15:43 +02:00
94ffb3ab45
Redesign login template.
2012-09-07 21:25:18 +02:00
6a3bead5f6
Cleanup template code and style.
2012-09-06 23:59:03 +02:00
ae51d9e7da
Adjusted template for assignment app.
2012-09-06 23:58:20 +02:00
7c90206b3f
Adjusted new template for participant app. Added new generic form.
2012-09-06 22:41:24 +02:00
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
d1c12ea0e5
Sorting applications in the widget by number
2012-09-05 22:42:44 +02:00
2ecd552d2b
Default Sorting of applications by number
2012-09-05 22:38:40 +02:00
d84a8d2bdd
Sorting assignments by name in the widget
2012-09-05 22:19:53 +02:00
55073494fc
Insert weight field in custom slides and order custom slides in the widget
2012-09-05 21:54:34 +02:00
8da28310f7
Hide optional columns on mobile devices (with small window width).
2012-09-05 07:54:01 +02:00
13cfdb36af
Updated login form to new template style.
2012-09-05 00:43:19 +02:00
7fde53a09e
Updated template with twitter bootstrap. Step 1: agenda and application.
2012-09-05 00:20:28 +02:00
1b65044223
Remove a few spaces for pep8 conformance
2012-08-28 19:07:40 +02:00
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
6d1c356ffd
Name openslides_personal_settings.py and openslides_global_settings.oy
2012-08-24 14:23:12 +02:00
32cfa6c914
Fix encoding error in settings.py #349
2012-08-23 23:34:30 +02:00
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
423f04d0be
send overlay message data to own view
2012-08-15 18:00:22 +02:00
705fb972b1
removed projector link from agenda
2012-08-15 13:44:15 +02:00
416f3f6ff3
added select widgets view
2012-08-15 13:42:25 +02:00
6b7ea558fc
rewrote widgets for the dashboard
2012-08-15 11:56:43 +02:00
dfb24ba61a
Merge branch 'master' into dashboard
2012-08-15 11:05:29 +02:00
9c031768f8
fix merge errors
2012-08-15 11:01:38 +02:00
c6bc50e2fd
rename projector to dashboard
2012-08-15 10:58:29 +02:00
b7a0e83c68
changed the main script
2012-08-14 14:19:59 +02:00
a2be848932
Merge branch 'master' into install
2012-08-13 19:35:14 +02:00
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
d0e7419666
Merge remote-tracking branch 'openslides/stable/1.2.x'
2012-08-13 18:36:23 +02:00
5178363127
Merge pull request #6 from ostcar/translation
...
Translation
2012-08-13 09:30:17 -07:00
31ca01563e
some corrective actions
2012-08-13 14:37:49 +02:00
df40de67b0
rename openslidesuser to user and openslidesgroup to group
2012-08-12 12:52:38 +02:00
0a8ee9cbad
changed request.user to be the openslidesuser
2012-08-12 10:12:26 +02:00
6795ccd25b
change the users in the groupform
2012-08-11 11:36:55 +02:00
cdf160dfc3
fix some problems with the creation of new users
2012-08-11 11:09:20 +02:00
f01fe5a894
removed unused imports from participant and did some pep8 changes
2012-08-11 10:51:52 +02:00
bc3e7fdaab
rewrote the group views as class based views
2012-08-11 10:09:54 +02:00
9b3bec69d1
rewrote the passwort reset view as class base view
2012-08-10 21:24:26 +02:00
87af568eeb
redesign the DeleteView
...
Append a QuestionMixin to send a question via the django message api
2012-08-10 21:00:13 +02:00
1f2f7cc73a
rewrote user csv import
...
The import does not delete the existing users anymore, but append the users as new users.
2012-08-10 19:49:46 +02:00
bb00eb3eb4
rewrote participant status view as class based view
2012-08-10 19:19:41 +02:00
90fddba63b
rewrote delete participant view as class based view
2012-08-10 13:29:46 +02:00
c029fe2f95
ix participant tests
2012-08-10 13:26:03 +02:00
ddb5756868
rewrote the participant edit view as class based view
2012-08-10 13:22:09 +02:00
1832a0c125
make the openslides user a child model of the django user model
2012-08-10 13:11:10 +02:00
29049119f7
rewrote participant overview as class based view
2012-08-10 11:51:45 +02:00
f008a4eb0a
use OpenSlides.get_full_name instead of OpenSlides.user.get_full_name
2012-08-10 11:18:01 +02:00
153482f32d
first_name, last_name and name_surfix as OpenSlidesUser attributes
2012-08-10 11:14:11 +02:00
3ba04e10b4
Fix typo in default permissions for anonymous-group
2012-08-10 00:37:23 +02:00
b19f6a7d74
Merge branch 'master' into install
...
Conflicts:
openslides/__init__.py
2012-08-08 13:45:32 +02:00
5353053d29
Merge branch 'stable/1.2.x'
...
Conflicts:
openslides/application/views.py
2012-08-08 11:21:36 +02:00
75443808af
fix some errors in participant
2012-08-08 10:52:13 +02:00
d1ab2f2e85
some pep8 corections for the participant app
2012-08-08 10:34:23 +02:00
f22362df9d
made participant-test run again
2012-08-08 10:07:36 +02:00
1719aa588d
rename some user api and participant names
2012-08-07 22:43:57 +02:00
b55ceddb82
append tests for the participant app
2012-08-07 10:15:39 +02:00
ab33b9f05a
fix error in application-supporters an assignment-candidates, for non admin users
2012-08-06 14:58:52 +02:00
f8f6e712a7
added LOCALE_PATHS to openslides_settings to avoid deprication in Django 1.5
2012-08-05 22:35:09 +02:00
c52f8f3ca7
changed application to motion and permitted to authorized in message-strings
2012-08-05 22:31:20 +02:00
008c743650
fixt #334 . Let the anonymous user see the assignments by default
2012-08-05 11:58:11 +02:00
998fb3e1ee
fix #336 . The admin could not edit the supporters from applications
2012-08-05 11:48:03 +02:00
4873cd7163
fixted #330 . Error if the related slide for an Agenda Item does not exists
2012-08-05 11:28:56 +02:00
bcd98301a9
remove mercurial_version from openslides.__init__
2012-08-05 10:59:25 +02:00
feb1aa4138
make start.py script run again
2012-08-05 09:52:00 +02:00
e3f8bfcfd0
update setup.py to make an openslides module
2012-08-04 20:59:27 +02:00
1a1bcb2358
updated some parts of OpenSlides to the new user-api
2012-08-04 15:15:11 +02:00
465497ab30
some pep8 changes for the user-api
2012-08-04 14:47:09 +02:00
72e41fe286
user-api: reorderd the user-api
2012-08-04 13:18:06 +02:00
fe1ebf806a
user-api: Use the right Exception in get_user()
2012-08-04 12:51:07 +02:00
8da09bb985
user-api: fix an error with deactivated supporters in application
2012-08-04 12:46:32 +02:00
14bf6d0a35
user-api: updated the application-supporter system to new user-api
2012-08-04 12:19:31 +02:00
2bc2dad7a5
user-api: small fix for the second poll in assignment
2012-08-03 19:15:14 +02:00
8fcf65e829
user-api: make the assignments work with the new user-api
2012-08-03 18:56:00 +02:00
c16d38d9a3
user-api: Load the User-List from UserFormField on any request
2012-08-03 16:25:04 +02:00
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
4f61c763d7
started to rewrite the assignment-code for the new user-api
2012-08-03 13:49:05 +02:00
93020f9ead
mark group to be teated as user
2012-08-03 12:44:34 +02:00
4ffb701397
created new user-api
2012-08-03 00:11:53 +02:00
e34f90aad1
update german translation
2012-07-28 11:09:00 +02:00
47a40150e6
added " befor permitted.
...
This changes a translation string
2012-07-28 11:01:57 +02:00
b2ce59080e
#332 use an specific name for the session cookie
2012-07-27 23:18:31 +02:00
ecfeb170f3
we can not redirect from a poll, that does not exists to an assignment.
2012-07-27 22:49:38 +02:00
9a87db61cc
#329 fix attribute error for anonymous users in the application view
2012-07-27 11:56:20 +02:00
feb82bd531
Updated translation.
2012-07-25 23:21:30 +02:00
8b39a4dfeb
Hide div container of tabledrag to eleminate space between table and number of items.
2012-07-25 21:37:20 +02:00
5d367dd635
Prepared 1.2 release.
2012-07-25 14:10:55 +02:00
172b90ea1b
#328 : Translated application status error message.
2012-07-24 07:32:20 +02:00
0c0f3d09da
#328 : Show error message if application status is already set.
2012-07-23 23:17:03 +02:00
1f3cfaf25a
Added ugettext_lazy for 403 error page.
2012-07-23 23:06:36 +02:00
f3d656c98d
#325 : participant/passwords/print/ raises server-error
2012-07-23 23:03:42 +02:00
f12d155651
Added linebreak.
2012-07-23 23:00:00 +02:00
cdddc00d54
Improved else block.
2012-07-23 22:59:31 +02:00
f36ad67bb9
Removed additional <hr> tag from custom slides widget.
2012-07-23 19:21:47 +02:00
d58e8f4c84
Fixed filename of assignment poll pdf.
2012-07-23 12:58:46 +02:00
bf5181e241
Fixed missing translation in PDF title and filename.
2012-07-23 12:57:47 +02:00
219b1e936e
Fixed two PDF build errors.
2012-07-23 12:35:15 +02:00
9d2a011958
update translation
2012-07-23 09:33:19 +02:00
797396d94d
#322 remove the dot at the end of a assignment-model verbose-name
2012-07-23 09:30:34 +02:00
0ce6627756
Fixed csv import error.
2012-07-23 08:55:05 +02:00
e74e80299f
Fix application links in the widgets.
2012-07-23 00:41:44 +02:00
fedfe802e3
#315 remove 'application' from agenda/widget.html, too
2012-07-20 13:26:45 +02:00
93f9e2dc97
fix error in the translation of the participant-list
2012-07-20 11:40:36 +02:00
8854f7f9ba
#319 sort participants by there last_name by default
2012-07-20 11:34:37 +02:00
e1a2f18f74
#316 fix translation of the confirm message in the general config page
2012-07-20 11:31:28 +02:00
e2d658b0d8
#321 change assignment string for the comment on the ballot paper
2012-07-20 11:24:34 +02:00
ff4529d8eb
#315 remove application from agenda by appending a new methode get_application_title_supplement
2012-07-20 11:22:09 +02:00
078125a1a2
update translation
2012-07-20 11:05:04 +02:00
0c834532db
#317 change string for the automatic methode of choosind the right assignment-poll-methode
2012-07-20 10:59:34 +02:00
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
ba783489f2
changle end of line to windows for some files
2012-07-20 10:55:07 +02:00
189d0bf5e1
Merged.
2012-07-19 14:55:58 +02:00
fd0f3d68fa
Fix typo in participant/views.py
2012-07-19 12:27:45 +02:00
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
f928abd006
merge
2012-07-19 11:16:38 +02:00
70b161c539
added name for participant app in __init__
...
removed some files, added though branch merge
2012-07-19 11:11:07 +02:00
90905d3e53
Updated jquery from 1.7.1 to 1.7.2.
2012-07-19 08:45:48 +02:00
7a9d475dae
Updated css property border-radius.
2012-07-19 08:37:41 +02:00
c678b557fa
#311 : Updated first login message and translations.
2012-07-19 08:21:51 +02:00
7ff3d1382d
#304 : Added link to projector-view for non-admins
2012-07-19 07:54:49 +02:00
4fe77f89d3
Updated translations.
2012-07-18 21:15:12 +02:00
9b3103d4a8
#284 : Updated i18n links and added gettext requirement note.
2012-07-18 20:44:02 +02:00
8f4970e16c
merge 1.2-dev with default branch
2012-07-18 10:37:23 +00:00
365f844164
update translation
2012-07-18 10:53:19 +02:00
9b8517faeb
default value for the config value admin_password
2012-07-18 10:46:26 +02:00
b327d41ee6
#306 show admin password if it hasn't changed
2012-07-18 10:46:07 +02:00
db22ecfde8
Prepared 1.2-rc1 release.
2012-07-16 22:47:59 +02:00
2a0e7ef2c4
Updated translation.
2012-07-16 22:37:59 +02:00
0d3dcaf433
Merged.
2012-07-16 22:26:48 +02:00
d428841735
Fixed translation.
2012-07-16 22:26:07 +02:00
80d16a2852
Fixed missing error/condition ('candidate list already closed') for participants without manager permissions.
2012-07-16 22:21:23 +02:00
fd6961234a
set DEBUG=False in default.settings.py
2012-07-16 18:13:53 +02:00
76e52cf01a
#300 dont show votecast and voteinvalid symbols, if the vote has no votes
2012-07-16 14:29:30 +02:00
4e5884bda4
#298 fix problem with a votecast of 0, -1 and -2
2012-07-16 14:10:56 +02:00
07c4649243
#297 fix error in ApplicationPDF with changes in the poll API
2012-07-16 14:05:51 +02:00
0b033271f8
fix some typos, mostly {%trans to {% trans
2012-07-16 14:00:29 +02:00
5d5e7c10f5
Change strings in agenda overview and agenda widget concerning application items
2012-07-16 00:39:46 +02:00
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
0279c07b15
Change design of application view and poll view (see #292 )
2012-07-16 00:01:26 +02:00
bd9c609dc0
Change design of assignment poll view (see #292 )
2012-07-15 23:17:10 +02:00
bee6fa7147
Set initial value for posts in assingment.
2012-07-15 22:46:20 +02:00
84a78e8584
#290 fix unicode problem for python 2.5 in strftime
2012-07-14 09:19:45 +02:00
a1152af7ea
#288 fix type error if a poll has no votecast
2012-07-14 08:48:25 +02:00
e4250b6ba1
Some style fixes.
2012-07-13 16:04:00 +02:00
c8eb4d26d9
#232 : Removed spaces from links via CSS.
2012-07-13 15:59:58 +02:00
88cb44e0c3
#287 fix elected candidate in assignment-slide
2012-07-13 11:33:56 +02:00
1b0a9b27ef
#294 harmonize the name of the passwort settings page.
2012-07-13 11:24:41 +02:00
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
969816be37
Use new close icon to keep old done icon.
2012-07-13 07:58:00 +02:00
9c03726bef
#295 : Change link to button.
2012-07-13 07:44:42 +02:00
b4ee5dfff4
#293 : Updated translation.
2012-07-13 07:34:15 +02:00
e99e5ab290
Clean up browsertitles ( #282 ) in assignment and participant tab
2012-07-13 01:10:58 +02:00
28d6fb54a7
Clean up browsertitles ( #282 ) in config projector
2012-07-13 00:47:53 +02:00
32c80caa37
Clean up browsertitles ( #282 ) in agenda and application
2012-07-13 00:44:12 +02:00
accb329a44
#232 : Removed spaces from links.
2012-07-12 17:24:37 +02:00
ed7221e0f0
Changed to other 'done' icon to better defferentiate the projector activate icon.
...
Changed link help text.
2012-07-12 17:17:53 +02:00
0c64309c91
Rename summary icon.
2012-07-12 17:11:33 +02:00
531f0d9abb
Added link help text.
2012-07-12 17:02:59 +02:00
7487cf1601
Set summary icon in agenda widget at the right side to other action
...
icons.
2012-07-12 16:57:23 +02:00
e80b04504f
#194 fix password when importing users via csv
2012-07-12 14:37:01 +02:00
cea2bbbf7d
update translation
2012-07-12 14:19:08 +02:00
8cdcc95fd9
#286 import error in the agenda overview slide
2012-07-12 14:06:58 +02:00
07a0d42577
#285 append tabs to password-change-view
2012-07-11 09:46:15 +02:00
68215e78d6
add Licence for django-jsonfield
2012-07-11 09:45:48 +02:00
aa130ab2da
cleanup openslides base files.
...
Do not manipulate the pythonpath anymore.
2012-07-10 14:00:51 +02:00
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
Emanuel Schuetze