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

1254 Commits

Author SHA1 Message Date
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 e7aab1d2a8 Merge pull request #28 from ostcar/projector_cache 
Added cache for the ajax-version of the projector
 2012-10-25 06:19:13 -07: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 20e07c0af7 Merge pull request #27 from ostcar/master 
A lot of fixes
 2012-10-24 03:56:44 -07: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 f99fdc6981 fixed inital_data 2012-10-24 12:00:51 +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 348bbac7b6 Merge pull request #26 from ostcar/motion 
rename application to motion
 2012-10-24 02:14:18 -07: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
Oskar Hahn 20a838b5b9 Merge pull request #24 from normanjaeckel/pep386_compliant_version 
Change version number to 1.3a1. Insert git hash as suffix of the version...
 2012-10-23 01:17:55 -07: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
Oskar Hahn 483baa09ee Merge pull request #22 from ostcar/master 
Changes on the BV
 2012-09-27 11:13:04 -07: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
Oskar Hahn 9c2400ac1a Merge pull request #21 from emanuelschuetze/master 
3 fixes: missing number of supporters and attribute error for anonymous
 2012-09-19 11:05:40 -07:00
Emanuel Schuetze 05baced315 Merge remote branch 'upstream/master' 2012-09-19 19:42:17 +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
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