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

1871 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
Emanuel Schuetze
3cfb9b739b Template improvements for tags of agenda items, motions and 
assignments.
 2015-01-05 13:57:37 +01:00
Oskar Hahn
bcb1ee1213 Tags for motions, agenda items and assignments 2015-01-03 17:00:48 +01:00
Oskar Hahn
2951b4b38c Feature: amendments 2015-01-03 15:17:49 +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
8dafa2bfcd Added possibility to hide motions from non staff users in some states. 2015-01-02 19:32: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
Norman Jäckel
750918fe74 Update version to 1.6.2-dev 2014-12-04 15:47:21 +01:00
Norman Jäckel
9a50dab5fc Release 1.6.1 2014-12-04 15:45:19 +01:00
Emanuel Schuetze
6df6b92dd7 Fixed #1326 (Rearanged assignment pdf table cells to prevent a LayoutError) 2014-11-28 20:58:19 +01:00
Emanuel Schuetze
8be1215e12 Updated FR translation. 2014-10-27 20:42:36 +01:00
Norman Jäckel
c89f9bcccd Updated German and Czech language files. 2014-10-26 16:12:20 +01:00
Oskar Hahn
88222857bb Use the new django transaction API 
fixes #1027
 2014-10-19 10:52:48 +02: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
bcd6b9fad4 Merge pull request #1356 from ostcar/poll404 
Returns a 404 response if a requested poll does not exist.
 2014-10-17 19:42:47 +02:00
Oskar Hahn
cb03908a1b Returns a 404 response if a requested poll does not exist. 
fixes #1355
 2014-10-17 07:55:41 +02:00
Norman Jäckel
ff9fedd14f Updated English language files. 2014-10-16 23:28:02 +02:00
Oskar Hahn
c454faef94 Updated Django to 1.7.x 2014-10-14 17:14:52 +02:00
Stefan Frauenknecht
ebadb9078c Bugix in method get_title. Return item no for related objects. 2014-10-12 10:55:56 +02:00
Oskar Hahn
9b381b712e Merge pull request #1341 from frauenknecht/i1324 
Fix #1324 - Agenda item has whitespaces before number.
 2014-10-12 10:31:31 +02:00
Norman Jäckel
af8dead5a3 Fixed motion detail view template. Added block to enable extra content via plugins. Updated CHANGELOG. 2014-10-12 10:23:38 +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
Stefan Frauenknecht
276f76d320 Omit leading zero in method item_no if no agenda prefix is given. 2014-10-10 21:30:22 +02:00
Oskar Hahn
32137b6523 Use python3 
python3.3 and python3.4 are supported
 2014-08-24 21:21:11 +02:00
Emanuel Schuetze
f6d0a96126 Show supporters on motion slide if available. 2014-07-14 22:54:53 +02:00
Emanuel Schuetze
587a3766d2 Fixed participant csv import for group id 
- Allowed to add multiple groups in csv group id field (e.g. "3,4")
- Fixed bug that group ids > 9 can not be imported.
- Updated error message if group id does not exists.
 2014-07-14 22:54:53 +02:00
Emanuel Schuetze
648d5a6ad7 Fixed CKEditor stuff: 
- Added missing insertpre plugin and allow <pre> tag with class
  attribute. Added font style to base.css.
- Removed unused link to old ckeditor.css (now managed by
  django-ckeditor).
 2014-07-14 22:54:53 +02:00
Norman Jäckel
dee81e58b3 Bump version to 2.0a1-dev. 2014-07-14 22:33:54 +02:00
Norman Jäckel
5db47bef76 Update version to 1.6.1-dev 2014-06-02 20:37:51 +02:00
Norman Jäckel
9d40e22783 Release 1.6 2014-06-02 20:37:50 +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
c2ae991fb2 Update help texts in start script. Set x-bit for manage.py. 2014-05-31 12:40:51 +02:00
Oskar Hahn
513000d241 Merge pull request #1316 from normanjaeckel/FixWorkflowBug 
Fixed bug with workflows. Fixed #1309.
 2014-05-28 12:32:12 +02:00
Norman Jäckel
efb6c17903 Added stylesheet to list of speakers overlay. Fixed #1310. 2014-05-28 00:30:33 +02:00
Norman Jäckel
52f7dff0f1 Fixed bug with workflows. Fixed #1309. 2014-05-28 00:20:13 +02:00
Norman Jäckel
c5db1c5e02 Merge pull request #1315 from emanuelschuetze/translations 
Updated final translations for 1.6 (DE, FR, PT, CS)
 2014-05-27 22:45:40 +02:00
