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

2157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
6aae8bff15 More projector fixtures 
* Update projector when polls are updated.
* Update projector when assignment candidates are updated
* Update projector when motion submitter are updated
* Fixed the assignment publish poll view
* Added projector.api.register_slide_model
 2013-10-10 18:40:24 +02:00
Oskar Hahn
38251f0819 Merge pull request #901 from emanuelschuetze/newprojectortemplate 
Rework projector template with bootstrap
 2013-10-07 08:12:28 -07:00
Emanuel Schuetze
84d5293fbc Rework (projector) template with bootstrap. 
- Always use templatetag 'absolute_url' instead of (depricated) 'model_url'.
  Search and replace all old arguments: edit -> update, view -> detail, delete
- Fixed bug in setting default value in 'absolute_url' templatetag
  (default value is defined in models.py only).

Updated 'backend' template.
 2013-10-07 08:57:22 +02:00
Oskar Hahn
d681e94eed Merge remote-tracking branch 'openslides/stable/1.4.x' 
Conflicts:
	AUTHORS
 2013-10-04 09:13:51 +02:00
Oskar Hahn
81319e746e Merge pull request #893 from ostcar/back_to_default_config 
Added Feature for config app, to return the default value for a key
 2013-09-30 13:30:58 -07:00
Oskar Hahn
6926630d3e Added Feature for config app, to return the default value for a key 2013-09-29 15:10:01 +02:00
Oskar Hahn
d926f4da07 Merge pull request #892 from ostcar/issue-891 
Fixed keyerror on user setting page
 2013-09-28 12:49:17 -07:00
Oskar Hahn
4bd40f9764 Merge pull request #889 from ostcar/projector 
Rework of the projector with websocket
 2013-09-24 15:00:50 -07:00
Oskar Hahn
ecf5248962 Rework of the projector with websocket 
* Set a static projector title
* absolute_urls for the activate links
* update the projector when a slide changes (in save())
* insert the absolute_url template filter
* Preview to slides
* renamed is_active to is_active_slide
* The SlideMixin has to come before the PersonMixin
* Update list of speakers
* Render Countdown via JS
* Reconnect projector after connection lost
* Overlays can allways be active and do not appear in the widget
* Rewrote the clock as overlay
 2013-09-24 23:35:05 +02:00
Oskar Hahn
93079938a3 Fixed keyerror on user setting page 
Fix #891
 2013-09-24 23:31:45 +02:00
Oskar Hahn
6b95e51c5b Merge pull request #890 from emanuelschuetze/translation-pt 
Added Portuguese translation
 2013-09-24 13:23:19 -07:00
Emanuel Schuetze
7f172692da Added Portuguese translation (Thanks to Marco A.G.Pinto) 2013-09-24 22:13:50 +02:00
Oskar Hahn
d2f5302e28 Merge pull request #888 from ostcar/sucess_message 
Success_message in utils.views
 2013-09-14 21:34:47 -07:00
Oskar Hahn
7ea8a6195c Merge pull request #879 from DebVortex/feature/refactor-assignments 
Refactored assignments app.
 2013-09-14 09:22:18 -07:00
Max Brauer
bf4825a3e0 Refactored assignments app to use class based views instead of 
functions.
 2013-09-14 18:20:35 +02:00
Oskar Hahn
477daa3fdf Success_message in utils.views 2013-09-14 11:09:45 +02:00
Oskar Hahn
66679c8efe Merge branch 'stable/1.4.x' 
Conflicts:
	openslides/__init__.py
 2013-09-14 11:07:02 +02:00
Norman Jäckel
20b627a3a6 Merge pull request #886 from normanjaeckel/Release_1.4.2 
Release 1.4.2
 2013-09-10 12:52:47 -07:00
Norman Jäckel
cd2f01ed26 Update version to 1.4.3-dev 2013-09-10 21:40:44 +02:00
Norman Jäckel
5854bb1f50 Release 1.4.2 2013-09-10 21:38:30 +02:00
Emanuel Schütze
7fa97ab578 Merge pull request #885 from normanjaeckel/Prepare1.4.2 
Prepare1.4.2
 2013-09-10 12:35:15 -07:00
Norman Jäckel
5abe4c5ad8 Update CHANGELOG and INSTALL for 1.4.2 2013-09-10 21:32:59 +02:00
Norman Jäckel
7c6e274640 Merge pull request #882 from emanuelschuetze/translations 
Updated translations (de and fr)
 2013-09-10 12:18:47 -07:00
