ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
808 Commits 6 Branches 42 Tags 64 MiB
b4ee5dfff4
Commit Graph

717 Commits

Author SHA1 Message Date
Norman Jäckel
59fb053283 Fix #260 2012-06-28 01:14:51 +02:00
Norman Jäckel
409bfda353 Fix #257 2012-06-27 23:29:06 +02:00
Oskar Hahn
5311c7ae31 fix problem by the assignment-poll view 2012-06-24 23:31:06 +02:00
Oskar Hahn
6c66e55fc0 show right label for posts in new assignments 2012-06-24 22:38:42 +02:00
Oskar Hahn
4339c3ae8a allow to save an empty poll 2012-06-24 22:34:11 +02:00
Oskar Hahn
48c53d3cd0 link for creating an application agenda item in the sidebare 2012-06-24 22:21:46 +02:00
Oskar Hahn
3c04f6af82 translate poll options for assignments 2012-06-24 22:21:15 +02:00
Oskar Hahn
3e7e894d62 fix #250 don't allow assignments with not posts. 
But for the future, see #251
 2012-06-24 22:10:14 +02:00
Oskar Hahn
e9c680f5e1 update translation 2012-06-24 21:55:46 +02:00
Oskar Hahn
1a4e164dd2 refresh the projector only ones a second 2012-06-24 21:55:31 +02:00
Oskar Hahn
6a0bdb7aa2 the submitter of an application must not edit the application, after it was accepted 2012-06-24 21:52:21 +02:00
Oskar Hahn
391a10bb03 fix typo in frontpage_title 2012-06-23 15:42:25 +02:00
Oskar Hahn
b963b61385 update german translation 2012-06-23 15:36:02 +02:00
Oskar Hahn
7df1264abf rearange the userprofile. Only show first line from the user.profile.comment in the overview 2012-06-23 15:02:13 +02:00
Oskar Hahn
442a24ccd8 #222 fix to small db collumns for assignment.status and config.value 
db-reset necessary
 2012-06-23 13:17:50 +02:00
