ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,722 Commits 6 Branches 42 Tags 64 MiB
719b6ff790
Commit Graph

1339 Commits

Author SHA1 Message Date
Norman Jäckel
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
Norman Jäckel
b310d6077e Move personal info widget to a new app: account. 2013-04-03 00:17:23 +02:00
Norman Jäckel
e3eabada8b Update default groups and permissions. 2013-04-02 15:50:40 +02:00
Norman Jäckel
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
Emanuel Schuetze
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
Oskar Hahn
f5e6f736dc Merge pull request #572 from normanjaeckel/Fileupload_3 
Mediafile (new)
 2013-03-20 03:23:50 -07:00
Norman Jäckel
156acc451f Insert whitespace. Fix docstrings. 2013-03-20 11:17:24 +01:00
Norman Jäckel
d81c3bb1f8 Change order of classes for User and Group 2013-03-18 22:43:46 +01:00
Norman Jäckel
d82bb6ee33 Small modifications. Enhencement of tests. 2013-03-18 22:41:42 +01:00
Norman Jäckel
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
Norman Jäckel
571649d5a6 Fix typo in assignment. 2013-03-18 21:31:24 +01:00
Emanuel Schuetze
4e6818fb1a Compressed jquery-ui files (for agenda config). 2013-03-18 20:22:54 +01:00
Emanuel Schuetze
b3fca8f6f2 Updated bootstrap from 2.2.2 to 2.3.1 2013-03-18 20:19:17 +01:00
Oskar Hahn
3832aa4178 Tests for the motion views 2013-03-15 12:18:27 +01:00
Oskar Hahn
c46ec570bf Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-03-15 02:16:26 +01:00
Oskar Hahn
81eb92a761 fixed pep8 2013-03-15 02:14:15 +01:00
Oskar Hahn
1a2ebf7b3b removed some unused functions 2013-03-15 01:34:17 +01:00
Emanuel Schuetze
d180b4f331 Reverted support/unsupport changes (question) 2013-03-14 23:45:17 +01:00
Emanuel Schuetze
20118ae833 Improved version.get command 2013-03-14 23:35:57 +01:00
Emanuel Schuetze
2a2c704bf2 GetVersionMixin not required. Fixed htmldiff function. 2013-03-14 23:26:41 +01:00
Emanuel Schuetze
3f4df58807 Moved htmldiff function to utils.py. Fixed travis build error (pep8). 2013-03-14 23:22:11 +01:00
Emanuel Schuetze
49765bbe6e Merge remote branch 'upstream/master' into motiontemplate 2013-03-14 23:05:38 +01:00
Emanuel Schuetze
b2dc3820bd Changed motion.number to motion.identifier. 2013-03-14 23:04:32 +01:00
Emanuel Schuetze
88a32dc546 Updated motion version warnings (not latest/authorized version) 2013-03-14 22:56:25 +01:00
Emanuel Schuetze
73430e45d8 Changed style for empty category table. 2013-03-14 22:54:33 +01:00
Emanuel Schuetze
fa098f6bd3 Typo. 2013-03-14 22:54:00 +01:00
Oskar Hahn
43cd5aba00 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-03-14 22:44:11 +01:00
Oskar Hahn
63932a348e Merge pull request #561 from emanuelschuetze/datatables-participants 
Datatables for participants table (reworked)
 2013-03-14 14:40:01 -07:00
Emanuel Schuetze
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
Oskar Hahn
545d4be04f fixed update of person_api 2013-03-14 22:32:00 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
a1a11ff53c New motion version diff view. Improved version history table in motion detail template. 2013-03-14 21:28:03 +01:00
Oskar Hahn
2944b6ded3 fixed travis 2013-03-13 00:29:53 +01:00
Oskar Hahn
71b9bd0a08 dont set identifier prefix, if it is empty 2013-03-12 23:54:37 +01:00
Oskar Hahn
b2c888b151 set identifier 2013-03-12 23:35:08 +01:00
Oskar Hahn
304887e8f3 Changed comlex workflow automaticly set the identifier 2013-03-12 22:13:17 +01:00
Oskar Hahn
d21185a449 Merge branch 'master' of github.com:OpenSlides/OpenSlides into category 2013-03-12 22:05:20 +01:00
Oskar Hahn
9cd69f59e0 Motion Identifier 2013-03-12 22:03:56 +01:00
Norman Jäckel
03fff46517 Add new TestCase class in utils to call the signal on running every test. 2013-03-12 21:38:22 +01:00
Norman Jäckel
9679be1867 Move builtin groups to a signal. 2013-03-12 20:58:22 +01:00
Emanuel Schuetze
196ad217b0 Fixed version history. 2013-03-11 23:58:45 +01:00
Emanuel Schuetze
d41ce146e2 Added category_delete function to template. 2013-03-11 21:50:16 +01:00
Emanuel Schütze
db97d3c312 Merge pull request #2 from ostcar/category 
Category Delete View
 2013-03-11 13:45:54 -07:00