Emanuel Schuetze
45c5f13980 Updated final translations for 1.6 (DE, FR, PT, CS) 2014-05-27 21:25:08 +02:00
Emanuel Schuetze
91ebd719bc Fixed #1311 (Motion poll slides shows wrong value for Abstain vote) 2014-05-22 17:26:38 +02:00
Norman Jäckel
769695bf14 Merge pull request #1307 from emanuelschuetze/en-translationfile 
Updated EN translation file for transifex
 2014-05-20 21:59:00 +02:00
Emanuel Schuetze
431f437ded Fixed motion title in motion list view (#1148). 2014-05-20 20:29:57 +02:00
Emanuel Schuetze
f1743a3790 Updated EN translation file for transifex 
String freeze for 1.6.
 2014-05-20 12:33:23 +02:00
Norman Jäckel
7ee5f688ae Update version to 1.6c1-dev 2014-05-19 23:02:39 +02:00
Norman Jäckel
fca8da8ae6 Release 1.6b2 2014-05-19 23:02:39 +02:00
Norman Jäckel
2bfa5f3a72 Prepared for release. 
Small style changes, CHANGELOG and README.rst update.
 2014-05-19 22:55:54 +02:00
Norman Jäckel
f9729fdae3 Merge pull request #1301 from normanjaeckel/MotionTitle 
Changed motion title behavior.
 2014-05-19 22:49:23 +02:00
Norman Jäckel
48471699c2 Merge pull request #1304 from emanuelschuetze/translations 
Updated translations (from transifex).
 2014-05-19 22:48:19 +02:00
Norman Jäckel
00eabcb8c8 Changed motion title appearance. Fixed #1148. 2014-05-19 22:42:43 +02:00
Emanuel Schuetze
715edf8a03 Updated translations (from transifex). 2014-05-19 22:30:50 +02:00
Norman Jäckel
ae99784372 Enabled reload always when DEBUG==True. 2014-05-19 22:29:05 +02:00
Oskar Hahn
22bacd1054 bind the reload of the webserver on the debug settings 
fix #1163
 2014-05-19 22:18:45 +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
Oskar Hahn
16a6ad4a9e Merge pull request #1278 from rolandgeider/ckeditor 
Replace own CKeditor with dedicated app
 2014-05-19 15:15:54 +02:00
Oskar Hahn
0feed94bf6 Merge pull request #1297 from emanuelschuetze/fix-1104 
Fixed #1104 (Enable copy/paste in dashboard widgets)
 2014-05-19 14:58:01 +02:00
Oskar Hahn
53e0a1086d Merge pull request #1294 from emanuelschuetze/fix-1158 
Fixed #1158 (Clean up assignment.css)
 2014-05-19 14:57:17 +02:00
Norman Jäckel
38a4cf1bc3 Merge pull request #1295 from emanuelschuetze/pdf-fix 
PDF: Added missing 'fontName'.
 2014-05-19 09:57:50 +02:00
Norman Jäckel
5dc4742f2f Merge pull request #1291 from emanuelschuetze/fix-1235 
Fixed #1235 (DeprecationWarning in utils.views.PDFView).
 2014-05-19 09:54:45 +02:00
Norman Jäckel
60ba0f6900 Merge pull request #1292 from ostcar/fix_list_of_speaker_on_related_item 
Fixed link to list of speaker on related items.
 2014-05-19 09:50:47 +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
Emanuel Schuetze
6cb99d9128 Fixed #1104 (Enable copy/paste in dashboard widgets) 2014-05-18 20:42:29 +02:00
Emanuel Schuetze
5f202c22a7 PDF: Add missing 'fontName'. 
And set 'registerFontFamily(...)' to use bold/italic in regular paragraphs.
 2014-05-18 13:57:20 +02:00
Emanuel Schuetze
99ee335925 Fixed #1158 (Clean up assignment.css) 2014-05-17 21:15:46 +02:00
Oskar Hahn
3419855a1e Fix link to list of speaker item on related items 
fix #1242
 2014-05-17 14:21:57 +02:00
Emanuel Schuetze
bacc9ca87b Fixed #1235 (DeprecationWarning in utils.views.PDFView) 2014-05-17 13:42:18 +02:00
Oskar Hahn
f0572551b3 Fix default-slide-preview-url 
Fix #1246
 2014-05-17 13:30:37 +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
Norman Jäckel
ecf0e8b0d7 Cleaned up some widgets and the base.css. Removed icon definitions. 2014-05-15 17:23:46 +02:00
Emanuel Schuetze
f651ccf3b9 Fixed #1275 (Creating assignment pdf failed) 2014-05-13 21:39:27 +02:00
Oskar Hahn
86ac16dd14 Merge pull request #1283 from normanjaeckel/FixEnglishString 
Fixed English strings concerning agenda items and organizational items a...
 2014-05-13 13:08:05 +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
Oskar Hahn
e6cbfdf575 Merge pull request #1281 from normanjaeckel/AssignmentPollBug 
Fixed error when creating an assignment poll. Fixed #1203.
 2014-05-13 12:59:58 +02:00
Oskar Hahn
cfea637676 Merge pull request #1277 from emanuelschuetze/fix-mediafileprojector 
Added missing mediafile projector stylefile for pdf.js presentation.
 2014-05-13 12:57:51 +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
43429d4015 Changed some docstrings. 2014-05-12 22:57:57 +02:00
Norman Jäckel
ee82c2c105 Fixed English strings concerning agenda items and organizational items and their relation. Fixed #1271. 2014-05-12 22:56:57 +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 Schuetze
1deaaf241e Added missing mediafile projector stylefile for pdf.js presentation. 2014-05-09 14:03:53 +02:00
Norman Jäckel
d4358d6aae Update version to 1.6b2-dev 2014-05-05 21:30:12 +02:00
Norman Jäckel
a581393b32 Release 1.6b1 2014-05-05 21:28:53 +02:00
Norman Jäckel
1857195812 Updated German translation. 2014-05-05 21:11:09 +02:00
Norman Jäckel
b8cd2d360b Merge pull request #1270 from emanuelschuetze/fix1178 
Adds plugin directory for win32 portable version (Fixed #1178).
 2014-05-05 21:07:51 +02:00
Emanuel Schütze
7add4c5691 Portable: Create empty plugins directory. 
Fixed file permissions.
 2014-05-05 21:01:25 +02:00
Norman Jäckel
7e085be54c Updated English language file. 2014-05-05 20:31:22 +02:00
Norman Jäckel
808715f34f Merge pull request #1262 from emanuelschuetze/fix-1260-1261 
Fix for new percent base choice config (Fixed #1260)
 2014-05-05 20:28:20 +02:00
Emanuel Schütze
5953e58c99 Fixed #1260 (Change description of percent base choices) 2014-05-05 20:21:21 +02:00
Oskar Hahn
921e4ab2bd Merge pull request #1268 from emanuelschuetze/translationstrings 
Updated translation strings.
 2014-05-05 16:15:44 +02:00
Oskar Hahn
9be0409869 Merge pull request #1266 from andkit/issue1253 
Fix #1253 data table in motion overview displayed incorrectly
 2014-05-05 16:14:59 +02:00
Andy Kittner
3584da89c3 Automatically load plugins from portable plugins dir; closes #1178 
All modules/ packages in the openslides/plugins subdirectory of the
portable version will be automatically added to INSTALLED_PLUGINS
 2014-05-05 00:55:22 +02:00
Emanuel Schütze
3ece699cd6 Add get_win32_portable_user_data_path() function in main.py to return 
correct user data path ("/openslides") of portable version.
 2014-05-05 00:55:17 +02:00
Emanuel Schütze
9c43523f06 Updated translation strings. 
Improved shortcut countdown layout.
 2014-05-04 20:49:05 +02:00
Andy Kittner
4af6fe1c9a Fix #1253 data table in motion overview displayed incorrectly 2014-05-04 16:40:50 +02:00
Norman Jäckel
d638d5b7e2 Fixed bug of numbering view when there are orga items. Renamed toRoman to to_roman. 2014-05-04 14:00:28 +02:00
Stefan Frauenknecht
f8bd4b0d86 Numbering of agenda items, part 2. 
Config item agenda_agenda_fixed removed'.
Config items agenda_agenda_fixed and agenda_enable_auto_numbering removed.
FixAgendaView and ResetAgendaView removed. AgendaNumberingView added.
Old two fix- and reset numbering buttons replaced by 'Number agenda items'.
 2014-05-04 13:47:01 +02:00