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

1385 Commits

Author SHA1 Message Date
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 60c01770b7 Fixed folder list for .gitattributes. 2012-10-31 09:06:56 +01:00
Emanuel Schuetze e430974543 Added .gitattributes for ignoring files with 'git archive' export. 2012-10-31 09:04:38 +01:00
Oskar Hahn 0397849a79 Merge pull request #23 from emanuelschuetze/master 
prepare 1.3-beta1 release
 2012-10-31 00:27:13 -07: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 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
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
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
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 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