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

339 Commits

Author SHA1 Message Date
Oskar Hahn
34b6ca80f3 Merge branch 'stable/1.6.x' 
Conflicts:
	CHANGELOG
	openslides/users/signals.py
 2015-01-06 13:04:07 +01:00
Oskar Hahn
bcb1ee1213 Tags for motions, agenda items and assignments 2015-01-03 17:00:48 +01:00
Norman Jäckel
dcd8b7a639 Merge branch 'stable/1.6.x' into 'master'. 
Conflicts:
	CHANGELOG
	openslides/agenda/views.py
	openslides/assignment/views.py
	openslides/mediafile/views.py
	openslides/users/views.py
	openslides/utils/views.py
	tests/motion/test_pdf.py
	tests/settings.py
 2015-01-02 22:11:56 +01:00
Norman Jäckel
f6b1a84545 Cleaned up utils.views to increase performance when fetching single objects from the database for a view. Fixed #1378. 2014-12-25 00:02:50 +01:00
Norman Jäckel
4f04223e08 Added Django's application configuration. 
Used customized AppConfig classes in openslides.core, openslides.account,
openslides.projector, openslides.agenda, openslides.motion, openslides.assignment,
openslides.users, openslides.mediafile, openslides.config.

Refactored loading of signals, template signals and slides.
 2014-12-10 17:16:58 +01:00
Norman Jäckel
808aae597f Merge branch 'stable/1.6.x' into 'master'. 
Conflicts:
	CHANGELOG
	openslides/__init__.py
	openslides/assignment/views.py
 2014-12-08 22:17:22 +01:00
Emanuel Schuetze
6df6b92dd7 Fixed #1326 (Rearanged assignment pdf table cells to prevent a LayoutError) 2014-11-28 20:58:19 +01:00
Oskar Hahn
5c6f7a41a8 Merge branch 'stable/1.6.x' 
Conflicts:
	tests/assignment/test_views.py
 2014-10-18 08:53:51 +02:00
Oskar Hahn
c454faef94 Updated Django to 1.7.x 2014-10-14 17:14:52 +02:00
Oskar Hahn
3527b0a75b Refactory of the participant app 
* New user model (used Django's AbstractBaseUser)
* Renamed the app to users
* removed person api

See #861

Fixed #576 #478
 2014-10-12 10:06:54 +02:00
Emanuel Schuetze
2a389b4a7f Fixed #1326: Assignment PDF fails when having a lot of posts. 
Print always 7 signature lines in assingment pdf.
Added test.
 2014-10-10 22:24:28 +02:00
Oskar Hahn
32137b6523 Use python3 
python3.3 and python3.4 are supported
 2014-08-24 21:21:11 +02:00
Emanuel Schuetze
0ebb2eb901 Last template fixes in agenda, motion and assignment list view. 2014-06-01 22:48:15 +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
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
Emanuel Schuetze
99ee335925 Fixed #1158 (Clean up assignment.css) 2014-05-17 21:15:46 +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
Emanuel Schuetze
f651ccf3b9 Fixed #1275 (Creating assignment pdf failed) 2014-05-13 21:39:27 +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
Oskar Hahn
bebd73dde2 Merge pull request #1282 from normanjaeckel/FixWidgets 
Fixed permission error in some widgets.
 2014-05-13 13:00:45 +02:00
Norman Jäckel
9f99ef8a38 Fixed error when creating an assignment poll. Fixed #1203. 2014-05-12 22:58:23 +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
Emanuel Schütze
9c43523f06 Updated translation strings. 
Improved shortcut countdown layout.
 2014-05-04 20:49:05 +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
Emanuel Schütze
579c9d49f0 Fixed #1240 (No assignment poll form fields for votes invalid and votes cast) 2014-04-28 21:57:17 +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
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
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
Norman Jäckel
4c3791a9a8 Merge pull request #1193 from emanuelschuetze/rename-static-files 
Rename and clean up static directories.
 2014-01-16 13:35:38 -08: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
Norman Jäckel
4b63f3a288 Coupled assignment candidates with list of speakers. Fixed #1092. 2014-01-13 15:22:46 +01:00
Oskar Hahn
6409f828d7 Added a poll description field for each assignment poll 
fixed signals in MainMenuTests
 2014-01-12 10:22:38 +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
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
f1fd3208bd Template fixes 
- Agenda overview: Fixed padding of duration column.
- Agenda overview: Optimize header information for small devices with bootstrap's row-fluid class.
- Fixed text align in assignment detail template.
 2013-11-23 15:05:19 +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