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

196 Commits

Author SHA1 Message Date
Oskar Hahn
ac41a02ac5 Block supporting, unsupporting and creation of poll in some states 2013-02-01 16:44:06 +01:00
Oskar Hahn
fb82a1787b Add workflows for motions 2013-02-01 16:33:45 +01:00
Oskar Hahn
3f02a28002 Added a poll delete view to the new motion app 2013-02-01 13:24:44 +01:00
Oskar Hahn
da7a7a9d68 Add Poll-system to the new motion app 2013-02-01 12:51:54 +01:00
Emanuel Schuetze
82ad5e2de0 Major changes for new twitter bootstrap template (e.g. replaced icons) 2013-01-31 10:19:56 +01:00
Oskar Hahn
d911e311d6 Let the user support and unsupport the motion 2013-01-26 18:18:02 +01:00
Oskar Hahn
87e42cf9f8 Let the user choose if the motion should have a new version 
via config or form
 2013-01-26 17:09:13 +01:00
Oskar Hahn
0702d49e2e Save the supporter 2013-01-26 16:42:23 +01:00
Oskar Hahn
d3b340769b Added motion config tab 2013-01-26 16:33:55 +01:00
Oskar Hahn
ecb6419f8c fixed apply and success url in utils.views 2013-01-26 16:19:53 +01:00
Oskar Hahn
567e6c975a Show initial submitters in the update-form 2013-01-26 16:05:30 +01:00
Oskar Hahn
8708ba5da6 Only save new version, when version-data has changed 2013-01-26 15:39:35 +01:00
Oskar Hahn
1f87749742 Save the submitters to the motion 2013-01-26 15:25:54 +01:00
Oskar Hahn
1ae140c11e Add docstrings to the motion class 2013-01-26 12:28:51 +01:00
Emanuel Schuetze
b8532fabe4 Removed files from images to img dir. 2013-01-18 22:23:31 +01:00
Emanuel Schuetze
da4ed365bc Updated js and css libraries (twitter bootstrap to 2.2.2 and jquery to 1.9.0). 2013-01-18 22:10:00 +01:00
Emanuel Schuetze
586425354d Reworked new template, especially agenda and dashboard. 2013-01-08 23:05:35 +01:00
Oskar Hahn
0231fe37f5 Start to rewrite the motion app 2013-01-08 20:22:03 +01:00
Emanuel Schuetze
13cd52bd96 Merged (conflicts). 2013-01-05 15:29:57 +01:00
Oskar Hahn
3229d86d4d Import urls.py needed django functions from django.conf.urls 2013-01-05 01:05:38 +01:00
Emanuel Schuetze
d671740966 Fixed merged errors. 2013-01-02 23:22:12 +01:00
Emanuel Schuetze
4ae7f3e243 Merge remote branch 'upstream/master' into newtemplate 
Conflicts:
	openslides/application/views.py
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/views.py
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/motion/templates/motion/config.html
	openslides/motion/templates/motion/edit.html
	openslides/motion/templates/motion/import.html
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_overview.html
	openslides/participant/templates/participant/overview.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/dashboard.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/static/styles/base.css
	openslides/templates/base.html
	openslides/templates/front_page.html
	openslides/utils/utils.py
 2013-01-02 23:01:43 +01:00
Oskar Hahn
8a84f72891 fixed more url-template-tags 2012-12-16 17:35:06 +01:00
Oskar Hahn
804f842650 Updated the url template tag 2012-12-14 15:10:14 +01:00
Oskar Hahn
366b8e0f1f Droped support for python 2.5 2012-12-14 14:21:53 +01:00
Emanuel Schuetze
94928c20c5 Updated translation msg strings. 2012-11-27 21:22:57 +01:00
Oskar Hahn
6b2645d11c reordered the tests 
moved the tests from the openslides-module to an own module
configured coverage
 2012-11-24 15:00:17 +01:00
Oskar Hahn
bd32994296 cleanup 
Removed unused imports and fixed pep8 errors
 2012-11-24 14:01:21 +01:00
Oskar Hahn
1dc7d45670 sort persons in motions 2012-11-22 17:00:09 +01:00
René Köcher
9f51a24311 #419 - aftermath 
- remove accidental print statements left over from debugging
- create missing groups on import

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-22 10:26:44 +01:00
René Köcher
36f83808fd Implement #419: Add group column for motion csv import 
The motion import now features an additional column to indicate that the import should be created by an existing group.
If the column is missing it is considered as 'off' and first / last name are used as always.
If the column exists and contains 'y','yes','j','ja','true', '1' or 1 first name will be ignored and last name will be interpreted as a group name.
If the group exists and can act as a person the motion will be imported and assigned to this group.

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-21 23:38:25 +01:00
Norman Jäckel
af6c403936 Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector. 2012-11-21 15:14:38 +01:00
Emanuel Schuetze
0fbb7dced3 Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!) 2012-11-19 23:30:09 +01:00
Emanuel Schuetze
e601d8a5a3 Fixed display_name of widgets. 2012-11-08 09:43:04 +01:00
Emanuel Schuetze
71790a345b Fixed some English strings. Updated translations. 2012-11-07 22:37:33 +01: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
Emanuel Schuetze
3dd5ce9e73 Fixed default password generation while CSV import. 2012-10-30 23:10:23 +01:00
Emanuel Schuetze
aa0abec970 Fixed motion csv import error. 2012-10-30 22:30:32 +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
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
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
413cd27d40 fixed deletion of motions. #391 2012-10-24 12:45:40 +02:00
Oskar Hahn
681d909fa3 rename application to motion 2012-10-24 11:07:36 +02:00