Commit Graph

219 Commits

Author SHA1 Message Date
Oskar Hahn
07e9d8e9f9 rewrote application filters 2012-04-18 19:57:39 +02:00
Emanuel Schuetze
7eb410f093 #104: Application submenu. 2012-04-18 19:50:51 +02:00
Emanuel Schuetze
ee4d7da04a #105: Show Ballot number for applications. Some application PDF work. Set default config values. 2012-04-18 19:30:32 +02:00
Oskar Hahn
9f70b2ff1c rename ballout def in application and assignment 2012-04-18 19:02:41 +02:00
Emanuel Schuetze
3812b5ebd1 #103: Set application filename. 2012-04-18 18:54:48 +02:00
Oskar Hahn
a3d7cc98a9 #110 error in application pdf printing 2012-04-17 17:47:37 +02:00
Oskar Hahn
189cfa1309 translate poll values 2012-04-17 17:35:50 +02:00
Oskar Hahn
0a8d40e2ac slideUp read messages 2012-04-17 14:45:25 +02:00
Oskar Hahn
da8c3c0bba show pollresults in application projector 2012-04-16 17:21:41 +02:00
Oskar Hahn
534a81c46c rewrote projector_messages system. Recalled it projector_overlay and added a special overlay for unique messages 2012-04-16 16:35:30 +02:00
Emanuel Schuetze
84731a07d5 Updated application view submenu. 2012-04-15 16:13:26 +02:00
Oskar Hahn
91c9e1e9ab some fixes 2012-04-15 13:10:24 +02:00
Oskar Hahn
6f0fd91ec2 some permission problems 2012-04-15 12:52:59 +02:00
Emanuel Schuetze
4d7940cb12 Automated merge with ssh://openslides.org/openslides 2012-04-15 12:39:35 +02:00
Emanuel Schuetze
95d5929449 Added participant and version config page. Moved system settings to general. Some style work. 2012-04-15 12:39:28 +02:00
Oskar Hahn
d4d91c8194 fixed printing applications 2012-04-15 12:11:03 +02:00
Oskar Hahn
f4ed79b68d Application view: added link to edit a poll 2012-04-15 11:48:31 +02:00
Oskar Hahn
bf5ae10552 remove Application.poll. projector slide 2012-04-15 11:39:38 +02:00
Oskar Hahn
5678d9dd5e deactivate supporters by default 2012-04-15 11:35:06 +02:00
Emanuel Schuetze
b1c86d4c19 Import template pages: Link to wiki page. 2012-04-15 10:07:45 +02:00
Emanuel Schuetze
09d2c3112d Minor fixes. 2012-04-14 19:14:51 +02:00
Oskar Hahn
92d2b1db60 ballot methode for AssignmentPoll and ApplicationPoll 2012-04-14 17:09:15 +02:00
René Köcher
f674897505 Split static files in application specific directories and use django 1.4 staticfiles app. 2012-04-14 14:51:56 +02:00
Oskar Hahn
535795391d remove default permission after syncdb 2012-04-14 14:31:09 +02:00
Oskar Hahn
6f377453bc rename system in config. Add default config in each apps 2012-04-14 12:52:56 +02:00
Oskar Hahn
c0bf5ba822 Automated merge with ssh://openslides.de/openslides 2012-04-14 11:18:54 +02:00
Oskar Hahn
491c65cf24 use app name for projector category 2012-04-14 11:18:47 +02:00
Emanuel Schuetze
4abd79e7b5 Added PDF document title. 2012-04-14 10:54:22 +02:00
René Köcher
7e12e1d5e2 Support for localized permissions on top of the untranslated django model. 2012-04-14 09:28:28 +02:00
Emanuel Schuetze
3817a03aa8 Automated merge with ssh://openslides.org/openslides 2012-04-13 23:52:48 +02:00
Emanuel Schuetze
698697a75c Applications: Moved pdf functions from pdf.py to new PDF view in views.py. 2012-04-13 23:52:34 +02:00
René Köcher
cdf3628e8b Check input files for UTF-8 encoding and display an appropriate error if not. 2012-04-13 22:33:47 +02:00
René Köcher
113d258b3d #85: New import option: set status of all imported applications to 'permit' 2012-04-13 21:55:13 +02:00
Emanuel Schuetze
a1c5766e7a Adjusted app prefix in urls.py (outsource in global urls.py). Some code formatting. 2012-04-13 21:43:16 +02:00
Oskar Hahn
bb430fd2a7 remove admin, add plugin system for openslides 2012-04-13 14:05:51 +02:00
Oskar Hahn
f1261ae2a7 merge 2012-04-12 20:13:39 +02:00
Oskar Hahn
d187f341b3 DeleteView in utils.views 2012-04-12 20:11:05 +02:00
René Köcher
733d78373e #84: Participants CSV import deletes applications 2012-04-12 19:11:07 +02:00
Oskar Hahn
fc95d01d07 some fixes 2012-04-12 16:21:30 +02:00
Oskar Hahn
497a8cdb70 added AjaxView 2012-04-12 14:20:05 +02:00
René Köcher
07a83f142b #84: Participants CSV import deletes applications 2012-04-11 14:49:24 +02:00
Emanuel Schuetze
c6a40f4dcb Reverted changset r281 from Default branch (because it's for
1.2-dev-branch only).
2012-03-28 15:17:50 +02:00
Emanuel Schuetze
d65b20a7fd Fixed tab string. 2012-03-19 09:34:13 +01:00
Oskar Hahn
c4c42611b4 generate tab liste by app list 2012-03-18 17:11:58 +01:00
Oskar Hahn
fb17b16fae config pages in apps 2012-03-16 14:31:59 +01:00
Oskar Hahn
027655270e Automated merge with ssh://openslides.de/openslides 2012-03-06 12:16:21 +01:00
Oskar Hahn
062e9bd4cb added signals for template-context-manipulation 2012-03-06 12:16:03 +01:00
Emanuel Schuetze
55c4299a7f Updated projector control template. Fixed some slidemodel strings and urls.
Updated jquery to 1.7.1. Added jquery-ui.
2012-03-06 08:19:49 +01:00
Oskar Hahn
654b101dac beamer setting page 2012-03-03 09:11:56 +01:00
Emanuel Schuetze
c14dcb1679 Added missing template tags (i18n). 2012-02-21 08:21:59 +01:00
Oskar Hahn
8c597a2eb3 load form-css-classes from utils.forms.py instead to define it on every form 2012-02-20 18:44:02 +01:00
Oskar Hahn
70f1cb8b3e use the new poll-api in assignments 2012-02-19 19:27:00 +01:00
Oskar Hahn
5aaa1a53fa addet votes cast and votes invalid to new poll-api 2012-02-19 17:31:17 +01:00
Oskar Hahn
114a68b120 some additions in poll and application-poll 2012-02-15 13:44:55 +01:00
Oskar Hahn
c4874ae6a0 present a poll 2012-02-15 12:36:50 +01:00
Oskar Hahn
bc05b78648 rewrote the config api 2012-02-15 12:04:11 +01:00
Oskar Hahn
9c367509dd reorder poll 2012-02-15 10:43:08 +01:00
Oskar Hahn
0957de83a9 start to rewrite the poll-api 2012-02-14 16:31:21 +01:00
Oskar Hahn
6498095e2b create setup.py to install openslides 2012-02-09 16:57:10 +01:00
Oskar Hahn
8c27c731f8 rename Element to Slide 2012-02-06 22:22:16 +01:00
Oskar Hahn
16c37661f7 renamed beamer in projector 2012-02-06 22:08:08 +01:00
Oskar Hahn
5f6c96b3e8 assignment and application can be beamt without a item-element 2012-02-03 23:12:28 +01:00
Emanuel Schuetze
8ed81db9f2 Application import: Added propper_unicode function to handle
unicode/ascii mix. Thanks to Rene Koecher!
2011-11-29 12:10:06 +01:00
Emanuel Schuetze
7942de0370 Prepared application template style for using html tags (with 'version.text|safe|linebreaks'). 2011-11-24 21:06:39 +01:00
Emanuel Schuetze
8ef0b0ad81 Merged. 2011-11-24 19:53:03 +01:00
Emanuel Schuetze
72de1dce74 Fixed missing form invalid error message. 2011-11-24 19:42:32 +01:00
rene
d75e736be7 Add patchup-helper to assist csv.Sniffer() 2011-11-24 19:38:25 +01:00
rene
c448ce95bd Switch to python-provided CSV module - implements #66 2011-11-22 18:49:36 +01:00
Emanuel Schuetze
69befddc90 Added incompleted unit tests from changeset 247 for ongoing work of next release. 2011-11-17 17:06:39 +01:00
Emanuel Schuetze
c88ff41805 Reordered config tab subpages. 2011-11-14 23:40:19 +01:00
Emanuel Schuetze
3ae853f082 Removed incompleted unit tests for 1.1 release. 2011-11-14 22:54:31 +01:00
rene
528b49da99 Use gen_password() for new user objects created via user or application import. 2011-11-14 21:54:42 +01:00
Emanuel Schuetze
e156625975 Fixed permission. 2011-11-14 20:23:06 +01:00
Emanuel Schuetze
eb35289e4e Fixed #57: <button> inside <a> tag not working in IE.; Added new icon for anonymous login. 2011-11-14 19:33:45 +01:00
rene
9f50863439 Implement rights for anonymous as requested by #45 2011-11-14 16:37:12 +01:00
Emanuel Schuetze
de62241dc7 Application: Added import (#55) and trivial changes (#56) function. Thanks to Rene Koecher! 2011-11-09 22:53:10 +01:00
Emanuel Schuetze
f26a19036b Added new button in assignment view template to show agenda item of selected assignment (for manager only). 2011-11-01 14:45:24 +01:00
Emanuel Schuetze
6d7736d10d Added new button in application view template to show agenda item of selected appliation (for manager only). 2011-11-01 14:35:58 +01:00
Emanuel Schuetze
15f872b6e2 Fixed permissions to delete own applications (if they have no number). 2011-11-01 08:07:27 +01:00
Emanuel Schuetze
a23164a906 Order submitter and supporter fields by full name in ApplicationManagerForm. 2011-11-01 06:47:10 +01:00
Emanuel Schuetze
bfadbce541 Fixed: Show "undocumented" for -2 in application pdf. 2011-09-21 21:28:01 +02:00
Emanuel Schuetze
6c008488cf Application: Check enough supports in status "pub" only. 2011-09-21 21:27:23 +02:00
Emanuel Schuetze
cea2992ca0 Application: Show profile instead of submitter username. 2011-09-21 21:26:44 +02:00
Emanuel Schuetze
d70219e757 Updated translation. 2011-09-21 21:01:27 +02:00
Emanuel Schuetze
e640241154 Updated translations. Fixed style and display of votes invalid, votes cast. 2011-09-11 22:43:15 +02:00
Oskar Hahn
2fe4a0ce29 last changes for application, too 2011-09-09 22:40:38 +02:00
Emanuel Schuetze
88447db814 Added log after adding/removing supporters as manager. 2011-09-08 17:39:57 +02:00
Emanuel Schuetze
c53e5267c5 Updated translations. 2011-09-07 22:46:47 +02:00
Emanuel Schuetze
f5f220417a Fixed manage permission. Updated message translation. 2011-09-07 22:17:19 +02:00
Emanuel Schuetze
fa71a1236d Count numbers of application, assignments and participants. Some minor style fixes. 2011-09-07 19:35:06 +02:00
Emanuel Schuetze
d8a880105a Some minor renames (applications # -> no., beamer -> projector etc.) 2011-09-06 23:23:05 +02:00
Emanuel Schuetze
bb38d8b85e Updated application PDF. Added vote results. 2011-09-06 22:22:29 +02:00
Oskar Hahn
08a1e88e12 newest version link for application 2011-09-06 10:41:06 +02:00
Emanuel Schuetze
9275acf029 Show full profile name of supmitter and supports. 2011-09-05 20:05:23 +02:00
Emanuel Schuetze
b8ff9696b4 Minor. 2011-09-04 19:28:06 +02:00
Emanuel Schuetze
30afe96fc0 AVersion fixes: Added reject confirm message. Style changes. 2011-09-04 19:07:45 +02:00
Emanuel Schuetze
6b7697a5b2 Changed translation string: revision -> version. 2011-09-04 12:35:46 +02:00
Emanuel Schuetze
57ea883d51 Updated permissions. 2011-09-04 12:33:06 +02:00
Emanuel Schuetze
d1d0e7e9b4 Updated permissions. 2011-09-04 12:21:58 +02:00
Oskar Hahn
f4f7aa4e57 Automated merge with ssh://oshahn.de/openslides 2011-09-04 10:49:21 +02:00
Oskar Hahn
8089c3c8a9 do not create a new aversion, if only the permission has changed 2011-09-04 10:49:17 +02:00
Emanuel Schuetze
3fc42c6488 Added revision confirm dialog. 2011-09-04 10:43:25 +02:00
Oskar Hahn
da14eca296 application.aid is the permitted aid, or the last aid 2011-09-04 10:34:30 +02:00
Oskar Hahn
89386a4ac7 Automated merge with ssh://oshahn.de/openslides 2011-09-04 10:21:58 +02:00
Oskar Hahn
572782befa default version is the accepted Version 2011-09-04 10:21:54 +02:00
Emanuel Schuetze
9f2929df6b Automated merge with ssh://openslides.org/openslides 2011-09-04 10:21:11 +02:00
Emanuel Schuetze
7271964f59 View aversion accept/reject icons and revision number. 2011-09-04 10:21:06 +02:00
Oskar Hahn
2c6c9b55ee accept old application versions 2011-09-04 10:02:54 +02:00
Emanuel Schuetze
d0363d7ad9 Added icon for accept/reject application versions. 2011-09-03 19:49:32 +02:00
Emanuel Schuetze
2ad0754f88 Added and fixed apply buttons. Updated translation. 2011-09-03 19:25:05 +02:00
Emanuel Schuetze
ad263ea6a0 Automated merge with ssh://openslides.org/openslides 2011-09-03 18:11:54 +02:00
Oskar Hahn
5543320e0d accept and reject links for applications 2011-09-03 18:11:42 +02:00
Emanuel Schuetze
021fb27833 Added apply buttons. Some style changes. Fix permissions. 2011-09-03 16:20:10 +02:00
Emanuel Schuetze
cc10d5042b Show invalid votes and votes cast for application and assignment results. 2011-09-03 13:53:37 +02:00
Emanuel Schuetze
97228f6558 Show invalid votes in application view. 2011-09-03 12:16:47 +02:00
Emanuel Schuetze
ca0c50caef Many improvements for application and assignment poll system. 2011-09-03 10:52:29 +02:00
Emanuel Schuetze
2278ddca54 DB change: Changed voteinvalid to votesinvalid. 2011-09-03 00:43:09 +02:00
Emanuel Schuetze
6458a69324 Reduced application poll title. 2011-09-02 17:40:02 +02:00
Oskar Hahn
3db6a12024 Add code 2011-07-31 10:46:29 +02:00