Commit Graph

564 Commits

Author SHA1 Message Date
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 df8b3a98b7 #117: Updated win32 readme and howto files. 2012-04-27 22:33:40 +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 0818a78cf4 Updated INSTALL file for 1.2. 2012-04-27 16:07:57 +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 f80fcb0b92 Add missing license header. 2012-04-25 22:36:09 +02:00
Emanuel Schuetze a8ac642120 Minor changes. 2012-04-25 22:31:25 +02:00
Emanuel Schuetze 7ef298881d Updated license header. 2012-04-25 22:29:19 +02:00
Andy Kittner c8ceb7ab3d Small improvements to portable build script (fixes #157)
- Make notice that prebuild openslides.exe is used instead of
   compiling it from source a bit friendlier so it isn't confused
   with an error

 - Reduce span of try/except to avoid masking errors when we only
   want to gracefully handle the case that no compiler is present

 - Show "success" message after creating the portable zip
2012-04-25 20:24:48 +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
Emanuel Schuetze 719ea6ec79 #93: Show application number in header of projector template.
Some more projetor style work.
2012-04-24 22:27:16 +02:00
Emanuel Schuetze 7cd6c52471 Updatd website (references). 2012-04-24 16:49:03 +02:00
Emanuel Schuetze 8988f32f45 Automated merge with ssh://openslides.org/openslides 2012-04-23 22:17:54 +02:00
Emanuel Schuetze 20f17d6235 Fixed untranslateable model string. 2012-04-23 22:17:45 +02:00
Emanuel Schuetze dc863cc3b9 Added custom slides portlet. 2012-04-23 22:07:52 +02:00
Emanuel Schuetze 3d0fe9b565 Updated translations. 2012-04-23 22:07:34 +02:00
Emanuel Schuetze cfcd2d10d7 Fixed wrong icon filename. 2012-04-23 21:48:20 +02:00
Andy Kittner 4048283a1f Add first draft of a README for the portable version 2012-04-23 21:36:30 +02:00
Andy Kittner b01493659c Add licenses of the bundled packages when creating the portable version 2012-04-23 21:35:47 +02:00
Emanuel Schuetze d56dcba7d4 #119: Adjusted icon filenames. 2012-04-23 21:27:22 +02:00
Emanuel Schuetze 590756ff3c Merged. 2012-04-23 08:07:49 +02:00
Emanuel Schuetze 81a0c9661e #119: Adjusted some icon filenames. 2012-04-23 08:07:21 +02:00
Norman Jäckel 0b756fd48a First chapters for German documentation. 2012-04-22 23:52:47 +02:00
Emanuel Schuetze 61b9d476ab Set default config values. 2012-04-22 16:55:16 +02:00
Emanuel Schuetze 1b8c1eda91 Updated translations. 2012-04-22 16:51:22 +02:00
Emanuel Schuetze 039bd4121c Some assignment poll template fixes. 2012-04-21 22:27:11 +02:00
Emanuel Schuetze 99bfd7257b #120: Add CSS class for helptext in forms. 2012-04-21 22:23:46 +02:00