ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,359 Commits 6 Branches 42 Tags 64 MiB
442e5fba60
Commit Graph

1073 Commits

Author SHA1 Message Date
Emanuel Schuetze
9d183e9746 Rename user group to group. Updated translations. Clean up new french po file. 2012-11-07 22:16:11 +01:00
Emanuel Schuetze
7b64d464f5 Added user view url also for last_name. 2012-11-07 21:27:59 +01:00
Andy Kittner
32a76e2aad Fix UnicodeError on widgets page 2012-11-07 21:12:52 +01:00
Emanuel Schuetze
af4f923527 Fixed KeyError in main.py. 2012-11-07 20:48:07 +01:00
Oskar Hahn
0330f74d1b Merge pull request #35 from andkit/master 
Fix missing translations (#415)
 2012-11-07 01:24:54 -08:00
Oskar Hahn
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
Oskar Hahn
a691db5d30 updated fr translation 
Thx to Moira
 2012-11-07 10:22:32 +01:00
Oskar Hahn
2d9b0a8848 delete the projector cache after 1 second. 2012-11-07 10:05:38 +01:00
Oskar Hahn
13b5336af9 Merge pull request #33 from ostcar/manage 
fixed manage.py
 2012-11-07 00:59:35 -08:00
Andy Kittner
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
Norman Jäckel
35e41873a0 Add UserSlide with new template. 2012-11-06 00:02:44 +01:00
Oskar Hahn
41c1c5a2c8 Added fr translation 2012-11-05 18:41:53 +01:00
Emanuel Schuetze
a363efe2ef Fixed #390: Added new user field 'about me' 2012-11-03 09:34:42 +01:00
Emanuel Schuetze
005cb2f15e Updated translations. 2012-11-03 08:59:34 +01:00
Oskar Hahn
3c58d8d64b fixed manage.py 2012-11-02 20:57:59 +01:00
Oskar Hahn
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
Norman Jäckel
3b4e19ad3b Enhence template of UserView and GroupView 2012-10-31 14:47:42 +01:00
Norman Jäckel
ac25e02e2d Catch another IOError in get_version() 2012-10-31 14:38:06 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
8ffeadfe88 Cleared projector cache if countdown enabled or overlay message changed. 2012-10-30 23:45:06 +01:00
Emanuel Schuetze
3dd5ce9e73 Fixed default password generation while CSV import. 2012-10-30 23:10:23 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
4ee518dd96 Updated translations (for sorting participants). 2012-10-30 22:59:37 +01:00
Emanuel Schuetze
aa0abec970 Fixed motion csv import error. 2012-10-30 22:30:32 +01:00
Emanuel Schuetze
145a52eb24 Updated translations. 2012-10-30 22:16:43 +01:00
Emanuel Schuetze
85771c4af6 Fixed participant CSV import. 2012-10-30 22:05:03 +01:00
Emanuel Schuetze
f62b7f299b Changed admin full name to "Adminstrator". 2012-10-30 21:02:39 +01:00
Emanuel Schuetze
d9fbfeff84 for pull request #23: Removed "You have access to apps" code from welcome widget. 2012-10-30 20:18:16 +01:00
Emanuel Schuetze
51a762b4c6 Prepared 1.3-beta1 release. 2012-10-30 20:05:54 +01:00
Emanuel Schuetze
0c797aa476 Merge remote branch 'upstream/master' 2012-10-30 20:03:17 +01:00
Norman Jäckel
c13f4ba52d Add UserView and GroupView part 2 2012-10-30 00:07:25 +01:00
Oskar Hahn
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
Oskar Hahn
f4e1f83f15 rename test_name_surfix in test_name_suffix in participant/tests.py 2012-10-29 16:27:15 +01:00
Norman Jäckel
b213e75223 Enhancement to ticket # 389 (Message on assignment slide when no vote results yet available) 2012-10-29 10:16:12 +01:00
Oskar Hahn
79c5e93422 Redesigned the QuestioMixin 2012-10-28 19:59:41 +01:00
Norman Jäckel
21c12a6d32 Fix POST request in SupportView 2012-10-28 17:44:15 +01:00
Oskar Hahn
a100fd5d78 Merge pull request #30 from normanjaeckel/SupportView_in_motion 
New: Support view in motion
 2012-10-28 07:19:10 -07:00
Norman Jäckel
9d3d095162 Clean up SupportView. Raise error message at GET request instead of POST. 2012-10-28 02:09:47 +02:00
Norman Jäckel
015dc159ed Add UserView and GroupView part 1 2012-10-27 18:17:22 +02:00
Norman Jäckel
3f0c31d12b Add user widget and group widget, see # 379 2012-10-26 18:16:09 +02:00
Norman Jäckel
1063e7011a Change query for assignments in personal_info_widget 2012-10-26 17:14:46 +02:00
Norman Jäckel
510aca54eb Add widget with personal info, ticket #25 2012-10-25 23:58:32 +02:00
Norman Jäckel
0ec106a034 Fix message on assignment slide, ticket #389 2012-10-25 22:18:20 +02:00
Norman Jäckel
d6ebbdc541 Fix plural-error on ballot paper, ticket #393 2012-10-25 21:57:02 +02:00
Norman Jäckel
1849e14dbf Insert widget with static welcome text (see frontpage and config tab), ticket #387 2012-10-25 21:47:59 +02:00
Norman Jäckel
4052e137a2 Insert new list with all elected candidates, see ticket #374 2012-10-25 21:28:13 +02:00
Norman Jäckel
d0771063b3 Fix assignment overview table, ticket #372 2012-10-25 21:08:29 +02:00
Oskar Hahn
c4e6466926 Added cache for the ajax-version of the projector 2012-10-25 15:17:25 +02:00
Oskar Hahn
1002ecc6e6 Remove redundant keyword for the SupportView class 2012-10-25 10:25:59 +02:00
Oskar Hahn
2e41dcdefe Fixt problems with the permission of supporting and unsupporting a motion 
Ticket #377
 2012-10-25 10:15:41 +02:00
Oskar Hahn
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
Oskar Hahn
87d5f4b6f8 Updated german translation 2012-10-24 12:55:25 +02:00
Oskar Hahn
a0242c3c74 Show linebreaks in assignment description. #392 2012-10-24 12:48:11 +02:00
Oskar Hahn
413cd27d40 fixed deletion of motions. #391 2012-10-24 12:45:40 +02:00
Oskar Hahn
57d591fee8 Renamed category to detail 2012-10-24 12:30:45 +02:00
Oskar Hahn
56b9e831c8 Allowd access to the dashboard per default. #361 2012-10-24 12:21:44 +02:00
Oskar Hahn
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
Oskar Hahn
c58d478151 rename render_to_forbitten to render_to_forbidden. #370 2012-10-24 11:39:27 +02:00
Oskar Hahn
17afa3c5d1 fixed #326 whitespace in allready used names 2012-10-24 11:35:07 +02:00
Oskar Hahn
681d909fa3 rename application to motion 2012-10-24 11:07:36 +02:00
Norman Jäckel
c036be05bf Fix new class based view for support/unsupport motions. Fix strange error in QuestionMixin. 2012-10-23 11:54:18 +02:00
Norman Jäckel
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
Emanuel Schuetze
fa9874038e New welcome widget. 2012-09-20 20:45:37 +02:00
Oskar Hahn
3aefd252ff Merge remote-tracking branch 'emanuel/master' 2012-09-20 10:05:00 +02:00
Oskar Hahn
5b97250df2 Small fix with the overlay message 2012-09-20 09:55:27 +02:00
Emanuel Schuetze
a60f03aebc Fixed: Application is deleted if user clicks 'No' in confirm form. 2012-09-19 17:00:40 +02:00
Emanuel Schuetze
9f9ea81fc6 Fixed attribute error if anonymous opens application/assignment view. 2012-09-19 14:16:17 +02:00
Emanuel Schuetze
4cd1ad5954 Fixed missing supporters number 2012-09-19 11:58:24 +02:00
Norman Jäckel
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
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
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
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
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
Andy Kittner
1b65044223 Remove a few spaces for pep8 conformance 2012-08-28 19:07:40 +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
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
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
Oskar Hahn
6b7ea558fc rewrote widgets for the dashboard 2012-08-15 11:56:43 +02:00
Oskar Hahn
dfb24ba61a Merge branch 'master' into dashboard 2012-08-15 11:05:29 +02:00
Oskar Hahn
9c031768f8 fix merge errors 2012-08-15 11:01:38 +02:00
Oskar Hahn
c6bc50e2fd rename projector to dashboard 2012-08-15 10:58:29 +02:00
Oskar Hahn
b7a0e83c68 changed the main script 2012-08-14 14:19:59 +02:00
Oskar Hahn
a2be848932 Merge branch 'master' into install 2012-08-13 19:35:14 +02:00
Oskar Hahn
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
Oskar Hahn
d0e7419666 Merge remote-tracking branch 'openslides/stable/1.2.x' 2012-08-13 18:36:23 +02:00
Oskar Hahn
5178363127 Merge pull request #6 from ostcar/translation 
Translation
 2012-08-13 09:30:17 -07:00
Oskar Hahn
31ca01563e some corrective actions 2012-08-13 14:37:49 +02:00
Oskar Hahn
df40de67b0 rename openslidesuser to user and openslidesgroup to group 2012-08-12 12:52:38 +02:00
Oskar Hahn
0a8ee9cbad changed request.user to be the openslidesuser 2012-08-12 10:12:26 +02:00
Oskar Hahn
6795ccd25b change the users in the groupform 2012-08-11 11:36:55 +02:00
Oskar Hahn
cdf160dfc3 fix some problems with the creation of new users 2012-08-11 11:09:20 +02:00
Oskar Hahn
f01fe5a894 removed unused imports from participant and did some pep8 changes 2012-08-11 10:51:52 +02:00
Oskar Hahn
bc3e7fdaab rewrote the group views as class based views 2012-08-11 10:09:54 +02:00
Oskar Hahn
9b3bec69d1 rewrote the passwort reset view as class base view 2012-08-10 21:24:26 +02:00
Oskar Hahn
87af568eeb redesign the DeleteView 
Append a QuestionMixin to send a question via the django message api
 2012-08-10 21:00:13 +02:00
Oskar Hahn
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
Oskar Hahn
bb00eb3eb4 rewrote participant status view as class based view 2012-08-10 19:19:41 +02:00
Oskar Hahn
90fddba63b rewrote delete participant view as class based view 2012-08-10 13:29:46 +02:00
Oskar Hahn
c029fe2f95 ix participant tests 2012-08-10 13:26:03 +02:00
Oskar Hahn
ddb5756868 rewrote the participant edit view as class based view 2012-08-10 13:22:09 +02:00
Oskar Hahn
1832a0c125 make the openslides user a child model of the django user model 2012-08-10 13:11:10 +02:00
Oskar Hahn
29049119f7 rewrote participant overview as class based view 2012-08-10 11:51:45 +02:00
Oskar Hahn
f008a4eb0a use OpenSlides.get_full_name instead of OpenSlides.user.get_full_name 2012-08-10 11:18:01 +02:00
Oskar Hahn
153482f32d first_name, last_name and name_surfix as OpenSlidesUser attributes 2012-08-10 11:14:11 +02:00
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