4edc4f503c
Edit Symbol in Application
2012-06-23 13:17:24 +02:00
654388117b
#208 and other symbol things
2012-06-23 13:14:18 +02:00
cc42792a38
#164 call a assignmentpoll by this ballot number
2012-06-23 12:43:18 +02:00
ae8876425a
min value for polls is -2
2012-06-23 12:05:09 +02:00
3d1e4f5489
#216 delete releated agenda-item, if the releated object (application or assignment) is deleted
2012-06-23 11:41:32 +02:00
d110934f62
Insert title tag to Clean Message Button ( #219 )
2012-06-23 11:39:07 +02:00
b1ed56176e
Edit and View Links and Symbols in Widgets fixed ( #206 )
2012-06-23 10:43:01 +02:00
b12ae6b0a0
#191 Create assignment-agenda Items
2012-06-23 10:27:58 +02:00
f13ee5f409
make application tests run again
2012-06-19 10:50:55 +02:00
a439794874
Insert Edit Symbol (Ticket 207)
2012-06-23 09:32:21 +02:00
b6cb4223f2
#217 show agenda text again.
2012-06-19 10:19:43 +02:00
e8bf2fce1a
yes-no-abstain elections in assignments
2012-06-18 09:48:27 +02:00
bf46342d17
#205 show Application number in projector Tab
2012-06-11 14:22:09 +02:00
239f328372
rewrote projector-widget system
2012-06-11 13:43:48 +02:00
960543b64e
load all models in projector.views
2012-06-10 10:43:50 +02:00
53dd1687ca
fixed last commit
2012-06-10 10:11:38 +02:00
cdef473491
fixe last commit
2012-06-10 10:08:04 +02:00
bb816e0999
load config on each request
2012-06-09 19:39:52 +02:00
2ce9815218
Prepared 1.2-beta3 release.
2012-06-06 16:40:05 +02:00
a2e1b77bd6
#213 fixed (User settings form - remove User groups and active
...
fields).
2012-06-06 14:28:37 +02:00
07a682c436
Set is_active for new participants to True.
2012-06-06 13:59:46 +02:00
a6c220ca02
Reverted wrong testing code (for participants) from last commit.
2012-06-06 13:51:54 +02:00
d8cd0c2b6a
Renamed logo files (typo).
2012-06-04 10:17:56 +02:00
43e30057b3
delete item, not application by releated agenda-items
2012-06-03 10:19:08 +02:00
2e498403cb
#167 fallback slide, if the slide does not exist
2012-06-03 09:43:28 +02:00
965b682abc
edit, delete, slide for releated item in agenda
2012-06-03 09:35:26 +02:00
79893687f3
fixed error by activating a message, if it was only on a specific slide.
2012-06-03 09:05:12 +02:00
7e7ab210ab
Set system url on first run ( #211 )
2012-05-31 00:27:47 +02:00
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
8cdc062628
Set version number back to dev mercurial revision
2012-05-25 09:34:50 +02:00
f7eab29ed5
Fixed missing translation in poll_view assignment template (table head).
2012-05-23 14:31:12 +02:00
0ab900cb7a
Fixed missing permission of agenda submenu.
2012-05-23 14:30:42 +02:00
279dade5c4
Fixed missing SITE_ROOT import.
2012-05-23 14:30:06 +02:00
44c4fffc25
Added missing default TIME_ZONE in default.settings.py.
2012-05-23 14:29:11 +02:00
0acf6734e9
Updated translations.
2012-05-21 22:02:55 +02:00
7933dd2d5c
Minor fixes.
2012-05-21 22:01:09 +02:00
58fc689f14
Updated overlay message style in projector template.
2012-05-21 09:21:36 +02:00
a737ef7300
Prepared 1.2-beta2 release.
2012-05-21 08:16:40 +02:00
0007a1dfa8
Add log messages when poll is updated/deleted ( #187 )
2012-05-20 23:12:50 +02:00
37619b0a80
#114 : Set participants tab inactive if usersettings page is active
2012-05-20 22:34:41 +02:00
f8137da055
#203 : Fixed highlighting more than one active line.
2012-05-20 22:20:17 +02:00
5eb29ba9dd
Fixed width of countdown input field.
2012-05-20 22:06:07 +02:00
5581ed1222
#168 : Improved countdown control buttons.
2012-05-20 22:01:44 +02:00
92a64d38cf
Add projector view link on front page. Fixed column for can_manage_projector permission.
2012-05-20 20:51:11 +02:00
4389f5f548
#89 : Added missing control_customslide.html template.
2012-05-20 20:15:49 +02:00
c4450bf14e
Updated translations.
2012-05-20 20:02:48 +02:00
97bea50b03
Use single url for toggle publish/unpublish election ballots.
2012-05-20 20:02:36 +02:00
9b6640c2ae
Removed unused link var.
2012-05-20 19:44:29 +02:00
406a2d18e3
Fixed can_manage_projector permission.
2012-05-20 19:43:38 +02:00
189c975137
Use same url to toggle participant status.
2012-05-19 19:22:20 +02:00
3a52cd56c6
#165 : Use AJAX instead of page reload to publish assignment polls
2012-05-19 16:25:55 +02:00
fbc603b748
Fix initial value for pollform is value is a "special" value ( #135 )
2012-05-19 14:19:32 +02:00
182f20308b
Fix exception in polls with special values (fallout from translation fix)
2012-05-19 13:41:30 +02:00
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
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
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
3f4119f182
#199 : Changed login error message. Updated translation.
2012-05-19 08:44:46 +02:00
23fb97c7a2
#170 : Use second submenu for agenda items.
2012-05-19 08:26:59 +02:00
188fe4cce5
Fixed missing check for activeline in assignment overview.
2012-05-19 08:15:20 +02:00
07c587a025
#186 : Fixed published polls/ballot column on projector template.
2012-05-19 08:09:18 +02:00
2dc156ef74
Automated merge with ssh://openslides.org/openslides
2012-05-18 23:25:51 +02:00
f2a93c4505
#89 : Delete custom slides.
2012-05-18 23:24:54 +02:00
90787b2597
#89 : Edit custom slides.
2012-05-18 23:07:09 +02:00
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
ebe5381439
Automated merge with ssh://openslides.org/openslides
2012-05-18 19:38:26 +02:00
b81469703b
#198 : Optimized submenu of application and assignment.
2012-05-18 19:38:21 +02:00
c99deb8a2a
Increase max_length of agenda title field.
2012-05-18 10:24:43 +02:00
8ec3099620
#197 : Rename the default User Group "Delegierte" to "Delegierter"
2012-05-17 22:03:48 +02:00
4cef2762fe
Fixed style in empty agenda overview table.
2012-05-17 21:38:37 +02:00
0351627234
Fixed title in assignment projector template.
2012-05-17 21:36:18 +02:00
ca2900e9d1
#195 : Fixed unicode string in pdf header.
2012-05-17 21:34:19 +02:00
92562aef28
#188 : Fixed projector template style error.
2012-05-15 20:36:49 +02:00
298cefcb45
Fix error when creating new applications (introduced by translation fix)
2012-05-15 20:10:54 +02:00
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
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
c19025ceb3
#190 : Fixed typo in translation.
2012-05-14 23:10:17 +02:00
3324ce6131
Removed help text of active form field by overriding.
2012-05-14 23:07:24 +02:00
1d6a0bee4e
#174 : Change form field 'groups' to 'user groups'.
2012-05-14 23:04:00 +02:00
31ae7c38c9
#192 : i18n-de: Beamer -> Projektor
2012-05-14 22:16:13 +02:00
304013649b
Changed default event description. Updated tranlsations.
2012-05-14 22:08:40 +02:00
bc9765230c
#185 : Wrong permission to print assignments.
2012-05-14 22:02:45 +02:00
bb5fcf4d6d
#183 : Wrong permission to print application.
2012-05-14 22:00:22 +02:00
114b719cad
Added comment column in agenda overview.
2012-05-14 21:55:36 +02:00
fbf2256493
#182 : Wrong permission for edit button in view template.
2012-05-14 21:55:02 +02:00
d8807ba979
#180 : Ballot description. Fixed ballot number function.
2012-05-14 21:34:46 +02:00
911b7ebac8
Changed po file header.
2012-05-11 07:38:56 +02:00
b65e21e08f
#100 : Fixed wrong permissions.
2012-04-30 08:50:35 +02:00
eb7672074e
Some more style work for application projector template.
2012-04-30 08:30:04 +02:00
e28c15eff9
Improve projector style of application voting results.
2012-04-30 08:23:50 +02:00
3faa91f5a4
Updated translation.
2012-04-30 08:23:06 +02:00
1089e61011
Modified support help text.
2012-04-29 21:58:16 +02:00
8bdd57cada
Prepare 1.2-beta1 release.
2012-04-29 21:43:21 +02:00
616a34e8a9
Changed style: td:hover to tr:hover.
2012-04-29 21:32:29 +02:00
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
8c8a3e9fc2
Updated translations.
2012-04-29 20:48:10 +02:00
3a0d243a6c
Added agenda 'edit' button in view template.
2012-04-29 20:47:54 +02:00
2186561b6e
Removed LANGUAGE_CODE ('de') because django uses language selected by browser. Default language is 'en'.
2012-04-29 19:33:57 +02:00
79605531c5
Some minor style fixes for poll view templates.
2012-04-29 19:12:18 +02:00
905d9d546c
Fixe pdf icon path.
2012-04-29 19:01:18 +02:00
e1799b4c83
#155 : remove header/footer in first-password-pdf
2012-04-29 18:58:51 +02:00
4e8e9b5407
#155 : Remove header/footer in frameless PDF.
2012-04-29 18:54:42 +02:00
dd10a59533
#109 : New second submneu for election view.
2012-04-28 23:10:19 +02:00
7eaf9899f6
Minor code comment changes.
2012-04-28 22:32:33 +02:00
64eed5ff22
#90 : Projector control: Save portlet state in session.
2012-04-28 22:31:30 +02:00
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
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
7b8f882f0d
Fallback to localhost if IP of current hostname can't be determined
2012-04-27 22:54:20 +02:00
2c2a99d738
Automated merge with ssh://openslides.org/openslides
2012-04-27 22:47:47 +02:00
1a4a748e6c
#112 : Use monotype for printing first time password
2012-04-27 22:47:41 +02:00
537571ec69
#100 Delete applications by admin/superuser only: part2
2012-04-27 22:46:27 +02:00
59c342ba8d
#158 : Move 'change tree' notification to correct position (above page title).
2012-04-27 21:53:50 +02:00
20ce7579ce
#158 : Added from_invalid error notification for ItemCreate/Update.
2012-04-27 21:40:42 +02:00
822264ef7b
#158 : Added success notification for ItemCreate/ItemUpdate View.
2012-04-27 21:36:12 +02:00
81bc19730b
#100 Delete applications by admin/superuser only: part1
2012-04-27 21:22:44 +02:00
710882c28a
#96 Countdown: Improve control icons
2012-04-27 17:42:05 +02:00
8ed8ca0c58
Automated merge with ssh://openslides.org/openslides
2012-04-27 08:04:53 +02:00
f97529518e
Updated translations.
2012-04-27 08:04:16 +02:00
804c3da59a
Updated tranlation string.
2012-04-27 08:02:01 +02:00
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
7f54331d0c
Merge r559..
2012-04-27 07:52:53 +02:00
c3c7228ab9
#159 Countdown reset should change 'pause' back to 'play'.
2012-04-27 07:51:42 +02:00
c0b78f52ea
Backout changeset 3dafb78cc57f4ce55b8e4517eb48fd9e9e744e2d
2012-04-27 07:50:20 +02:00
f45eb68fb4
#159 Countdown reset should change 'pause' back to 'play'.
2012-04-27 07:46:47 +02:00
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
3bcf4fd9c3
Added missing 'required' helptext to all forms.
2012-04-26 17:50:46 +02:00
7b7f43b04a
#97 : Countdown: move countdown config input field from config tab to portlet
2012-04-26 12:43:35 +02:00
aac48a0b02
Redesign overlays.
2012-04-26 08:52:20 +02:00
8a4163b019
Fixed scroll bug in base.css.
2012-04-25 23:07:54 +02:00
b0d64c2bcc
Updated jquery ui style.
2012-04-25 22:59:49 +02:00
9b6b969f8a
Added missing license header (for js and css).
2012-04-25 22:48:27 +02:00
7ef298881d
Updated license header.
2012-04-25 22:29:19 +02:00
dda3078fe0
Detect if the database was deleted and run syncdb if necessary ( fixes #156 )
2012-04-25 19:37:51 +02:00
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
07b5614fac
#94 Countdown: support for pause/resume / #95 Countdown: show correct time format as mm:ss
2012-04-25 17:17:24 +02:00
3cb7417028
Minor CSS fixes.
2012-04-25 09:18:10 +02:00
719ea6ec79
#93 : Show application number in header of projector template.
...
Some more projetor style work.
2012-04-24 22:27:16 +02:00
20f17d6235
Fixed untranslateable model string.
2012-04-23 22:17:45 +02:00
dc863cc3b9
Added custom slides portlet.
2012-04-23 22:07:52 +02:00
3d0fe9b565
Updated translations.
2012-04-23 22:07:34 +02:00
cfcd2d10d7
Fixed wrong icon filename.
2012-04-23 21:48:20 +02:00
d56dcba7d4
#119 : Adjusted icon filenames.
2012-04-23 21:27:22 +02:00
81a0c9661e
#119 : Adjusted some icon filenames.
2012-04-23 08:07:21 +02:00
61b9d476ab
Set default config values.
2012-04-22 16:55:16 +02:00
1b8c1eda91
Updated translations.
2012-04-22 16:51:22 +02:00
039bd4121c
Some assignment poll template fixes.
2012-04-21 22:27:11 +02:00
99bfd7257b
#120 : Add CSS class for helptext in forms.
2012-04-21 22:23:46 +02:00
61d4d1ca2f
#136 : Fixed missing polls in projector view
2012-04-21 21:38:59 +02:00
5f3c6c4821
#111 : Move pdf creation code from utils to participant app.
2012-04-20 23:23:50 +02:00
f1908bca89
Fixed permissions for action columns.
2012-04-20 22:58:57 +02:00
f711f96265
#107 : New actions column for elections.
2012-04-20 22:58:34 +02:00
667582cdfb
#106 : add pdf link to actions column
2012-04-20 22:47:44 +02:00
3886449b2c
#106 : Action column for applications.
...
#121 (partly): Activate links for agenda and applications table.
2012-04-20 22:43:12 +02:00
6125f1d88b
Minor javascript fix.
2012-04-20 22:41:57 +02:00
ccc1d2b707
#104 : Updated second submneu for application.
2012-04-20 22:13:47 +02:00
7a6eaf2660
Fixed building AssignmentPollPDF.
2012-04-20 14:33:40 +02:00
f393789f2d
Show min. 1 application ballot.
2012-04-20 13:41:09 +02:00
4ecff16aba
copyright 2011 -> 2012.
2012-04-20 12:44:45 +02:00
42a2e44390
Updated translations.
2012-04-20 11:15:15 +02:00
ae5efcfa9d
Some minor fixes for agenda, application, participant overview table.
2012-04-20 08:14:23 +02:00
4e904c7356
now it is possible to create a item, witch is realted to another object, for example an application.
2012-04-19 12:46:04 +02:00
e23c195388
show application title in presentation view
2012-04-19 11:10:36 +02:00
74c704641c
fixed yes, no, abstain values in the presentation View of an Application
2012-04-19 11:08:22 +02:00
1d285a1c15
remove print
2012-04-18 23:36:52 +02:00
9849140d2e
Remove submenu from static slides.
2012-04-18 22:06:41 +02:00
6be853f202
Removed default font from jquery-ui css.
2012-04-18 22:06:18 +02:00
236bbfd3bc
Automated merge with ssh://openslides.org/openslides
2012-04-18 22:01:06 +02:00
4adb221a9d
#92 : Projector control: Add projector preview icon for all entries.
2012-04-18 22:00:58 +02:00
59225bf822
added default get_filename for PDFView
2012-04-18 20:57:44 +02:00
07e9d8e9f9
rewrote application filters
2012-04-18 19:57:39 +02:00
a35e1917a4
Removed unused icons.
2012-04-18 19:52:37 +02:00
7eb410f093
#104 : Application submenu.
2012-04-18 19:50:51 +02:00
ee4d7da04a
#105 : Show Ballot number for applications. Some application PDF work. Set default config values.
2012-04-18 19:30:32 +02:00
9f70b2ff1c
rename ballout def in application and assignment
2012-04-18 19:02:41 +02:00
a77038fbf4
removed some old countdown code, defined some default values
2012-04-18 18:55:33 +02:00
4b2211d59f
Automated merge with ssh://openslides.org/openslides
2012-04-18 18:54:52 +02:00
3812b5ebd1
#103 : Set application filename.
2012-04-18 18:54:48 +02:00
23df763b1f
fix message issus: #134 , also defined some default config-values
2012-04-18 18:35:02 +02:00
67db762575
Automated merge with ssh://openslides.org/openslides
2012-04-18 18:29:34 +02:00
4ce8facd1a
#98 : Add new filter for active/inactive items.
2012-04-18 18:29:31 +02:00
0dde1738cf
fixed active line #88
2012-04-18 18:07:24 +02:00
e9e9fa54b2
fixed problem with deleting the default permissions
2012-04-18 16:57:33 +02:00
49e2f73df4
#92 preview for slides
2012-04-18 15:47:51 +02:00
6798050ded
added help_message
2012-04-18 15:04:16 +02:00
67384d0644
indent items in control view
2012-04-18 14:53:19 +02:00
aa54ac6d7d
Fix settings.py creation on python-2.5 ( Closes #133 )
...
dir() was not overrideable on python2.5 so it doesn't trigger an import
of the real settings module. Use getattr() instead, this works accross all
versions.
2012-04-18 16:41:12 +02:00
fbaa88c23a
#99 fixed problem with agenda-items and mptt
2012-04-18 14:36:03 +02:00
be6a63e48c
show version from plugins
2012-04-18 09:33:09 +02:00
040b5ffb45
Fixed #125 : Assignment PDF: Invalid votes and votes cast doesn't support special values '-1' and '-2'.
2012-04-17 21:16:55 +02:00
a3d7cc98a9
#110 error in application pdf printing
2012-04-17 17:47:37 +02:00
189cfa1309
translate poll values
2012-04-17 17:35:50 +02:00
0a8d40e2ac
slideUp read messages
2012-04-17 14:45:25 +02:00
56f1a15cac
added function to set messages in JavaScript
2012-04-17 13:41:43 +02:00
6aa241b268
fixed error in get_active_slide()
2012-04-17 12:07:32 +02:00
131d84bee4
Reduced custom jquery.ui to minimum (ui core, widget, mouse and sortable).
...
Changed jquery.ui style to humanity.
Some layout things in control template.
2012-04-17 09:13:02 +02:00
da8c3c0bba
show pollresults in application projector
2012-04-16 17:21:41 +02:00
03792c0b05
put projector message in the center of the presentation
2012-04-16 17:14:39 +02:00
7d16717ca8
clean button for message
2012-04-16 16:38:47 +02:00
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
3bceca2359
use plugin.NAME for submenu-title in config-tab
2012-04-16 11:36:50 +02:00
80c5bfbba9
translation in JS-files
2012-04-16 11:12:21 +02:00
c1cd0a2805
send class, not object, for template_manipulation
2012-04-16 11:11:45 +02:00
81f4a8c5d5
Automated merge with ssh://openslides.org/openslides
2012-04-15 16:13:32 +02:00
84731a07d5
Updated application view submenu.
2012-04-15 16:13:26 +02:00
beaa3e341a
Create portable win32 binary distribution
2012-04-15 16:04:08 +02:00
92305bf363
use item for item sid
2012-04-15 16:02:13 +02:00
d2d3725eb6
fix agenda.test
2012-04-15 16:00:25 +02:00
bc31a2df1a
Automated merge with ssh://openslides.org/openslides
2012-04-15 15:53:10 +02:00
f44f2723dc
Added link to activate agenda item in overview table.
2012-04-15 15:53:05 +02:00
90038c1ad2
fix error by activating the Agenda
2012-04-15 15:46:32 +02:00
8b7fdc7a5c
Automated merge with ssh://openslides.org/openslides
2012-04-15 15:21:23 +02:00
4967b2b358
New agenda view template.
2012-04-15 15:21:19 +02:00
a3808c7b30
fixed problem in assignment poll
2012-04-15 14:58:05 +02:00
b620c0afb7
Add 'zoom' css attribute if we detect MSIE.
2012-04-15 14:51:50 +02:00
da9861b9f7
Automated merge with ssh://openslides.org/openslides
2012-04-15 14:28:34 +02:00
0657ff340d
Show clickable done action in first column in agenda overview.
2012-04-15 14:28:01 +02:00
82d4a2de4b
Try to get a working beamer preview for more browsers.
2012-04-15 14:27:27 +02:00
ddeaea88c4
Moved agenda pdf link to submenu.
2012-04-15 14:16:00 +02:00
abf7721f3f
Filled frontpage with config values.
2012-04-15 13:26:01 +02:00
91c9e1e9ab
some fixes
2012-04-15 13:10:24 +02:00
6f0fd91ec2
some permission problems
2012-04-15 12:52:59 +02:00
ae5c6b84a8
fixed webkit error be disable a button
2012-04-15 12:40:35 +02:00
4d7940cb12
Automated merge with ssh://openslides.org/openslides
2012-04-15 12:39:35 +02:00
95d5929449
Added participant and version config page. Moved system settings to general. Some style work.
2012-04-15 12:39:28 +02:00
d4d91c8194
fixed printing applications
2012-04-15 12:11:03 +02:00
f4ed79b68d
Application view: added link to edit a poll
2012-04-15 11:48:31 +02:00
bf5ae10552
remove Application.poll. projector slide
2012-04-15 11:39:38 +02:00
5678d9dd5e
deactivate supporters by default
2012-04-15 11:35:06 +02:00
a46e96841b
remove AgendaSummary
2012-04-15 11:33:26 +02:00
1d5455f8f9
frontpage
2012-04-15 11:24:40 +02:00
82993e3da8
Allow clicking on the beamer preview to open the real beamer view.
2012-04-15 10:44:15 +02:00
195ddddf7e
Automated merge with ssh://openslides.org/openslides
2012-04-15 10:36:51 +02:00
c07c2ac853
Print openslides version number in separat config template.
2012-04-15 10:36:37 +02:00
3222e75ab5
debounds from buttons
2012-04-15 10:30:34 +02:00
5f2c778880
Automated merge with ssh://openslides.org/openslides
2012-04-15 10:10:35 +02:00
48558504c4
only ask to delete children from agenda-items, if there are some
2012-04-15 10:08:10 +02:00
b1c86d4c19
Import template pages: Link to wiki page.
2012-04-15 10:07:45 +02:00
e752ddf3ee
fixe error with tabs in DetailView
2012-04-15 10:02:53 +02:00
361bc40821
view for Agenda.item
2012-04-15 09:55:21 +02:00
8149686a04
Updated German translation from "Benutzergruppe" to "Benutzerrolle". Some translation fixes.
2012-04-15 09:48:01 +02:00
785bd7c9a4
rename agenda.item.transcript in agenda.item.comment for Version 1.2
2012-04-15 09:41:17 +02:00
36ca264931
Remove superuser function.
2012-04-15 09:35:51 +02:00
bd3bf9fb6f
Updated translation.
2012-04-15 09:27:57 +02:00
e9ad4de11f
Minor template fix..
2012-04-14 22:45:33 +02:00
aef2a08666
Minor template fixes.
2012-04-14 22:41:02 +02:00
500b418f91
Automated merge with ssh://openslides.de/openslides
2012-04-14 20:10:56 +02:00
3a849880fb
code for control view in apps
2012-04-14 20:10:49 +02:00
6df95a23f6
Updated translations.
2012-04-14 19:33:50 +02:00
df7883deeb
Merged.
2012-04-14 19:18:36 +02:00
09d2c3112d
Minor fixes.
2012-04-14 19:14:51 +02:00
07f81f56f5
Use natural_keys for initial_data.json / fix auto selected permissions in group editor (lost in 409).
2012-04-14 18:53:18 +02:00
41899c02f4
Enlarged permissions select field.
2012-04-14 18:41:04 +02:00
a73b548032
Minor changes.
2012-04-14 18:13:55 +02:00
50df804010
Automated merge with ssh://openslides.org/openslides
2012-04-14 17:50:48 +02:00
ad1e87cd99
Some style work. Move countdown to message portlet.
2012-04-14 17:50:31 +02:00
d94baf9760
Automated merge with ssh://openslides.de/openslides
2012-04-14 17:09:23 +02:00
92d2b1db60
ballot methode for AssignmentPoll and ApplicationPoll
2012-04-14 17:09:15 +02:00
fc5b738b87
Automated merge with ssh://openslides.org/openslides
2012-04-14 16:17:30 +02:00
3ba6f9c26d
Projector control: Moved MessagesView to ControlView. Removed messages template.
2012-04-14 16:17:26 +02:00
75b9d6c63d
set message id in JS
2012-04-14 16:01:36 +02:00
7e56911aca
Ich will meine Anführungszeichen zurück!!!
2012-04-14 15:00:24 +02:00
f674897505
Split static files in application specific directories and use django 1.4 staticfiles app.
2012-04-14 14:51:56 +02:00
fbdcc5e0b4
Automated merge with ssh://openslides.de/openslides
2012-04-14 14:31:15 +02:00
535795391d
remove default permission after syncdb
2012-04-14 14:31:09 +02:00
1528ab90c6
Merged.
2012-04-14 14:27:31 +02:00
d192ac4952
Added AssignmentPollDelete View. Moved Assignment pdf functions to assignment's views.py
2012-04-14 14:24:13 +02:00
6f377453bc
rename system in config. Add default config in each apps
2012-04-14 12:52:56 +02:00
15a34fda97
project ProjectorSlide
2012-04-14 11:37:12 +02:00
c0bf5ba822
Automated merge with ssh://openslides.de/openslides
2012-04-14 11:18:54 +02:00
491c65cf24
use app name for projector category
2012-04-14 11:18:47 +02:00
a4db8a49dd
Automated merge with ssh://openslides.org/openslides
2012-04-14 10:54:31 +02:00
4abd79e7b5
Added PDF document title.
2012-04-14 10:54:22 +02:00
d2f9f630c7
Move AnonymousAuth from system to utils.
2012-04-14 09:49:37 +02:00
e8337278a1
Automated merge with ssh://openslides.de/openslides
2012-04-14 09:47:41 +02:00
0de8228537
rewrote message api and countdown
2012-04-14 09:47:34 +02:00
e84861211a
Fixed login/logout urls.
2012-04-14 09:42:30 +02:00
a792cd4c15
Support for localized permissions on top of the static django model.
2012-04-14 09:34:31 +02:00
7e12e1d5e2
Support for localized permissions on top of the untranslated django model.
2012-04-14 09:28:28 +02:00
d870b988e9
try to reload the beamer, if the server is down
2012-04-14 09:04:37 +02:00
3817a03aa8
Automated merge with ssh://openslides.org/openslides
2012-04-13 23:52:48 +02:00
698697a75c
Applications: Moved pdf functions from pdf.py to new PDF view in views.py.
2012-04-13 23:52:34 +02:00
cdf3628e8b
Check input files for UTF-8 encoding and display an appropriate error if not.
2012-04-13 22:33:47 +02:00
3bea7f1234
Ignore malformed lines in import file (ported from application import).
2012-04-13 22:02:14 +02:00
113d258b3d
#85 : New import option: set status of all imported applications to 'permit'
2012-04-13 21:55:13 +02:00
a1c5766e7a
Adjusted app prefix in urls.py (outsource in global urls.py). Some code formatting.
2012-04-13 21:43:16 +02:00
639397028e
removed some admin stuff. Fixed version-info, if no mercurial is installed
2012-04-13 16:47:40 +02:00
bb430fd2a7
remove admin, add plugin system for openslides
2012-04-13 14:05:51 +02:00
f889c49c1b
some clean up in participant app
2012-04-13 11:35:53 +02:00
f1261ae2a7
merge
2012-04-12 20:13:39 +02:00
d187f341b3
DeleteView in utils.views
2012-04-12 20:11:05 +02:00
733d78373e
#84 : Participants CSV import deletes applications
2012-04-12 19:11:07 +02:00
9e6aa796ab
fixed error in emty poll in assignment
2012-04-12 16:37:04 +02:00
fc95d01d07
some fixes
2012-04-12 16:21:30 +02:00
497a8cdb70
added AjaxView
2012-04-12 14:20:05 +02:00
07a83f142b
#84 : Participants CSV import deletes applications
2012-04-11 14:49:24 +02:00
3eeae673c0
some small fixes
2012-04-11 10:58:59 +02:00
5e6180a465
Some style changes for projector and agenda template.
2012-04-10 21:11:50 +02:00
fdc83048f4
More AJAX for projector control template. Moved projector stuff from agenda overview to new control page.
2012-04-10 20:09:10 +02:00
83ba0cbcf9
Fixed projector portlet style.
2012-04-02 20:59:17 +02:00
c3ada0abdd
Updated translation.
2012-04-02 08:44:17 +02:00
42820c1254
#83 : Merged fix of r365 from default branch into 1.2-dev branch.
2012-04-02 08:37:34 +02:00
Norman Jäckel