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

1578 Commits

Author SHA1 Message Date
Oskar Hahn
d644d49579 Cleaned up utils 2013-10-13 20:43:26 +02:00
Emanuel Schuetze
a4d024f45c Some template fixes and improvements: 
- Fixed absoluteurl in motion detail template. Renamed '_edit' to '_update'.
- Fixed wrong projector link ind assigment poll template.
- Improved assignment projector slide.
- Fixed #884: Add PDF note to translation string "Show paragraph numbering"
 2013-10-12 20:29:27 +02:00
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
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
6926630d3e Added Feature for config app, to return the default value for a key 2013-09-29 15:10:01 +02: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
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
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
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 Schuetze
f2829eb173 Updated DE and FR translation (one new translation string). 2013-09-10 20:58:59 +02:00
Emanuel Schuetze
e621335169 Updated English translation file (for new translation string in motion config). 2013-09-10 09:07:12 +02:00
Emanuel Schuetze
0246525a7a Updated DE, FR, CS translation (typo in EN translation string). 2013-09-09 22:12:10 +02: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
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
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
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
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
Emanuel Schuetze
011786d360 Updated CKEditor from 4.1.1 to 4.2. 2013-09-06 21:59:52 +02:00
Emanuel Schuetze
ec61bd8cdc Fixed #854: IE fix for ckeditor's plugin insertpre: 
Removed 'class' attribute to fix viw in IE8+.
Use monospace in insertpre dialog in IE.
Updated German translation file.
 2013-09-06 21:59:50 +02:00
Norman Jäckel
c88d180808 Deletes config cache after each test if it exists. 2013-08-19 18:05:03 +02:00
Oskar Hahn
25bac4a704 Fixed a bug when setting a config var before getting one 2013-08-19 17:59:35 +02:00
Oskar Hahn
20cf960c82 Merge remote-tracking branch 'openslides/stable/1.4.x' 
Conflicts:
	openslides/core/templatetags/tags.py
 2013-08-19 17:54:50 +02:00
Oskar Hahn
1113b6d861 Added template filter 'absolute_url' 2013-08-19 11:21:29 +02:00
Oskar Hahn
99895a28d1 Fix get_absolute_url for deleted persons. 
Fix #845
 2013-08-19 10:50:37 +02:00
Oskar Hahn
967c199a56 Removed utils from INSTALLED_APPS. 
Moved utils.management and utils.templatetags to core
 2013-08-11 09:40:14 +02:00
Oskar Hahn
b8d23164f7 Merge remote-tracking branch 'openslides/stable/1.4.x' 
Conflicts:
	openslides/__init__.py
 2013-07-29 20:52:05 +02:00
Norman Jäckel
1225c5bbb6 Update version to 1.4.2-dev 2013-07-29 20:19:29 +02:00
Norman Jäckel
119fb90bfd Release 1.4.1 2013-07-29 20:17:26 +02:00
Oskar Hahn
b03e8cc06b Fixed #833 2013-07-29 19:45:06 +02:00
Emanuel Schuetze
20d7a3b539 Add paragraph around each motion version warning (to show each warning in one line). 2013-07-29 09:06:36 +02:00
Norman Jäckel
30c3f5ea64 Disable deleting active versions of a motion 2013-07-28 01:14:15 +02:00
Oskar Hahn
b7edee8fdf Merge pull request #836 from ostcar/issue-833 
Fixed tooltip and duration in agenda.
 2013-07-27 15:29:21 -07:00
Oskar Hahn
8743d75d10 Use get_active_version in motion.__unicode__() 
Fixes the bug, that motion.__unicode__() raises an AttributeError, if the active_version
was None.

Fixes #822
 2013-07-27 10:11:28 +02:00
Oskar Hahn
b39cb8e8a4 Fixed tooltip and duration in agenda. 
The tooltip did not show the end of an agenda item, but of the hole event.

If a item was closed, it was not used to calculate the end of the event.

Fixed #833
 2013-07-27 10:02:40 +02:00
Emanuel Schuetze
bb538953ee Added Czech translation (Thanks to Pavel Fric!) 2013-07-26 21:37:58 +02:00
Oskar Hahn
7726fa87a9 Merge pull request #831 from ostcar/issue-823 
Generate poll-urls via model_url
 2013-07-25 14:11:33 -07:00
Norman Jäckel
2128e787bf Start Browser on custom IP, fixed #827 2013-07-25 17:03:04 +02:00
Oskar Hahn
b83b1c49e9 Generate poll-urls via model_url 
Fixed Bug to wrong poll urls
Fixed #823
 2013-07-18 09:50:54 +02:00
Oskar Hahn
ec3db2ffff Prepare OpenSlides master for the next major release 2013-07-18 08:50:08 +02:00
Norman Jäckel
9d01881986 Update version to 1.4.1-dev 2013-07-08 20:08:10 +02:00
Norman Jäckel
304c572f85 Release 1.4 2013-07-08 20:05:31 +02:00
Oskar Hahn
526eeb5cea Merge pull request #818 from ostcar/issue_814 
Fixed #814 Sorting of candidates in the assignment
 2013-07-08 05:27:19 -07:00