Oskar Hahn
31ba70efd1 Category Delete View 2013-03-11 21:38:07 +01:00
Norman Jäckel
514577f7c6 Built-in Workflows are created by listening to a signal which is sent after syncdb. 2013-03-11 21:32:09 +01:00
Emanuel Schuetze
d9fbaf9aa7 Updated motion category template. 2013-03-11 21:29:56 +01:00
Emanuel Schütze
ff848a865a Merge pull request #1 from ostcar/category 
Category
 2013-03-11 12:46:42 -07:00
Oskar Hahn
f411040c3a Append missing files 2013-03-11 20:43:23 +01:00
Oskar Hahn
bc7be27131 Add CategoryFormField to the MotionForm 2013-03-11 20:41:02 +01:00
Oskar Hahn
2614a1cb2f Categories for Motions 2013-03-11 20:17:19 +01:00
Emanuel Schuetze
1b93cec209 Merge remote branch 'upstream/master' 
Conflicts:
	openslides/motion/models.py
 2013-03-11 19:16:16 +01:00
Emanuel Schuetze
42c847dfba Update motion templates to new template design. Added some missing model and view functions. 2013-03-11 18:26:22 +01:00
Emanuel Schuetze
5c70b4a044 Update after comments: Removed user context var. Removed condition in unupport state check. 2013-03-11 16:56:56 +01:00
Emanuel Schuetze
ee0e599a6c Update motion templates to new template design. Added some missing model and view functions. 2013-03-09 14:29:40 +01:00
Emanuel Schuetze
71b1bede6f Set new button als primary/blue button. 2013-03-09 14:17:30 +01:00
Emanuel Schuetze
c3c200b423 Changed link to new csv import wiki page on github. 2013-03-09 14:16:28 +01:00
Emanuel Schuetze
48e1282cb9 Show duration clock only if start/end time is set. 2013-03-09 14:15:03 +01:00
Emanuel Schuetze
56a510e89c Removed link to professional support in base template (footer). 2013-03-08 08:31:52 +01:00
Oskar Hahn
51a9e41015 Set new django setting. Put tornado code in a seperate file. 2013-02-27 18:54:06 +01:00
Oskar Hahn
757b97e4cb Merge pull request #542 from frauenknecht/master 
Issue #539 Default config value in agenda app
 2013-02-22 03:54:30 -08:00
Stefan Frauenknecht
45856fc9b0 add signal callback to provide defaults 2013-02-20 23:50:34 +01:00
Stefan Frauenknecht
f81abe215f Revert last changes 2013-02-20 23:48:04 +01:00
Stefan Frauenknecht
343aa018e4 Fixed Issue #539 - Default config value in agenda app 2013-02-20 22:09:40 +01:00
Norman Jäckel
03d57d17b0 Fix state attributes in motion pdf. 2013-02-19 23:43:20 +01:00
Norman Jäckel
6b71142747 Recover commit 6a639fe498 2013-02-18 22:08:21 +01:00
Oskar Hahn
853dcf8334 fixed pep8 2013-02-18 20:06:46 +01:00
Oskar Hahn
f388f3d41a handle static files with tornado 2013-02-18 19:58:18 +01:00
Oskar Hahn
2822c39f8a Merge branch 'master' into tornado 2013-02-18 19:08:58 +01:00
Oskar Hahn
ce1e1c112f fixed pep8 2013-02-18 18:59:24 +01:00
Oskar Hahn
4f3f917812 some small code design changes 2013-02-18 18:56:37 +01:00
Oskar Hahn
cb5b735565 Merge branch 'master' into HEAD 2013-02-18 18:34:52 +01:00
Oskar Hahn
051723e686 Merge branch 'master' of github.com:OpenSlides/OpenSlides 
Conflicts:
	openslides/motion/models.py
	openslides/motion/workflow.py
 2013-02-18 18:31:35 +01:00
