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

2956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
7c7bdd92dd Merge pull request #772 from normanjaeckel/MotionIdentifierSetting 
Fix numbering with category prefix in simple workflow, fix #769
 2013-06-20 13:07:57 -07:00
Norman Jäckel
96c5b1d2dc Fix numbering with category prefix in simple workflow, fix #769 2013-06-20 18:03:22 +02:00
Oskar Hahn
79dfd8a6ae Merge pull request #771 from ostcar/issue-770 
Fixed #770. Ordering of Users in GroupForm regulated by the config var.
 2013-06-20 08:37:59 -07:00
Oskar Hahn
08a71c17a3 Fixed #770. Ordering of Users in GroupForm regulated by the config var. 2013-06-20 08:33:55 +02:00
Oskar Hahn
83d39188dc Merge pull request #768 from anjahitziger/Screenshots_Tutorial 
Some more awesome screenshots for the German tutorial
 2013-06-19 23:09:00 -07:00
Anja Hitziger
2a7dd9fd9b Some more awesome screenshots for the German tutorial 2013-06-20 00:22:06 +02:00
Oskar Hahn
ddbf86672a Merge pull request #762 from anjahitziger/Screenshot 
Update motion poll screenshot, fix #743
 2013-06-18 00:42:12 -07:00
Anja Hitziger
09dd546a83 Update motion poll screenshot, fix #743 2013-06-17 23:40:18 +02:00
Oskar Hahn
e8e6bfd14e Merge pull request #756 from normanjaeckel/Release_1.4c1 
Release 1.4c1
 2013-06-17 12:14:54 -07:00
Norman Jäckel
c5beb07fbc Update version to 1.4-dev (final) 2013-06-17 20:19:02 +02:00
Norman Jäckel
0039207899 Release 1.4c1 2013-06-17 20:17:32 +02:00
Oskar Hahn
32771d946e Merge pull request #754 from emanuelschuetze/fixes-for-1.4c1 
IE-Template fix and README/main.py updates.
 2013-06-17 11:13:05 -07:00
Emanuel Schuetze
42809048f9 Updated and adjusted options help text in main.py and README. 2013-06-17 19:59:58 +02:00
Oskar Hahn
13f0ffc4ad Merge pull request #755 from emanuelschuetze/translation-fr 
Updated French translations (by Moira via transifex).
 2013-06-17 10:46:03 -07:00
Emanuel Schuetze
f191d3687b Updated French translations (by Moira via transifex). 2013-06-17 17:54:05 +02:00
Emanuel Schuetze
7dc2b0d904 Fixed #753 (Wrong scaling of projector live view in Internet Explorer) 
Supports IE8+ only. Dropped IE7 support.
 2013-06-17 17:30:46 +02:00
Oskar Hahn
3a58749e18 Merge pull request #752 from emanuelschuetze/template-fixes2 
Fixed typo.
 2013-06-17 04:58:20 -07:00
Emanuel Schuetze
c450dfb1d5 Fixed typo. 2013-06-17 10:44:55 +02:00
Oskar Hahn
fb387b6ada Merge pull request #751 from ostcar/translation 
small translation update
 2013-06-16 09:49:46 -07:00
Oskar Hahn
c14302dd6f small translation update 2013-06-16 18:44:14 +02:00
Oskar Hahn
a271a43f19 Merge pull request #749 from ostcar/create_use_after_syncdb 
Create admin-user after syncdb
 2013-06-16 08:28:56 -07:00
Oskar Hahn
64af0b162f Create admin-user after syncdb 2013-06-16 17:07:55 +02:00
Oskar Hahn
2f10996933 Merge pull request #748 from emanuelschuetze/widget-issues 
Fixed #745 and #744: Make widgets fixable and collapsable.
 2013-06-16 03:32:25 -07:00
Emanuel Schuetze
5237e1d90d Fixed #745 and #744: Make widgets fixable and collapsable. 
Fixed widget header style issues.
 2013-06-16 12:15:52 +02:00
Oskar Hahn
fd731d68fa Merge pull request #733 from normanjaeckel/Fix_Syncdb 
Disable interactive mode of the syncdb command, fixed #696
 2013-06-16 02:31:27 -07:00
Oskar Hahn
c519c7444a Merge pull request #747 from normanjaeckel/Issue739_New 
Save identifier in MotionSetStateView, fixed #739
 2013-06-16 02:30:09 -07:00