Oskar Hahn
47d70d5a73 Fixed #814 Sorting of candidates in the assignment 2013-07-08 14:08:27 +02:00
Oskar Hahn
f2d13e5ec9 Merge pull request #817 from ostcar/master 
Issue 794
 2013-07-08 05:03:40 -07:00
Oskar Hahn
8ebf3f9038 Merge pull request #815 from emanuelschuetze/csv-files 
Updated CSV files with demo data. Minor fixes for motion.
 2013-07-08 04:49:08 -07:00
Oskar Hahn
f39e8dd92e Fixed #794 bug when a non speaking list slide was active, when a projector tab was opend 2013-07-08 13:44:44 +02:00
Emanuel Schuetze
b12fdb09cd Updated German translation (some typos). 2013-07-08 13:40:06 +02:00
Norman Jäckel
d703ef9c4f Rename visual strings of permissions: Add plural s (fix #797). Also update all language files. 2013-07-08 00:03:47 +02:00
Emanuel Schuetze
5bff15762e Motion detail template: Removed category from title (already in meta block) 2013-07-07 23:04:26 +02:00
Emanuel Schuetze
7e5c3f6a27 Removed whitespace in filename of motion pdf (identifier: PrefixNumber). 2013-07-07 22:00:10 +02:00
Oskar Hahn
aca2570cb7 Merge pull request #800 from andkit/portable-improvements 
Portable improvements
 2013-07-06 23:57:00 -07:00
Oskar Hahn
04ee38dcc0 Merge pull request #809 from emanuelschuetze/fixes-1.4 
Fixed #798 and #803
 2013-07-05 08:08:48 -07:00
Emanuel Schuetze
3fadb99ffd Fixed #803 (Groups not translated on user detail view and overview pdf) 2013-07-05 15:49:10 +02:00
Emanuel Schuetze
4625c4731d Updated translation. Fixed #798 (typo in translation of permissions). 2013-07-05 14:51:37 +02:00
Andy Kittner
b568546fb8 Add some explanation to is_portable(); fixes #729 2013-07-04 23:29:56 +02:00
Norman Jäckel
834851acbd Typo in assignment view (fixed #805) 2013-07-04 15:40:47 +02:00
Emanuel Schuetze
5dd65cb173 Fixed motion pdf and template issues: 
- Fixed #790 (Unicode Error while creating motion pdf if motion text contains umlauts and motion is imported from CSV)
- Fixed #742: Added categories and identifier to motion pdf.
- Fixed wrong title order (app title - OpenSlides).
 2013-06-28 12:43:58 +02:00
Emanuel Schuetze
db7e22229e Fixed comments by norman. 2013-06-27 09:20:28 +02:00
Emanuel Schuetze
cf773c34a8 Updated translations. 2013-06-26 21:36:06 +02:00
Oskar Hahn
bf8482fc03 Merge pull request #786 from emanuelschuetze/1.4-fixes 
Some template and doc fixes
 2013-06-26 10:11:28 -07:00
Oskar Hahn
7d1eb5207a Fixes #765. Avoids the django AbstracUser username validator 
Also changed added a white-space in the default username again
 2013-06-26 19:00:52 +02:00
Emanuel Schuetze
64e7cfd98e Some template and doc fixes 
- Fixed #766 (agenda overview parent item look).
- Fixed #767 (Documentation sphinx bootstrap theme: html header)
- Fixed #785 (Enlarged doc screenshots by hover via CSS)
- Updated sphinx-bootstrap-theme to 0.2.4
- Add btn class for agenda end time tooltip
 2013-06-25 22:15:51 +02:00
Norman Jäckel
7dddd70493 Fix whitespaces in translated strings. 2013-06-25 17:44:31 +02:00
Emanuel Schuetze
4a0c40a333 Fixed white projector live view in IE 10 (missing transform-origin). 2013-06-25 14:03:36 +02:00
Norman Jäckel
c3d0c0f852 Update translation source files 2013-06-21 23:36:23 +02:00
Oskar Hahn
00d57e3011 Fixed #463, typo in urls.py 2013-06-21 09:01:56 +02:00
Norman Jäckel
bad64144da Fix translation of messages with additional content 2013-06-20 23:36:23 +02:00
Norman Jäckel
989f6b2d84 Space in Motion Log 2013-06-20 22:37:32 +02: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
08a71c17a3 Fixed #770. Ordering of Users in GroupForm regulated by the config var. 2013-06-20 08:33:55 +02: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
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
Emanuel Schuetze
c450dfb1d5 Fixed typo. 2013-06-17 10:44:55 +02:00
Oskar Hahn
c14302dd6f small translation update 2013-06-16 18:44:14 +02:00
Oskar Hahn
64af0b162f Create admin-user after syncdb 2013-06-16 17:07:55 +02: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
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