Commit Graph

2558 Commits

Author SHA1 Message Date
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
Oskar Hahn 349575e6e4 Merge pull request #1273 from normanjaeckel/Docstrings
Changed some docstrings.
2014-05-13 12:56:29 +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
Norman Jäckel 8b2723e846 Merge pull request #1285 from normanjaeckel/Natsort
Update natsort dependency.
2014-05-12 22:55:02 +02:00
Norman Jäckel e6dc63578c Update natsort dependency.
Drop natsort 3.1.2 because the package seems broken.
2014-05-12 22:29:59 +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 7edeb5d3fc Merge pull request #1258 from normanjaeckel/Release_1.5b1
Release 1.6b1 (not 1.5b1)
2014-05-05 21:41:57 +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 ee9e2729d1 Updated CHANGELOG, README.rst, requirements files, .travis.yml and setup.py. 2014-05-05 21:25:17 +02:00
Norman Jäckel a79abb1eed Merge pull request #1272 from normanjaeckel/Translation
Updated German translation.
2014-05-05 21:23:52 +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 78c0ee0a3a Merge pull request #1269 from normanjaeckel/Translation
Updated English language file.
2014-05-05 20:39:40 +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 09757f4f0d Update copyright to 2014 2014-05-05 00:55:36 +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
Norman Jäckel 4620b0d22a Merge pull request #1254 from normanjaeckel/AgendaNumbering
Agenda numbering
2014-05-05 00:42:39 +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
Norman Jäckel 5254cc83a6 Updated numbering feature.
Fixed organizational item structuring. Prevented organizational items
from having agenda items as descendents. Some coding style changes.
Added CHANGELOG and README entries.
2014-05-04 13:47:01 +02:00
Stefan Frauenknecht 2c5b3a8e4f Automatic numbering of agenda items 2014-05-04 13:47:01 +02:00
Norman Jäckel 943ede2e81 Merge pull request #1264 from normanjaeckel/Translation
Updated English language files.
2014-05-03 00:03:35 +02:00
Norman Jäckel 1fbd77e701 Updated English language files. 2014-05-02 23:53:51 +02:00
Norman Jäckel deff477018 Merge pull request #1232 from emanuelschuetze/pollslide-862
Pollslide for motion and assignment (Fixed #862)
2014-05-02 23:47:54 +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
Norman Jäckel 6521d6b095 Merge pull request #1259 from normanjaeckel/Translation
Updated English language files.
2014-04-29 00:02:52 +02:00
Norman Jäckel 84f9963bea Updated English language files. 2014-04-28 23:45:44 +02:00
Norman Jäckel c1c952c136 Merge pull request #1257 from emanuelschuetze/projector-logo
Use right projector logo (as in stable/1.5.x branch).
2014-04-28 22:21:11 +02:00
Emanuel Schütze 1fc0803846 Merge pull request #1248 from emanuelschuetze/fix-1102
New poll config option for 100% base (fixed #1102 and #1240)
2014-04-28 22:08:40 +02:00
Emanuel Schütze 945771e8a6 Use right projector logo (as in stable/1.5.x branch). 2014-04-28 22:07:06 +02:00
Oskar Hahn f3bdae6b3b Merge pull request #1256 from emanuelschuetze/portable
Updated required packages and portable
2014-04-28 21:59:06 +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 87cd81f1ff Updated packages in requirements_production.txt and prepare_portable.py
Added new license files of packages for portable version.
2014-04-28 21:30:39 +02:00