e40a2e9332
Restart tornado on file changes, respect port and adress flags
2013-04-03 23:20:56 +02:00
e7def39323
Merge pull request #582 from normanjaeckel/AgendaConfigJSFix
...
Moved javascript code for agenda config into extra file.
2013-04-03 10:21:08 -07:00
ab280d7feb
Merge pull request #583 from normanjaeckel/UpdateTests
...
Update tests to extend test cover by coverage
2013-04-03 10:18:13 -07:00
5d472b274a
Update tests to extend test cover by coverage
2013-04-03 17:55:30 +02:00
623cf60adf
Moved javascript code for agenda config into extra file. Moved translation to correct area for javascript files.
2013-04-03 14:51:19 +02:00
a75c390bc5
Merge pull request #579 from normanjaeckel/AccountPersonalWidget
...
Move personal info widget to a new app: account.
2013-04-02 15:19:23 -07:00
b310d6077e
Move personal info widget to a new app: account.
2013-04-03 00:17:23 +02:00
07535bd639
Merge pull request #578 from normanjaeckel/UpdatingDefaultGroups
...
Update default groups and permissions
2013-04-02 11:03:05 -07:00
e3eabada8b
Update default groups and permissions.
2013-04-02 15:50:40 +02:00
c0532def79
Merge pull request #573 from normanjaeckel/ConfigRebase1
...
New config app. Apps only have to define config vars once. Config pages,...
2013-03-28 08:01:21 -07:00
e1b149cde3
New config app. Apps only have to define config vars once. Config pages, forms and so on are created automaticly.
...
Changes after some reviews are done.
Problematic is still that the JS can not be moved to an extra file because of the template tags in the code.
2013-03-28 15:31:13 +01:00
d424176def
Merge pull request #571 from emanuelschuetze/qrcode
...
New feature: qr-code for system url on participants password pdf.
2013-03-22 23:42:44 -07:00
71ac7a1cdb
New feature: qr-code for system url on participants password pdf.
...
(Note: New dependency! Run 'pip install qrcode')
Fixed pep8 issues. Create qr-code image for system url one time only.
New feature: qr-code for system url on participants password pdf.
(Note: New dependency! Run 'pip install qrcode')
Fixed pep8 issues. Create qr-code image for system url one time only.
Print qrcode image from StringIO stream.
Adapted table stylesheet for better integration of reportlab's Image object.
Fixed pep8 issue.
Made qrcode import as optional feature. Fixed pep8 issue.
2013-03-22 14:35:40 +01:00
f5e6f736dc
Merge pull request #572 from normanjaeckel/Fileupload_3
...
Mediafile (new)
2013-03-20 03:23:50 -07:00
156acc451f
Insert whitespace. Fix docstrings.
2013-03-20 11:17:24 +01:00
afdb09f825
Merge pull request #570 from emanuelschuetze/master
...
Updated bootstrap and jquery-ui compressed files
2013-03-18 14:56:05 -07:00
d81c3bb1f8
Change order of classes for User and Group
2013-03-18 22:43:46 +01:00
d82bb6ee33
Small modifications. Enhencement of tests.
2013-03-18 22:41:42 +01:00
ad0e157bd1
Insert new app to upload files via the frontend. Let tornado server media files. Insert icon-mediafile css class. Insert extra_stylfiles context variable.
2013-03-18 21:44:02 +01:00
571649d5a6
Fix typo in assignment.
2013-03-18 21:31:24 +01:00
4e6818fb1a
Compressed jquery-ui files (for agenda config).
2013-03-18 20:22:54 +01:00
b3fca8f6f2
Updated bootstrap from 2.2.2 to 2.3.1
2013-03-18 20:19:17 +01:00
246c7a456a
Merge pull request #569 from ostcar/motion_tests
...
Motion tests
2013-03-15 04:39:28 -07:00
3832aa4178
Tests for the motion views
2013-03-15 12:18:27 +01:00
c46ec570bf
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-15 02:16:26 +01:00
2134b0985f
Merge pull request #568 from ostcar/motion_template
...
Motion template
2013-03-14 18:15:54 -07:00
81eb92a761
fixed pep8
2013-03-15 02:14:15 +01:00
1a2ebf7b3b
removed some unused functions
2013-03-15 01:34:17 +01:00
d180b4f331
Reverted support/unsupport changes (question)
2013-03-14 23:45:17 +01:00
20118ae833
Improved version.get command
2013-03-14 23:35:57 +01:00
2a2c704bf2
GetVersionMixin not required. Fixed htmldiff function.
2013-03-14 23:26:41 +01:00
3f4df58807
Moved htmldiff function to utils.py. Fixed travis build error (pep8).
2013-03-14 23:22:11 +01:00
49765bbe6e
Merge remote branch 'upstream/master' into motiontemplate
2013-03-14 23:05:38 +01:00
b2dc3820bd
Changed motion.number to motion.identifier.
2013-03-14 23:04:32 +01:00
88a32dc546
Updated motion version warnings (not latest/authorized version)
2013-03-14 22:56:25 +01:00
73430e45d8
Changed style for empty category table.
2013-03-14 22:54:33 +01:00
fa098f6bd3
Typo.
2013-03-14 22:54:00 +01:00
43cd5aba00
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-14 22:44:11 +01:00
63932a348e
Merge pull request #561 from emanuelschuetze/datatables-participants
...
Datatables for participants table (reworked)
2013-03-14 14:40:01 -07:00
0587c2019a
Integrated DataTables function for participants table (for client side sorting/filtering/pagination). Removed old server side sorting/filtering code.
...
Fixed csv import (added success url).
Added large csv file for testing import of >1000 participants.
Removed lage csv example file for paticipants (will be sustitute by a test script in future).
2013-03-14 22:34:40 +01:00
545d4be04f
fixed update of person_api
2013-03-14 22:32:00 +01:00
247f6c9431
Merge remote branch 'upstream/master' into motiontemplate
...
Conflicts:
openslides/motion/models.py
openslides/motion/views.py
2013-03-14 21:36:02 +01:00
a1a11ff53c
New motion version diff view. Improved version history table in motion detail template.
2013-03-14 21:28:03 +01:00
0065452d29
Merge pull request #564 from ostcar/category
...
fixed travis
2013-03-12 16:51:55 -07:00
2944b6ded3
fixed travis
2013-03-13 00:29:53 +01:00
2a33210276
Merge pull request #563 from ostcar/category
...
Category
2013-03-12 15:56:18 -07:00
71b9bd0a08
dont set identifier prefix, if it is empty
2013-03-12 23:54:37 +01:00
b2c888b151
set identifier
2013-03-12 23:35:08 +01:00
304887e8f3
Changed comlex workflow automaticly set the identifier
2013-03-12 22:13:17 +01:00
d21185a449
Merge branch 'master' of github.com:OpenSlides/OpenSlides into category
2013-03-12 22:05:20 +01:00
Roland Geider