Norman Jäckel
31547f8e1a Save identifier in MotionSetStateView, fixed #739 2013-06-16 01:06:47 +02:00
Norman Jäckel
dfc160af5b Disable interactive mode of the syncdb command, fixed #696 2013-06-16 01:05:22 +02:00
Oskar Hahn
69f7e22320 Merge pull request #735 from ostcar/Issue-710 
Editview for releated agenda items.
 2013-06-15 15:55:32 -07:00
Oskar Hahn
575da78f3a Editview for releated agenda items. 
Releated Agenda Items need there own edit view to edit some agenda specifc
values.

Also added a new filter 'trans' to translate variables.

Fixes #710
 2013-06-16 00:55:07 +02:00
Oskar Hahn
746a8b371a Merge pull request #736 from ostcar/motion-form-workflow 
Change the Workflow of a motion in CreateView.
 2013-06-15 15:54:10 -07:00
Oskar Hahn
9853f2c433 Change the Workflow of a motion in CreateView. 
The Manager can choose the workflow in the createview. The default value
is the workflow from the config.

In the UpdateView the workflow in which the motion is, is choosen by
default.

The workflow will only be reset, if it is changed.
 2013-06-16 00:53:49 +02:00
Oskar Hahn
a348126131 Merge pull request #740 from emanuelschuetze/template-fixes 
Fixed some (pdf) template issues and updated (DE) translation.
 2013-06-15 08:53:15 -07:00
Emanuel Schuetze
a383a4305b Fixed some (pdf) template issues and updated (DE) translation. 
- Fixed #737 (Motion edit link is missing for normal delegate users)
- Fixed motion pdf filename errors (now use motion-<identifier>.pdf or if no identifier: motion-<title>.pdf with using djangos slugify for special chars in title)
- Fixed motion pdf build error if there is an unauthorized version
- Enlarge max_length of event name field to 50 chars.
- Align participant import instruction with motion import page.
- Added title field to particpants-demo_en.csv.
- participant overview: Show comma after last_name only if first_name and last_name are given.
- Changed all page titles to "<specific action page> - <event-name>" (moved event-name to the end of the string)
- Updated EN tranlation string.
- Updated DE translations.
 2013-06-15 17:50:30 +02:00
Oskar Hahn
22cb53c66a Merge pull request #731 from ostcar/motion_version_delete 
Fixes #648
 2013-06-15 00:18:44 -07:00
Oskar Hahn
e630d600ed Fixes #648 
delete function for the motion versions
 2013-06-15 09:18:21 +02:00
Oskar Hahn
431e8cc6a0 Merge pull request #734 from normanjaeckel/WidgetRework 
Add request to all widgets, fixed #653
 2013-06-13 15:51:51 -07:00
Norman Jäckel
3afc58be9e Add request to all widgets, fixed #653 2013-06-13 23:45:30 +02:00
Oskar Hahn
9485e771b9 Merge pull request #730 from ostcar/server_listen_device 
Listen per default to the public
 2013-06-13 08:01:25 -07:00
Norman Jäckel
48f237a92f Print listening info to command line 2013-06-13 16:58:34 +02:00
Oskar Hahn
6dad2e5161 Listen per default to the public 2013-06-13 16:58:34 +02:00
Oskar Hahn
7951c25a42 Merge pull request #732 from ostcar/issue-718 
Fixed #718
 2013-06-13 07:58:01 -07:00
Oskar Hahn
efd10eaecc Fixed #718 
An string argument was not used in the assignment app
 2013-06-13 16:47:35 +02:00
Oskar Hahn
4c35e13158 Merge pull request #728 from normanjaeckel/OrdinalNumbers_Issue456 
Use ordinal numbers in assignment and motion polls, fixes #456.
 2013-06-13 06:57:06 -07:00
Norman Jäckel
a0c023cf45 Use ordinal numbers in assignment and motion polls, fixes #456. Include humanize app to portable 2013-06-13 15:48:55 +02:00
Oskar Hahn
5d122d1d27 Merge pull request #727 from ostcar/issue-742 
Fixed #724
 2013-06-11 02:45:05 -07:00
Oskar Hahn
42ad1113fa Fixed #724 
The motion updated view now uses the last_versio instead of the active_Version
 2013-06-11 11:42:20 +02:00
Oskar Hahn
097d369c89 Merge pull request #708 from normanjaeckel/Issue666 
Issue666 – User lockout protection
 2013-06-11 02:11:59 -07:00
Norman Jäckel
aa0728ff60 User lockout protection, fixed #666 
Protection of updating and deleting users and groups if this caused a lockout of the requesting user.
 2013-06-11 11:02:40 +02:00
Oskar Hahn
7eed5e2928 Merge pull request #726 from anjahitziger/Screenshots 
Screenshots
 2013-06-11 01:24:53 -07:00