Oskar Hahn
|
685b138d8d
|
Merge pull request #19 from emanuelschuetze/master
Fixes for application and assignment ballot paper
|
2012-09-18 14:08:12 -07:00 |
|
Emanuel Schuetze
|
613956b62a
|
Fixed missing blue 'candidate elected' line in assignment projector template.
|
2012-09-18 22:55:31 +02:00 |
|
Emanuel Schuetze
|
1548479069
|
Fixed application and assigment ballot paper: don't use old profile object.
|
2012-09-18 22:47:12 +02:00 |
|
Emanuel Schuetze
|
12d8527255
|
Updated translations.
|
2012-09-18 22:40:30 +02:00 |
|
Emanuel Schuetze
|
9cb9270df3
|
Assignment: Fixed generating ballot pdf paper (typo: surfix).
|
2012-09-18 22:37:53 +02:00 |
|
Oskar Hahn
|
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 |
|
Oskar Hahn
|
eb267acf08
|
removed scrollbar in projector-template
|
2012-09-15 09:13:36 +02:00 |
|
Oskar Hahn
|
2984fd791c
|
small fix to the person api
|
2012-09-15 09:11:56 +02:00 |
|
Norman Jäckel
|
0db8af15b7
|
Clean up the code for pull request
|
2012-09-14 23:53:59 +02:00 |
|
Norman Jäckel
|
269b093b28
|
Enhence use of config var and Meta Class for default sorting of users
|
2012-09-14 03:02:00 +02:00 |
|
Norman Jäckel
|
e5c132e34c
|
Use new config var for sorting users
|
2012-09-14 02:46:43 +02:00 |
|
Norman Jäckel
|
f41fe87656
|
Insert new config var for sorting Users by first_name
|
2012-09-14 02:40:40 +02:00 |
|
Norman Jäckel
|
f8d3390c78
|
Docstrings and sorting of Users and Groups in the UsersAndGroupsToPersons class object (was: UsersConnector)
|
2012-09-14 02:24:02 +02:00 |
|
Norman Jäckel
|
811b780fb9
|
Fix typo TYPE_CHOICE to TYPE_CHOICES
|
2012-09-14 01:52:20 +02:00 |
|
Norman Jäckel
|
cb3b26c45d
|
Default sorting of applications using Meta Class
|
2012-09-14 01:14:25 +02:00 |
|
Norman Jäckel
|
77ae543ff2
|
Using Meta Class for ordering assignments by name
|
2012-09-14 00:21:59 +02:00 |
|
Oskar Hahn
|
eac23ecd99
|
remove confusing image
|
2012-09-13 22:02:42 +02:00 |
|
Oskar Hahn
|
56e3fe7a37
|
fix translation
|
2012-09-13 21:56:50 +02:00 |
|
Oskar Hahn
|
f0f14861e8
|
fixed message for unblocking users
|
2012-09-13 21:51:50 +02:00 |
|
Oskar Hahn
|
d8136045bb
|
update application pdf
|
2012-09-13 21:33:57 +02:00 |
|
Oskar Hahn
|
0cf0e58af9
|
Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides
Conflicts:
openslides/assignment/models.py
|
2012-09-13 15:28:35 +02:00 |
|
Oskar Hahn
|
f292d6738b
|
Merge branch 'master' of github.com:OpenSlides/OpenSlides
|
2012-09-13 15:22:48 +02:00 |
|
Oskar Hahn
|
ef7deb90c9
|
translate agenda hidden filter in js
|
2012-09-13 15:21:43 +02:00 |
|
Oskar Hahn
|
20ac817d49
|
Fixed error message when delrun after the list is closed
|
2012-09-13 15:07:24 +02:00 |
|
Oskar Hahn
|
e64f4f5efc
|
show blocked candidates of an assignment
|
2012-09-13 14:59:14 +02:00 |
|
Oskar Hahn
|
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 |
|
Oskar Hahn
|
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 |
|
Oskar Hahn
|
b15d70d13d
|
typo
|
2012-09-13 11:52:04 +02:00 |
|
Oskar Hahn
|
bcfceccb09
|
dont use simular passwords in gen_password (no Il10oO)
|
2012-09-13 11:50:06 +02:00 |
|
Oskar Hahn
|
63835e7443
|
fixed application deletion
|
2012-09-13 11:43:11 +02:00 |
|
Oskar Hahn
|
d0dccbf279
|
Merge pull request #17 from ostcar/master
some fixes
|
2012-09-12 01:21:36 -07:00 |
|
Oskar Hahn
|
760f8e042e
|
some fixes
|
2012-09-12 10:17:51 +02:00 |
|
Emanuel Schuetze
|
7376b7a692
|
Updated translations.
|
2012-09-11 20:50:53 +02:00 |
|
Emanuel Schuetze
|
e9ac336b61
|
Fixed wrong permissions: can_create_applications instead of can_manage_applications
|
2012-09-11 20:20:58 +02:00 |
|
Emanuel Schuetze
|
bc25937aa0
|
Updated translations.
|
2012-09-11 19:57:22 +02:00 |
|
Oskar Hahn
|
93ee260856
|
Merge branch 'master' of github.com:OpenSlides/OpenSlides
|
2012-09-11 19:30:50 +02:00 |
|
Oskar Hahn
|
38d53bbb92
|
fixed first-time-pdf
|
2012-09-11 19:30:12 +02:00 |
|
Oskar Hahn
|
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 |
|
Oskar Hahn
|
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 |
|
Oskar Hahn
|
e2f87f23ac
|
Merge pull request #12 from normanjaeckel/sorting_elements_in_widgets
Sorting elements in widgets and in the application overview
|
2012-09-11 00:46:36 -07:00 |
|
Emanuel Schuetze
|
51ab5e3850
|
Minor style for widgets.
|
2012-09-11 00:05:20 +02:00 |
|
Emanuel Schuetze
|
2bf992117c
|
Updated widget titel and icons.
|
2012-09-11 00:00:44 +02:00 |
|
Emanuel Schuetze
|
15ab01c9d1
|
Removed unused mainmenu and submenu blocks.
|
2012-09-10 23:43:33 +02:00 |
|
Emanuel Schuetze
|
2f3e57bf4a
|
Removed unused base_assignment.html template.
|
2012-09-10 23:40:08 +02:00 |
|
Emanuel Schuetze
|
a77bb31a2a
|
Clean template code.
|
2012-09-10 23:38:20 +02:00 |
|
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 |
|