Commit Graph

1312 Commits

Author SHA1 Message Date
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
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
Oskar Hahn 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
Norman Jäckel d1c12ea0e5 Sorting applications in the widget by number 2012-09-05 22:42:44 +02:00
Norman Jäckel 2ecd552d2b Default Sorting of applications by number 2012-09-05 22:38:40 +02:00
Norman Jäckel d84a8d2bdd Sorting assignments by name in the widget 2012-09-05 22:19:53 +02:00
Norman Jäckel 55073494fc Insert weight field in custom slides and order custom slides in the widget 2012-09-05 21:54:34 +02:00
Oskar Hahn 34a690c713 Merge pull request #10 from andkit/master
Update portable version to set a suitable default location for settings file
2012-08-28 10:43:52 -07:00
Andy Kittner 1b65044223 Remove a few spaces for pep8 conformance 2012-08-28 19:07:40 +02:00
Andy Kittner ce87353cd4 Update instructions for building the portable 2012-08-27 21:54:12 +02:00
Andy Kittner 7f6f7a9340 Rebuild openslides.exe 2012-08-27 21:49:05 +02:00
Andy Kittner 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
Andy Kittner 14ba868df4 Treat openslides the same way as other packages
OpenSlides will now be copied from (and to) site-packages in the same
way as it's dependencies
2012-08-27 20:24:41 +02:00
Oskar Hahn 7321de2400 Merge pull request #8 from normanjaeckel/master
Fix encoding error #349
2012-08-24 09:19:55 -07:00
Norman Jäckel 6d1c356ffd Name openslides_personal_settings.py and openslides_global_settings.oy 2012-08-24 14:23:12 +02:00
Norman Jäckel 32cfa6c914 Fix encoding error in settings.py #349 2012-08-23 23:34:30 +02:00
Oskar Hahn 72f82454ec Merge pull request #7 from emanuelschuetze/master
Dashboard drag'n'drop fix.
2012-08-22 01:59:47 -07:00
Emanuel Schuetze 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
Oskar Hahn 423f04d0be send overlay message data to own view 2012-08-15 18:00:22 +02:00
Oskar Hahn 705fb972b1 removed projector link from agenda 2012-08-15 13:44:15 +02:00
Oskar Hahn 416f3f6ff3 added select widgets view 2012-08-15 13:42:25 +02:00