Norman Jäckel
4edc4f503c Edit Symbol in Application 2012-06-23 13:17:24 +02:00
Norman Jäckel
654388117b #208 and other symbol things 2012-06-23 13:14:18 +02:00
Oskar Hahn
cc42792a38 #164 call a assignmentpoll by this ballot number 2012-06-23 12:43:18 +02:00
Oskar Hahn
ae8876425a min value for polls is -2 2012-06-23 12:05:09 +02:00
Oskar Hahn
3d1e4f5489 #216 delete releated agenda-item, if the releated object (application or assignment) is deleted 2012-06-23 11:41:32 +02:00
Norman Jäckel
d110934f62 Insert title tag to Clean Message Button (#219) 2012-06-23 11:39:07 +02:00
Norman Jäckel
b1ed56176e Edit and View Links and Symbols in Widgets fixed (#206) 2012-06-23 10:43:01 +02:00
Oskar Hahn
b12ae6b0a0 #191 Create assignment-agenda Items 2012-06-23 10:27:58 +02:00
Oskar Hahn
f13ee5f409 make application tests run again 2012-06-19 10:50:55 +02:00
Norman Jäckel
a439794874 Insert Edit Symbol (Ticket 207) 2012-06-23 09:32:21 +02:00
Oskar Hahn
b6cb4223f2 #217 show agenda text again. 2012-06-19 10:19:43 +02:00
Oskar Hahn
e8bf2fce1a yes-no-abstain elections in assignments 2012-06-18 09:48:27 +02:00
Oskar Hahn
bf46342d17 #205 show Application number in projector Tab 2012-06-11 14:22:09 +02:00
Oskar Hahn
239f328372 rewrote projector-widget system 2012-06-11 13:43:48 +02:00
Oskar Hahn
960543b64e load all models in projector.views 2012-06-10 10:43:50 +02:00
Oskar Hahn
53dd1687ca fixed last commit 2012-06-10 10:11:38 +02:00
Oskar Hahn
cdef473491 fixe last commit 2012-06-10 10:08:04 +02:00
Oskar Hahn
bb816e0999 load config on each request 2012-06-09 19:39:52 +02:00
Emanuel Schuetze
2ce9815218 Prepared 1.2-beta3 release. 2012-06-06 16:40:05 +02:00
Emanuel Schuetze
a2e1b77bd6 #213 fixed (User settings form - remove User groups and active 
fields).
 2012-06-06 14:28:37 +02:00
Emanuel Schuetze
07a682c436 Set is_active for new participants to True. 2012-06-06 13:59:46 +02:00
Emanuel Schuetze
a6c220ca02 Reverted wrong testing code (for participants) from last commit. 2012-06-06 13:51:54 +02:00
Emanuel Schuetze
d8cd0c2b6a Renamed logo files (typo). 2012-06-04 10:17:56 +02:00
Oskar Hahn
43e30057b3 delete item, not application by releated agenda-items 2012-06-03 10:19:08 +02:00
Oskar Hahn
2e498403cb #167 fallback slide, if the slide does not exist 2012-06-03 09:43:28 +02:00
Oskar Hahn
965b682abc edit, delete, slide for releated item in agenda 2012-06-03 09:35:26 +02:00
Oskar Hahn
79893687f3 fixed error by activating a message, if it was only on a specific slide. 2012-06-03 09:05:12 +02:00
Andy Kittner
7e7ab210ab Set system url on first run (#211) 2012-05-31 00:27:47 +02:00
Andy Kittner
29057b8b87 Fix exceptions if project path contains non-utf8 characters (#204) 
Django converts byte strings in various places to unicode by decoding them from
utf-8, which will break if the filesystem encoding uses something else
(e.g. fileystem encoding is latin1 and the path contains german umlauts).

Avoid these problems by explicitly decoding all paths to unicode using an
appropriate encoding.
 2012-05-30 23:30:24 +02:00
Emanuel Schuetze
8cdc062628 Set version number back to dev mercurial revision 2012-05-25 09:34:50 +02:00
Emanuel Schuetze
f7eab29ed5 Fixed missing translation in poll_view assignment template (table head). 2012-05-23 14:31:12 +02:00
Emanuel Schuetze
0ab900cb7a Fixed missing permission of agenda submenu. 2012-05-23 14:30:42 +02:00
Emanuel Schuetze
279dade5c4 Fixed missing SITE_ROOT import. 2012-05-23 14:30:06 +02:00
Emanuel Schuetze
44c4fffc25 Added missing default TIME_ZONE in default.settings.py. 2012-05-23 14:29:11 +02:00
Emanuel Schuetze
0acf6734e9 Updated translations. 2012-05-21 22:02:55 +02:00
Emanuel Schuetze
7933dd2d5c Minor fixes. 2012-05-21 22:01:09 +02:00
Emanuel Schuetze
58fc689f14 Updated overlay message style in projector template. 2012-05-21 09:21:36 +02:00
Emanuel Schuetze
a737ef7300 Prepared 1.2-beta2 release. 2012-05-21 08:16:40 +02:00
Andy Kittner
0007a1dfa8 Add log messages when poll is updated/deleted (#187) 2012-05-20 23:12:50 +02:00
Emanuel Schuetze
37619b0a80 #114: Set participants tab inactive if usersettings page is active 2012-05-20 22:34:41 +02:00
Emanuel Schuetze
f8137da055 #203: Fixed highlighting more than one active line. 2012-05-20 22:20:17 +02:00
Emanuel Schuetze
5eb29ba9dd Fixed width of countdown input field. 2012-05-20 22:06:07 +02:00
Emanuel Schuetze
5581ed1222 #168: Improved countdown control buttons. 2012-05-20 22:01:44 +02:00
Emanuel Schuetze
92a64d38cf Add projector view link on front page. Fixed column for can_manage_projector permission. 2012-05-20 20:51:11 +02:00
Emanuel Schuetze
4389f5f548 #89: Added missing control_customslide.html template. 2012-05-20 20:15:49 +02:00
Emanuel Schuetze
c4450bf14e Updated translations. 2012-05-20 20:02:48 +02:00
Emanuel Schuetze
97bea50b03 Use single url for toggle publish/unpublish election ballots. 2012-05-20 20:02:36 +02:00
Emanuel Schuetze
9b6640c2ae Removed unused link var. 2012-05-20 19:44:29 +02:00
Emanuel Schuetze
406a2d18e3 Fixed can_manage_projector permission. 2012-05-20 19:43:38 +02:00
Emanuel Schuetze
189c975137 Use same url to toggle participant status. 2012-05-19 19:22:20 +02:00
Emanuel Schuetze
3a52cd56c6 #165: Use AJAX instead of page reload to publish assignment polls 2012-05-19 16:25:55 +02:00
Andy Kittner
fbc603b748 Fix initial value for pollform is value is a "special" value (#135) 2012-05-19 14:19:32 +02:00
Andy Kittner
182f20308b Fix exception in polls with special values (fallout from translation fix) 2012-05-19 13:41:30 +02:00
Andy Kittner
e005863336 Changed/ added logmessages for applications (#184, #187) 
- Added a logmessage when a version is accepted/ rejected

- Made logmessage for trivial changes more explicit and include
  the names of the changed fields

- Updated translations
 2012-05-19 12:46:54 +02:00
Andy Kittner
5aead54a0c Improve error message for failed logins (#199) 
While #199 was already closed I think passing on the original
error message is more userfriendly as it gives more details
what the actual error was (generates specific messages for
user inactive and disabled cookies)
 2012-05-19 10:48:29 +02:00
Andy Kittner
d3cf5c9311 Correctly handle first time passwords (#194) 
- Save User object after setting the password

- Only generate first time password if none was explicitly specified
 2012-05-19 10:33:59 +02:00
Emanuel Schuetze
3f4119f182 #199: Changed login error message. Updated translation. 2012-05-19 08:44:46 +02:00
Emanuel Schuetze
23fb97c7a2 #170: Use second submenu for agenda items. 2012-05-19 08:26:59 +02:00
Emanuel Schuetze
188fe4cce5 Fixed missing check for activeline in assignment overview. 2012-05-19 08:15:20 +02:00
Emanuel Schuetze
07c587a025 #186: Fixed published polls/ballot column on projector template. 2012-05-19 08:09:18 +02:00
Emanuel Schuetze
2dc156ef74 Automated merge with ssh://openslides.org/openslides 2012-05-18 23:25:51 +02:00
Emanuel Schuetze
f2a93c4505 #89: Delete custom slides. 2012-05-18 23:24:54 +02:00
Emanuel Schuetze
90787b2597 #89: Edit custom slides. 2012-05-18 23:07:09 +02:00
Andy Kittner
3f722d3b27 Add --insecure to runserver args in order to always server static files 
See: https://docs.djangoproject.com/en/1.4/ref/contrib/staticfiles/
 2012-05-18 22:34:59 +02:00
Emanuel Schuetze
ebe5381439 Automated merge with ssh://openslides.org/openslides 2012-05-18 19:38:26 +02:00
Emanuel Schuetze
b81469703b #198: Optimized submenu of application and assignment. 2012-05-18 19:38:21 +02:00
Emanuel Schuetze
c99deb8a2a Increase max_length of agenda title field. 2012-05-18 10:24:43 +02:00
Emanuel Schuetze
8ec3099620 #197: Rename the default User Group "Delegierte" to "Delegierter" 2012-05-17 22:03:48 +02:00
Emanuel Schuetze
4cef2762fe Fixed style in empty agenda overview table. 2012-05-17 21:38:37 +02:00
Emanuel Schuetze
0351627234 Fixed title in assignment projector template. 2012-05-17 21:36:18 +02:00
Emanuel Schuetze
ca2900e9d1 #195: Fixed unicode string in pdf header. 2012-05-17 21:34:19 +02:00
Emanuel Schuetze
92562aef28 #188: Fixed projector template style error. 2012-05-15 20:36:49 +02:00
Andy Kittner
298cefcb45 Fix error when creating new applications (introduced by translation fix) 2012-05-15 20:10:54 +02:00
Emanuel Schuetze
61fe84a780 Removed LANGUAGE_CODE and TIME_ZONE from default.settings.py. LANGUAGE_CODE no longer required after fix of rev615. 2012-05-15 19:51:40 +02:00
Andy Kittner
3815ef26af Fix wrong translations in forms/ models 
Converted utils.translation_ex.ugettext to use ugettext_lazy and changed
forms modules to import ugettext from there (models where already importing
it from there)
 2012-05-15 01:08:08 +02:00
Emanuel Schuetze
c19025ceb3 #190: Fixed typo in translation. 2012-05-14 23:10:17 +02:00
Emanuel Schuetze
3324ce6131 Removed help text of active form field by overriding. 2012-05-14 23:07:24 +02:00
Emanuel Schuetze
1d6a0bee4e #174: Change form field 'groups' to 'user groups'. 2012-05-14 23:04:00 +02:00
Emanuel Schuetze
31ae7c38c9 #192: i18n-de: Beamer -> Projektor 2012-05-14 22:16:13 +02:00
Emanuel Schuetze
304013649b Changed default event description. Updated tranlsations. 2012-05-14 22:08:40 +02:00
Emanuel Schuetze
bc9765230c #185: Wrong permission to print assignments. 2012-05-14 22:02:45 +02:00
Emanuel Schuetze
bb5fcf4d6d #183: Wrong permission to print application. 2012-05-14 22:00:22 +02:00
Emanuel Schuetze
114b719cad Added comment column in agenda overview. 2012-05-14 21:55:36 +02:00
Emanuel Schuetze
fbf2256493 #182: Wrong permission for edit button in view template. 2012-05-14 21:55:02 +02:00
Emanuel Schuetze
d8807ba979 #180: Ballot description. Fixed ballot number function. 2012-05-14 21:34:46 +02:00
Emanuel Schuetze
911b7ebac8 Changed po file header. 2012-05-11 07:38:56 +02:00
Emanuel Schuetze
b65e21e08f #100: Fixed wrong permissions. 2012-04-30 08:50:35 +02:00
Emanuel Schuetze
eb7672074e Some more style work for application projector template. 2012-04-30 08:30:04 +02:00
Emanuel Schuetze
e28c15eff9 Improve projector style of application voting results. 2012-04-30 08:23:50 +02:00
Emanuel Schuetze
3faa91f5a4 Updated translation. 2012-04-30 08:23:06 +02:00
Emanuel Schuetze
1089e61011 Modified support help text. 2012-04-29 21:58:16 +02:00
Emanuel Schuetze
8bdd57cada Prepare 1.2-beta1 release. 2012-04-29 21:43:21 +02:00
Emanuel Schuetze
616a34e8a9 Changed style: td:hover to tr:hover. 2012-04-29 21:32:29 +02:00
Emanuel Schuetze
412e672ea1 Set default language for model/form translation strings. Have to changed for English installation! 
(Template strings are translated automatically by selected browser language)
 2012-04-29 21:17:15 +02:00
Emanuel Schuetze
8c8a3e9fc2 Updated translations. 2012-04-29 20:48:10 +02:00
Emanuel Schuetze
3a0d243a6c Added agenda 'edit' button in view template. 2012-04-29 20:47:54 +02:00
Emanuel Schuetze
2186561b6e Removed LANGUAGE_CODE ('de') because django uses language selected by browser. Default language is 'en'. 2012-04-29 19:33:57 +02:00
Emanuel Schuetze
79605531c5 Some minor style fixes for poll view templates. 2012-04-29 19:12:18 +02:00
Emanuel Schuetze
905d9d546c Fixe pdf icon path. 2012-04-29 19:01:18 +02:00
Emanuel Schuetze
e1799b4c83 #155: remove header/footer in first-password-pdf 2012-04-29 18:58:51 +02:00
Emanuel Schuetze
4e8e9b5407 #155: Remove header/footer in frameless PDF. 2012-04-29 18:54:42 +02:00
Emanuel Schuetze
dd10a59533 #109: New second submneu for election view. 2012-04-28 23:10:19 +02:00
Emanuel Schuetze
7eaf9899f6 Minor code comment changes. 2012-04-28 22:32:33 +02:00
Emanuel Schuetze
64eed5ff22 #90: Projector control: Save portlet state in session. 2012-04-28 22:31:30 +02:00
René Köcher
842e8de065 #160: Wrong scaling of projector live view in IE8/Konqueror 
IE8 has a scaling bug - check the browser version and resize the iframe 4x bigger if needed..
 2012-04-28 09:38:31 +02:00
René Köcher
4f98c0c571 #163: Sorting by title or creation time returns one entry for each version of an application 2012-04-28 08:45:11 +02:00
Andy Kittner
7b8f882f0d Fallback to localhost if IP of current hostname can't be determined 2012-04-27 22:54:20 +02:00
Emanuel Schuetze
2c2a99d738 Automated merge with ssh://openslides.org/openslides 2012-04-27 22:47:47 +02:00
Emanuel Schuetze
1a4a748e6c #112: Use monotype for printing first time password 2012-04-27 22:47:41 +02:00
René Köcher
537571ec69 #100 Delete applications by admin/superuser only: part2 2012-04-27 22:46:27 +02:00
Emanuel Schuetze
59c342ba8d #158: Move 'change tree' notification to correct position (above page title). 2012-04-27 21:53:50 +02:00
Emanuel Schuetze
20ce7579ce #158: Added from_invalid error notification for ItemCreate/Update. 2012-04-27 21:40:42 +02:00
Emanuel Schuetze
822264ef7b #158: Added success notification for ItemCreate/ItemUpdate View. 2012-04-27 21:36:12 +02:00
René Köcher
81bc19730b #100 Delete applications by admin/superuser only: part1 2012-04-27 21:22:44 +02:00
Emanuel Schuetze
710882c28a #96 Countdown: Improve control icons 2012-04-27 17:42:05 +02:00
Emanuel Schuetze
8ed8ca0c58 Automated merge with ssh://openslides.org/openslides 2012-04-27 08:04:53 +02:00
Emanuel Schuetze
f97529518e Updated translations. 2012-04-27 08:04:16 +02:00
Emanuel Schuetze
804c3da59a Updated tranlation string. 2012-04-27 08:02:01 +02:00
René Köcher
030ff09ec0 #97: (Aftermath) 
Quick cross-browser fix: remove the spin-buttons and use input type=number.
If your browser is HTML5 it should show a spin box, otherwise the fallback
(type=text) will work equally well.
 2012-04-27 07:59:23 +02:00
René Köcher
7f54331d0c Merge r559.. 2012-04-27 07:52:53 +02:00
René Köcher
c3c7228ab9 #159 Countdown reset should change 'pause' back to 'play'. 2012-04-27 07:51:42 +02:00
René Köcher
c0b78f52ea Backout changeset 3dafb78cc57f4ce55b8e4517eb48fd9e9e744e2d 2012-04-27 07:50:20 +02:00
René Köcher
f45eb68fb4 #159 Countdown reset should change 'pause' back to 'play'. 2012-04-27 07:46:47 +02:00
Andy Kittner
8da2f0f041 Fix start script broken by r550 
Defer importing modules that require the DJANGO_SETTINGS_MODULE
to be available until  prepare_openslides() had a chance to set
everything up.
 2012-04-27 01:09:12 +02:00
Emanuel Schuetze
3bcf4fd9c3 Added missing 'required' helptext to all forms. 2012-04-26 17:50:46 +02:00
René Köcher
7b7f43b04a #97: Countdown: move countdown config input field from config tab to portlet 2012-04-26 12:43:35 +02:00
Emanuel Schuetze
aac48a0b02 Redesign overlays. 2012-04-26 08:52:20 +02:00
Emanuel Schuetze
8a4163b019 Fixed scroll bug in base.css. 2012-04-25 23:07:54 +02:00
Emanuel Schuetze
b0d64c2bcc Updated jquery ui style. 2012-04-25 22:59:49 +02:00
Emanuel Schuetze
9b6b969f8a Added missing license header (for js and css). 2012-04-25 22:48:27 +02:00
Emanuel Schuetze
7ef298881d Updated license header. 2012-04-25 22:29:19 +02:00
Andy Kittner
dda3078fe0 Detect if the database was deleted and run syncdb if necessary (fixes #156) 2012-04-25 19:37:51 +02:00
René Köcher
053021a08f #XX Countdown: Only show valid controls for the active countdown 
When clicking on 'play' the button will morph into 'stop' and vice-versa.
This is persistent across clients e.g. when A starts the countdown and
then B opens the control page B will see a pause button.
(Updates for all but the local client happen only on page reload)
 2012-04-25 18:45:02 +02:00
René Köcher
07b5614fac #94 Countdown: support for pause/resume / #95 Countdown: show correct time format as mm:ss 2012-04-25 17:17:24 +02:00
Emanuel Schuetze
3cb7417028 Minor CSS fixes. 2012-04-25 09:18:10 +02:00