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

264 Commits

Author SHA1 Message Date
Oskar Hahn
32137b6523 Use python3 
python3.3 and python3.4 are supported
 2014-08-24 21:21:11 +02:00
Norman Jäckel
2ebd215198 Merge pull request #1321 from emanuelschuetze/template-fixes 
Last template fixes for 1.6
 2014-06-02 18:23:04 +02:00
Emanuel Schuetze
0ebb2eb901 Last template fixes in agenda, motion and assignment list view. 2014-06-01 22:48:15 +02:00
Norman Jäckel
52f7dff0f1 Fixed bug with workflows. Fixed #1309. 2014-05-28 00:20:13 +02:00
Emanuel Schuetze
91ebd719bc Fixed #1311 (Motion poll slides shows wrong value for Abstain vote) 2014-05-22 17:26:38 +02:00
Emanuel Schuetze
431f437ded Fixed motion title in motion list view (#1148). 2014-05-20 20:29:57 +02:00
Norman Jäckel
00eabcb8c8 Changed motion title appearance. Fixed #1148. 2014-05-19 22:42:43 +02:00
Emanuel Schütze
bf8bb31cdb Merge pull request #1298 from emanuelschuetze/fix-995 
Improved html templates for mobile devices (responsive).
 2014-05-19 22:17:26 +02:00
Emanuel Schuetze
6bdfc33182 Motion CSV Import: Create new category if category is unkown. 2014-05-19 20:31:38 +02:00
Roland Geider
e9d52245cb Replace own CKeditor with dedicated app 2014-05-19 00:00:18 +02:00
Emanuel Schuetze
802fde42ce Improved html templates for mobile devices (responsive). 
Fixed #995 (Use responsive navbar for main menu in backend template)
 2014-05-18 22:19:02 +02:00
Norman Jäckel
b16641c0dc Renamed 'permission_required' to 'required_permission' etc. 
Renamed method and attribute of openslides.utils.views.PermissionMixin. Renamed attribute of widgets and main menu entries. Fixed #1160.
 2014-05-15 20:07:09 +02:00
Oskar Hahn
c132346d14 Merge pull request #1284 from normanjaeckel/RefactorConfig 
Changed permission system for config pages.
 2014-05-13 13:03:09 +02:00
Norman Jäckel
c747f09ad0 Changed permission system for config pages. 
Config pages are now only available for users with permission 'config.can_manage'. Fixed #1159.
 2014-05-12 22:56:19 +02:00
Norman Jäckel
ebe8f90d1e Fixed permission error in some widgets. 
Fixed agenda item widget, assignment widget, motion widget, participant user widget and participant group widget. Fixed #1279.
 2014-05-12 22:55:49 +02:00
Andy Kittner
4af6fe1c9a Fix #1253 data table in motion overview displayed incorrectly 2014-05-04 16:40:50 +02:00
Emanuel Schuetze
157d4bdc14 New poll slides for motion and assignment. (Fixed #862) 
Move result table from assignment slide to assignment poll slide.
Use "result" in singular for motion and election results.
 2014-05-02 23:40:23 +02:00
Emanuel Schütze
fa6c7d9d86 Fixed #1102 (New config option to set percent base for polls) 
Use locale format for poll percentage decimal number.
 2014-04-28 21:57:31 +02:00
Norman Jäckel
2a10feecad Added CSV import, fixed #1186. Also cleaned up motion and user CSV import. 2014-04-13 20:35:19 +02:00
Norman Jäckel
e6dad6d087 Merge part of stable/1.5.x into master. 
Conflicts:
	CHANGELOG
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/__init__.py
	openslides/core/templates/base.html
	requirements_production.txt
	tests/config/test_config.py
 2014-04-08 20:33:07 +02:00
Emanuel Schütze
3d7ecab8e4 Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2 
Conflicts:
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/assignment/views.py
	openslides/core/static/img/circle.png
	openslides/motion/pdf.py
	openslides/utils/pdf.py
 2014-04-07 22:35:52 +02:00
Norman Jäckel
c13c0997bf Merge part of stable/1.5.x into master. 
Conflicts:
	openslides/agenda/views.py
	openslides/mediafile/forms.py
	openslides/projector/api.py

The fix from commit 39de1924cb was removed
because of the new widget system in master branch. See GitHub Issue #1191
 2014-04-05 15:19:42 +02:00
Roland Geider
5bac8ec1e4 Correctly handle nested lists in the motion PDF 
See #1217
 2014-03-31 22:07:14 +02:00
Emanuel Schütze
b5fb83c026 Fixed #551: Used unicode font for circle in ballot pdf. Removed pillow. 
That fixed also #1140 (Server error when trying to view ballot paper pdf)
 2014-03-29 13:20:31 +01:00
Norman Jäckel
ee3ec3d4b6 Fixed flake8 errors. 2014-03-27 20:38:13 +01:00
Norman Jäckel
e7f67457db Regrouped config collections and pages. Fixed #1201. 2014-03-13 00:41:57 +01:00
Oskar Hahn
a6fa8457cc Merge remote-tracking branch 'openslides/stable/1.5.x' 
Conflicts:
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/motion/templates/motion/motion_list.html
	openslides/projector/templates/projector.html
	requirements_production.txt
 2014-03-12 19:29:22 +01:00
Norman Jäckel
ce8274fb53 Inserted command line option to translate config strings during database setup. Fixed #460. 2014-01-31 02:03:43 +01:00
Norman Jäckel
d49d087f4e Merge pull request #1208 from ostcar/customslide 
Move projector.models.ProjectorSlide to core.models.CustomSlide
 2014-01-29 04:09:52 -08:00
Oskar Hahn
2392c1ab36 Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
Emanuel Schuetze
d15488478d Fixed #1195: Correct path to circle.png on ballot paper (assignment and motion). 2014-01-27 20:54:32 +01:00
Emanuel Schuetze
13eb0ccb30 Fixed #1190: Wrong sorting of motion identifier 
- Added natural sorting JS plugin for motion DataTables (column identifier).
- Added the new requirements python package 'natsort' for natural sorting of motions in PDF.
 2014-01-21 23:14:39 +01:00
Emanuel Schuetze
d8d2ad002a Rename and clean up static direcories. 
- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files
 2014-01-14 23:27:12 +01:00
Oskar Hahn
c82ee4ce1f Added AbsoluteUrlMixin and used it in any model. 
cleaned up get_absolute_url() in some models
 2014-01-12 00:35:16 +01:00
Oskar Hahn
90f9313faa Use the jsonfield as requirement 2014-01-11 23:01:29 +01:00
Oskar Hahn
ad09a18e3f removed edit and view in get_absolute_view 2014-01-11 17:39:16 +01:00
Norman Jäckel
21ff62dd32 Changes in projector and core app and in utils. 
Changed api for main menu entries.
Enhanced http error pages using a classed based views.
Moved dashboard and select widgets view from projector to core app.
Also some small clean ups.
 2014-01-10 16:17:54 +01:00
Norman Jäckel
9a3243706b Inserted api for the personal info widget. 2013-12-09 12:16:16 +01:00
Norman Jäckel
405fadb6f5 Rename some classes of the poll api. Clean up the poll api. 2013-12-07 00:24:11 +01:00
Norman Jäckel
bdf1679eb0 Rename classes in the config api. 
Also change attributes for config collection without view.
 2013-12-06 10:47:20 +01:00
Oskar Hahn
2cf2774e58 Merge pull request #1139 from DerPate/fix_last_gpl_header 
remove the last occurence of gnu gpl license header fix #1130
 2013-12-02 07:46:09 -08:00
Dominik Breu
a3bf29acf2 remove the last occurence of gnu gpl license header fix #1130 2013-12-01 22:52:08 +01:00
Norman Jäckel
1fb1f17d15 New API for widgets using a metaclass. 
It is now possible to define a default state and to submit extra stylefiles and javascript files when defining a widget in an app. This is done by a new metaclass in openslides.utils.dispatch. Also fixed some other tests.
 2013-12-01 21:30:12 +01:00
Emanuel Schuetze
301bc8ac7c Translate state.name in motion log message. 2013-11-22 15:34:32 +01:00
Emanuel Schuetze
9aed1f764d Fixed a lot of template bugs. 
- agenda overview: Text align right for duration column.
- item summary slide: Show 'get_title_supplement' after each related agenda item.
- item detail view: Add ":" in button after item content_type
- projector: Show <hr> below title/subtitle line.
- motion view: Check manage permission for delete version button in version history table.
- motion detail view: Update version authorized badges and go to buttons.
- motion list: Link warning icon to newest version.
- assignment detail view: Added ballot paper pdf button.
- Group slide and overview: Show members.
- Use dynamic title column width in participants pdf.
- Fixed missing translations in user settings form.
- IE8/9 fix for projector template style.
- Style linebreak and border in h1 title with css.
 2013-11-20 22:05:10 +01:00
Norman Jäckel
31af5c0ce6 Add check for set state view, fix #1080. 2013-11-19 01:06:38 +01:00
Emanuel Schuetze
28271019fd Improved #1023 - Motion csv import: Collect all warnings and errors in one message. 2013-11-18 17:21:21 +01:00
Oskar Hahn
c4c9483b5e Merge pull request #1046 from emanuelschuetze/translation-fix 
Fixed typo (titel->title).
 2013-11-12 05:07:45 -08:00
Emanuel Schuetze
b8e30188ad Fixed #1040: Show only last motion poll results on projector. 2013-11-12 11:13:36 +01:00
Emanuel Schuetze
06b91b89bb Fixed typo (titel->title). 2013-11-12 10:57:07 +01:00