Commit Graph

1165 Commits

Author SHA1 Message Date
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 053c3be030 Added Mac OS X specific file .DS_Store to .gitignore. 2012-10-30 20:48:58 +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
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
Oskar Hahn 79c5e93422 Redesigned the QuestioMixin 2012-10-28 19:59:41 +01:00
Oskar Hahn 76534cf287 Merge pull request #31 from normanjaeckel/master
Fix SupportView
2012-10-28 09:48:47 -07: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
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