Commit Graph

2602 Commits

Author SHA1 Message Date
Norman Jäckel
79577c9b8e Merge pull request #1435 from ostcar/fix_assignment_poll_view
Fixed AssignmentPollUpdateView.
2015-01-25 19:04:47 +01:00
Oskar Hahn
c7b52245b7 Fix AssignmentPollUpdateView 2015-01-25 15:15:28 +01:00
Norman Jäckel
ea0b8e584f Merge pull request #1420 from normanjaeckel/Release_1.7b1
Release 1.7b1
2015-01-21 21:14:21 +01:00
Norman Jäckel
33c4562e62 Updated version to 1.7 2015-01-21 20:58:03 +01:00
Norman Jäckel
136f57057f Release 1.7b1 2015-01-21 20:58:03 +01:00
Norman Jäckel
8080096050 Updated CHANGELOG. 2015-01-21 20:58:03 +01:00
Norman Jäckel
fb0600809c Merge pull request #1421 from normanjaeckel/FixChatbox
Fixed bug in chatbox.
2015-01-21 20:57:05 +01:00
Norman Jäckel
afc2b246db Fixed bug in chatbox. 2015-01-21 17:24:39 +01:00
Norman Jäckel
814a75839a Merge pull request #1418 from emanuelschuetze/translations-1.7
Updated translations (DE, FR, CS, PT) for 1.7.
2015-01-21 16:27:10 +01:00
Emanuel Schuetze
6cbec7a32a Updated translations (DE, FR, CS, PT) for 1.7. 2015-01-21 15:59:27 +01:00
Oskar Hahn
9fc07125f1 Merge pull request #1417 from emanuelschuetze/fix-1415
Show special characters in PDF, like "&". (Fixed #1415)
2015-01-21 14:35:09 +01:00
Emanuel Schuetze
4296fb0360 Show special characters in PDF, like "&". (Fixed #1415)
Added escape function for agenda, motion, assignment and participants
pdf views.
2015-01-21 13:03:03 +01:00
Oskar Hahn
c890fd138a Merge pull request #1414 from normanjaeckel/UpdateMetadata
Update metadata files and copyright notes.
2015-01-20 19:54:27 +01:00
Norman Jäckel
0351d8982f Update metadata files and copyright notes. 2015-01-20 14:42:41 +01:00
Oskar Hahn
b6a82c961a Merge pull request #1404 from normanjaeckel/Changelog
Updated Changelog.
2015-01-17 10:24:44 +01:00
Norman Jäckel
46f6a3f14e Updated Changelog. 2015-01-17 10:21:22 +01:00
Norman Jäckel
82f46708f6 Merge pull request #1397 from emanuelschuetze/haystack-fix
Fixed haystack indexing problem for m2m objects.
2015-01-17 00:21:45 +01:00
Norman Jäckel
9b89e10cc7 Merge pull request #1398 from emanuelschuetze/portable-install-script
Improved portable install script.
2015-01-17 00:20:49 +01:00
Emanuel Schuetze
fd266a4e45 Fixed AttributeError in chatbox on_open method.
Fixed TODO and updated get session method for session key.
2015-01-16 23:41:46 +01:00
Emanuel Schuetze
3127048be5 Fixed haystack indexing problem for m2m objects.
Updated django-haystack to <2.4.
2015-01-16 23:07:56 +01:00
Oskar Hahn
5d0737f656 Merge pull request #1396 from DebVortex/feature/update-pdfjs
Updated pdf.js to 1.0.907
2015-01-16 22:37:49 +01:00
Max Brauer
f0af21103c Updated pdf.js to 1.0.907 2015-01-16 22:16:31 +01:00
Oskar Hahn
83a0844a0e Merge pull request #1399 from emanuelschuetze/translationstrings-1.7
Fixed missing translation strings.
2015-01-16 20:49:40 +01:00
Emanuel Schuetze
a9468cb0a4 Fixed missing translation strings. 2015-01-16 14:25:34 +01:00
Oskar Hahn
dac781d8aa Merge pull request #1395 from normanjaeckel/Fix1394
Fixed bug. Projector was not updated when an object was deleted.
2015-01-15 21:14:22 +01:00
Emanuel Schuetze
ec7fa0eea3 Install all portable packages from requirements_production.txt. 2015-01-14 22:14:34 +01:00
Norman Jäckel
3ba86a6441 Updated English language files. 2015-01-11 19:04:21 +01:00
Norman Jäckel
3ec55daaf9 Fixed bug. Projector was not updated when an object was deleted. Fixex #1394. 2015-01-11 18:43:05 +01:00
Norman Jäckel
adefb49457 Merge pull request #1393 from emanuelschuetze/bsmselect-updated
Reduce the usage of bsmselect jquery plugin.
2015-01-09 22:17:00 +01:00
Emanuel Schuetze
91cef13326 Improve the usage of bsmselect jquery plugin.
Allow to disable the plugin for defined <select multiple> form fields
with extra css class 'dont_use_bsmselect'. (E.g. not for the group form
fields permissions and users.)

Partly fixed changes from pull request #1381.
2015-01-08 10:58:25 +01:00
Oskar Hahn
088216b320 Merge pull request #1388 from emanuelschuetze/motion-tags-updated
Template improvements for tags of agenda items, motions and assignments
2015-01-05 17:30:09 +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
d0d674601d Merge pull request #1381 from ostcar/motion-tags
Tags for motions
2015-01-05 13:55:26 +01:00
Oskar Hahn
bcb1ee1213 Tags for motions, agenda items and assignments 2015-01-03 17:00:48 +01:00
Oskar Hahn
e42345b3d1 Merge pull request #1380 from ostcar/amendments
Feature: amendments
2015-01-03 15:22:10 +01:00
Oskar Hahn
2951b4b38c Feature: amendments 2015-01-03 15:17:49 +01:00
Norman Jäckel
a93e5aa785 Merge pull request #1377 from normanjaeckel/WorkflowAndPermissions
Hide motions from non staff users in early workflow state.
2015-01-02 21:03:12 +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
b9efa7fff1 Merge pull request #1379 from normanjaeckel/FixGetObject
Cleaned up utils.views (especially get_object() method).
2014-12-25 00:07:25 +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
Emanuel Schütze
75b28847d5 Merge pull request #1368 from normanjaeckel/Release-1.6.1
Release 1.6.1
2014-12-08 21:08:35 +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
Norman Jäckel
35e31874a1 Updated CHANGELOG. 2014-12-04 15:42:35 +01:00
Norman Jäckel
d608dd3095 Merge pull request #1373 from emanuelschuetze/fix-1326-b
Fixed #1326: Rearranged assignment pdf table cells to prevent a LayoutError.
2014-12-04 15:40:16 +01:00
Emanuel Schuetze
6df6b92dd7 Fixed #1326 (Rearanged assignment pdf table cells to prevent a LayoutError) 2014-11-28 20:58:19 +01:00
Norman Jäckel
b9842ecf94 Merge pull request #1367 from emanuelschuetze/fr-translation
Updated FR translation.
2014-10-27 21:21:29 +01:00
Norman Jäckel
ba34fa5121 Merge pull request #1366 from emanuelschuetze/portable-readme
Added version numbers of required packages to portable build instruction...
2014-10-27 21:19:49 +01:00
Norman Jäckel
0471be3d1e Merge pull request #1365 from emanuelschuetze/fix-1354
Fixed #1354: Added CKEditor plugin insterpre to README.
2014-10-27 21:18:26 +01:00
Emanuel Schuetze
8be1215e12 Updated FR translation. 2014-10-27 20:42:36 +01:00