Emanuel Schuetze
f2829eb173 Updated DE and FR translation (one new translation string). 2013-09-10 20:58:59 +02:00
Oskar Hahn
bfe2b7fb2a Merge pull request #881 from emanuelschuetze/1.4.2-fixes 
Updated English translation file
 2013-09-10 10:31:10 -07:00
Emanuel Schuetze
e621335169 Updated English translation file (for new translation string in motion config). 2013-09-10 09:07:12 +02:00
Oskar Hahn
183e066c0d Merge pull request #880 from emanuelschuetze/1.4.2-fixes 
Translation typo update
 2013-09-09 14:56:19 -07:00
Emanuel Schuetze
0246525a7a Updated DE, FR, CS translation (typo in EN translation string). 2013-09-09 22:12:10 +02:00
Oskar Hahn
5961628799 Merge pull request #877 from normanjaeckel/ConfigChangeCallback 
Add on_change_callback to config variables. These callback can be define...
 2013-09-09 02:04:54 -07:00
Oskar Hahn
7faf59a82b Merge pull request #878 from ostcar/change_agenda_items 
Fixed wrong ordering of agenda items after order change
 2013-09-09 02:04:27 -07:00
Oskar Hahn
3bf1f24a4a Fixed wrong ordering of agenda items after order change 
Fixed #875
 2013-09-08 11:17:32 +02:00
Norman Jäckel
404d0fc272 Add on_change_callback to config variables. These callback can be defined in the ConfigVariable object and is called, when the variable is changed. 2013-09-08 11:16:23 +02:00
Oskar Hahn
a28ca8a4a3 Merge remote-tracking branch 'openslides/stable/1.4.x' 
Conflicts:
	openslides/assignment/models.py
 2013-09-07 16:48:55 +02:00
Oskar Hahn
2a9545b19a Merge pull request #873 from normanjaeckel/FixDeleteAssignment 
Fix delete of assignments with related agenda items.
 2013-09-07 07:44:42 -07:00
Norman Jäckel
26607da154 Fix delete of assignments with related agenda items. 2013-09-07 16:33:10 +02:00
Oskar Hahn
b228a02429 Merge remote-tracking branch 'openslides/stable/1.4.x' 2013-09-07 15:42:16 +02:00
Oskar Hahn
5ad3085551 Merge pull request #871 from normanjaeckel/DefaultWidgetSorting 
Add default sorting of widgets. Fix #493
 2013-09-07 06:36:21 -07:00
Oskar Hahn
00c341fc86 Merge pull request #870 from ostcar/fixed_repr_in_widget 
Fixed repr in widget
 2013-09-07 06:23:53 -07:00
Oskar Hahn
afe186add4 Fixed repr in widget 2013-09-07 15:19:03 +02:00
Norman Jäckel
a50617676a Add default sorting of widgets. Fix #493 2013-09-07 15:13:27 +02:00
Oskar Hahn
a7a2547e9e Merge pull request #869 from emanuelschuetze/1.4.2-fixes 
Fixes for motion version and identifier
 2013-09-07 05:41:43 -07:00
Oskar Hahn
611c743364 Merge pull request #868 from normanjaeckel/RelatedItems 
Use GenericForeignKey for agenda related items.
 2013-09-07 05:41:27 -07:00
Emanuel Schuetze
1045f14026 Fixed missing creation time of motion version. 
Show now string if identifier is not set set (in widgets and motion detail).
 2013-09-07 14:31:21 +02:00
Norman Jäckel
c800884a43 Use GenericForeignKey for agenda related items, fix #865 2013-09-07 14:30:25 +02:00
Oskar Hahn
9084216f06 Merge branch 'stable/1.4.x' 2013-09-07 00:15:31 +02:00
Oskar Hahn
61a449cc77 Merge pull request #856 from emanuelschuetze/1.4.2-fixes 
1.4.2 fixes
 2013-09-06 13:03:03 -07:00
Emanuel Schuetze
cb7d54973d Fixed #858: Removed max value (8) of config field "motion_min_supporters". 
Removed supporters signature field in motion pdf to prevent the unused signature fields
which are printed for each required supporters if you have a high minimum supporters number.
 2013-09-06 21:59:54 +02:00
Emanuel Schuetze
48f8e82eda Fixed #859: New config option to disable paragraph numbering in motion pdf 
Default value: disabled
 2013-09-06 21:59:54 +02:00
Emanuel Schuetze
9dcdf67398 Fixed typo in English translation string in djangojs.po. 2013-09-06 21:59:53 +02:00
Emanuel Schuetze
67175042f9 Fixed #857: Use jquery plugin 'bsmSelect' for <select multiple> form elements. 2013-09-06 21:59:52 +02:00