Norman Jäckel
2603d93d69 Fix PEP8 and tests. 2013-02-17 17:07:44 +01:00
Stefan Frauenknecht
1d1d72d45a Fixed if condition with duration property which can be None 2013-02-16 11:55:40 +01:00
Stefan Frauenknecht
8103c09b81 PEP8 errors resolved 2013-02-16 10:41:22 +01:00
Emanuel Schuetze
0b3b91b8d5 Show item-tooltip in bootstrap tooltip style. 2013-02-15 08:51:08 +01:00
Emanuel Schuetze
4f60160667 Added missing success_url_name. 2013-02-15 08:50:42 +01:00
Emanuel Schuetze
e9c996340a Used custom build jquery-ui javascript components file. Integrated required jquery-ui styles (no remote link). Added used jquery components/addons to THANKS file. 2013-02-15 08:39:36 +01:00
Norman Jäckel
8363b06fc1 Move motion exceptions to its own file in the motion app. 2013-02-14 19:27:36 +01:00
Norman Jäckel
2e37e4c18b Comment the dev-file workflow.py 2013-02-14 11:16:46 +01:00
Norman Jäckel
f2dde228c9 Work on motion workflow system. 
Also: Insert new base exception for OpenSlides.

Also: Insert a workflow field to the state class. Update tests. Rename versioning attribute.
 2013-02-13 23:04:24 +01:00
Emanuel Schuetze
e3428d3e83 Some style work. 2013-02-11 23:01:48 +01:00
Emanuel Schuetze
e101fb8212 Merge branch 'master' into agenda-orga-items 
Conflicts:
	openslides/agenda/static/styles/agenda.css
	openslides/agenda/templates/agenda/config.html
	openslides/agenda/templates/agenda/item_row.html
	openslides/agenda/templates/agenda/overview.html
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/static/styles/base.css
	requirements.txt
 2013-02-11 22:36:19 +01:00
Emanuel Schuetze
a51a296434 Changed agenda start/end time to djangos DATETIME_FORMAT. 2013-02-09 22:59:15 +01:00
Oskar Hahn
6a639fe498 Add todos 2013-02-06 11:11:49 +01:00
Oskar Hahn
5573077b88 fixed pep8 2013-02-06 09:34:44 +01:00
Oskar Hahn
27c73092e1 Merge remote-tracking branch 'emanuel/newtemplate' into new_motion 
Conflicts:
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
 2013-02-06 09:25:27 +01:00
Emanuel Schuetze
ce51f0ef7e template: minor style changes 2013-02-05 23:42:30 +01:00
Emanuel Schuetze
6b4ee0e4f6 Updated translation. 2013-02-05 23:09:23 +01:00
Emanuel Schuetze
c8ddb21760 Fixed wrong hiding of open agenda child items if parent item is closed 2013-02-05 22:36:05 +01:00
Emanuel Schuetze
e49efb40d8 template: Added new css class for minimum column width. 2013-02-05 22:03:43 +01:00
Emanuel Schuetze
bfd01e67b6 template: Removed unused 'cycle' template tag. 2013-02-05 21:55:41 +01:00
Emanuel Schuetze
d809ff95bb template: Removed unused participant.css 2013-02-05 21:51:09 +01:00
Emanuel Schuetze
64e3c1f3cb template: Removed unused 'load staticfiles'. 2013-02-05 21:41:26 +01:00
Emanuel Schuetze
8388774f12 template: Minor style changes. 2013-02-05 21:33:07 +01:00
Emanuel Schuetze
82e35bebff Fixed wrong deletion if user clicks "no" in confirm form. 2013-02-05 21:31:45 +01:00
Emanuel Schuetze
0c5459f96e template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes. 2013-02-05 20:40:55 +01:00
Oskar Hahn
042f1a8571 Fixed typo 2013-02-05 18:49:32 +01:00
Oskar Hahn
a08cf84ab8 Wrote docstrings to the motion app 2013-02-05 18:46:46 +01:00
Emanuel Schuetze
8f05ada6a1 template style and new icons 2013-02-05 17:05:40 +01:00