Norman Jäckel
f8cdad711c
Simplify overlay api methods.
2014-04-15 00:33:34 +02:00
Norman Jäckel
2a10feecad
Added CSV import, fixed #1186 . Also cleaned up motion and user CSV import.
2014-04-13 20:35:19 +02:00
Norman Jäckel
78077e4ab1
Fix syntax and style errors and errors after deficient merge conflic
...
resolving after branch merging.
2014-04-08 21:02:09 +02:00
Norman Jäckel
e6dad6d087
Merge part of stable/1.5.x into master.
...
Conflicts:
CHANGELOG
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/__init__.py
openslides/core/templates/base.html
requirements_production.txt
tests/config/test_config.py
2014-04-08 20:33:07 +02:00
Emanuel Schütze
3d7ecab8e4
Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2
...
Conflicts:
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/assignment/views.py
openslides/core/static/img/circle.png
openslides/motion/pdf.py
openslides/utils/pdf.py
2014-04-07 22:35:52 +02:00
Norman Jäckel
c13c0997bf
Merge part of stable/1.5.x into master.
...
Conflicts:
openslides/agenda/views.py
openslides/mediafile/forms.py
openslides/projector/api.py
The fix from commit 39de1924cb
was removed
because of the new widget system in master branch. See GitHub Issue #1191
2014-04-05 15:19:42 +02:00
Norman Jäckel
ba1dc9673f
Update version to 1.5.2-dev
2014-03-31 23:55:32 +02:00
Norman Jäckel
18a434ed87
Release 1.5.1
2014-03-31 23:55:32 +02:00
Norman Jäckel
a15311dfeb
Merge pull request #1238 from normanjaeckel/Translation
...
Update translation files, fix translation for dataTables, update footer.
2014-03-31 23:21:54 +02:00
Norman Jäckel
3ae7b0f761
Update translation files, fix translation for dataTables, update footer.
2014-03-31 23:07:42 +02:00
Roland Geider
5bac8ec1e4
Correctly handle nested lists in the motion PDF
...
See #1217
2014-03-31 22:07:14 +02:00
Oskar Hahn
3b65e89f7c
fix user status view (activate, deactivate user without js)
2014-03-30 17:22:42 +02:00
Emanuel Schütze
b5fb83c026
Fixed #551 : Used unicode font for circle in ballot pdf. Removed pillow.
...
That fixed also #1140 (Server error when trying to view ballot paper pdf)
2014-03-29 13:20:31 +01:00
Norman Jäckel
ee3ec3d4b6
Fixed flake8 errors.
2014-03-27 20:38:13 +01:00
Norman Jäckel
39de1924cb
Added extra permission check to speaker widget, fixed #1191 only for 1.5.x branch
2014-03-13 00:50:49 +01:00
Norman Jäckel
e7f67457db
Regrouped config collections and pages. Fixed #1201 .
2014-03-13 00:41:57 +01:00
Oskar Hahn
a6fa8457cc
Merge remote-tracking branch 'openslides/stable/1.5.x'
...
Conflicts:
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/motion/templates/motion/motion_list.html
openslides/projector/templates/projector.html
requirements_production.txt
2014-03-12 19:29:22 +01:00
Oskar Hahn
57ea4af4e2
Merge pull request #1211 from normanjaeckel/PreviewAgenda
...
Reinserted icon and link for preview of agenda slide. Fixed #1199 .
2014-03-11 07:42:24 +01:00
Norman Jäckel
ce8274fb53
Inserted command line option to translate config strings during database setup. Fixed #460 .
2014-01-31 02:03:43 +01:00
Norman Jäckel
3b42c16e04
Reinserted icon and link for preview of agenda slide. Fixed #1199 .
2014-01-31 01:02:12 +01:00
Norman Jäckel
d49d087f4e
Merge pull request #1208 from ostcar/customslide
...
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-29 04:09:52 -08:00
Oskar Hahn
2392c1ab36
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-28 08:32:26 +01:00
Emanuel Schuetze
cfa35241e1
Fixed #1138 : Wrong file for projectors logo
2014-01-27 21:15:53 +01:00
Emanuel Schuetze
d15488478d
Fixed #1195 : Correct path to circle.png on ballot paper (assignment and motion).
2014-01-27 20:54:32 +01:00
Emanuel Schuetze
13eb0ccb30
Fixed #1190 : Wrong sorting of motion identifier
...
- Added natural sorting JS plugin for motion DataTables (column identifier).
- Added the new requirements python package 'natsort' for natural sorting of motions in PDF.
2014-01-21 23:14:39 +01:00
Norman Jäckel
4c3791a9a8
Merge pull request #1193 from emanuelschuetze/rename-static-files
...
Rename and clean up static directories.
2014-01-16 13:35:38 -08:00
Emanuel Schuetze
d8d2ad002a
Rename and clean up static direcories.
...
- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files
2014-01-14 23:27:12 +01:00
Norman Jäckel
4b63f3a288
Coupled assignment candidates with list of speakers. Fixed #1092 .
2014-01-13 15:22:46 +01:00
Oskar Hahn
d72fe39da6
Merge branch 'stable/1.5.x'
2014-01-12 13:38:07 +01:00
Oskar Hahn
bbd7542341
Fixed agenda_item.is_active_slide() with related item and list of speakers
2014-01-12 12:48:38 +01:00
Norman Jäckel
04b0cfb0bc
Used entry points to detect plugins automaticly.
2014-01-12 12:48:24 +01:00
Norman Jäckel
e0223c950b
Added possibility to use custom templates and static files in user data path directory.
2014-01-12 11:05:54 +01:00
Oskar Hahn
6409f828d7
Added a poll description field for each assignment poll
...
fixed signals in MainMenuTests
2014-01-12 10:22:38 +01:00
Oskar Hahn
c82ee4ce1f
Added AbsoluteUrlMixin and used it in any model.
...
cleaned up get_absolute_url() in some models
2014-01-12 00:35:16 +01:00
Norman Jäckel
3fe9169786
Merge pull request #1175 from normanjaeckel/MultipleParticipantsForm
...
Added form field for multiple creation of new participants. Fixed #178 .
2014-01-11 15:26:36 -08:00
Norman Jäckel
b95a856904
Added form field for multiple creation of new participants. Fixed #178 .
2014-01-11 23:09:59 +01:00
Oskar Hahn
90f9313faa
Use the jsonfield as requirement
2014-01-11 23:01:29 +01:00
Oskar Hahn
56c8dcdac1
Merge branch 'stable/1.5.x'
2014-01-11 22:58:39 +01:00
Oskar Hahn
558bef2e91
Merge pull request #1167 from normanjaeckel/MainError
...
Fixed error in main script when using other database engine. Fixed #1166 .
2014-01-11 13:49:57 -08:00
Oskar Hahn
cde6232477
Merge branch 'stable/1.5.x'
...
Conflicts:
openslides/projector/projector.py
openslides/templates/base.html
2014-01-11 22:30:14 +01:00
Oskar Hahn
ad09a18e3f
removed edit and view in get_absolute_view
2014-01-11 17:39:16 +01:00
Oskar Hahn
4c86c9cd07
Fix list_of_speaker overlay
...
* Issue a warning message, if a overlay raises a exception
* Fixed #1131
2014-01-11 09:21:35 +01:00
Norman Jäckel
19ccbd3b17
Fixed error in main script when using other database engine. Fixed #1166 .
2014-01-11 08:51:17 +01:00
Norman Jäckel
21ff62dd32
Changes in projector and core app and in utils.
...
Changed api for main menu entries.
Enhanced http error pages using a classed based views.
Moved dashboard and select widgets view from projector to core app.
Also some small clean ups.
2014-01-10 16:17:54 +01:00
Norman Jäckel
22960748a3
Added permission to see participants also to the manager group. See #1150 .
2013-12-23 19:14:11 +01:00
Norman Jäckel
1e52959f70
Fixed error when a file was removed from filesystem. Fixed #1120 .
2013-12-23 18:46:04 +01:00
Norman Jäckel
03fd7fd142
Fixed http status code when requesting a non-existing static page using Tordado web server. Fixed #1161 .
2013-12-23 17:42:11 +01:00
Norman Jäckel
9a3243706b
Inserted api for the personal info widget.
2013-12-09 12:16:16 +01:00
Norman Jäckel
405fadb6f5
Rename some classes of the poll api. Clean up the poll api.
2013-12-07 00:24:11 +01:00
Norman Jäckel
bdf1679eb0
Rename classes in the config api.
...
Also change attributes for config collection without view.
2013-12-06 10:47:20 +01:00
Norman Jäckel
fee983045b
Change API for plugins, esp. for names and versions of plugins. Also enhance possibility to patch existing OpenSlides urlpatterns.
...
Fix some other tests by the way.
2013-12-05 16:40:54 +01:00
Norman Jäckel
91ca066aa5
Enable update and delete view for uploader refering to his own files.
2013-12-03 01:53:37 +01:00
Norman Jäckel
43c6efa222
Disable participant widgets by default. Fixes #988 .
2013-12-02 18:03:28 +01:00
Oskar Hahn
2cf2774e58
Merge pull request #1139 from DerPate/fix_last_gpl_header
...
remove the last occurence of gnu gpl license header fix #1130
2013-12-02 07:46:09 -08:00
Dominik Breu
a3bf29acf2
remove the last occurence of gnu gpl license header fix #1130
2013-12-01 22:52:08 +01:00
Norman Jäckel
1fb1f17d15
New API for widgets using a metaclass.
...
It is now possible to define a default state and to submit extra stylefiles and javascript files when defining a widget in an app. This is done by a new metaclass in openslides.utils.dispatch. Also fixed some other tests.
2013-12-01 21:30:12 +01:00
Emanuel Schuetze
25d7e0f99b
Fixed dummy-notification message class and generic new_message function.
2013-11-29 13:04:29 +01:00
Emanuel Schuetze
42f10fa03d
Fixed projector template: Removed double <hr> in welcome and custom slide.
2013-11-29 13:04:28 +01:00
Norman Jäckel
f510399230
Update version to 1.6a1-dev.
2013-11-25 23:42:52 +01:00
Norman Jäckel
dfa334782e
Update version to 1.5.1-dev
2013-11-25 20:26:06 +01:00
Norman Jäckel
dc529feda4
Release 1.5
2013-11-25 20:26:06 +01:00
Oskar Hahn
5541861176
Merge pull request #1125 from emanuelschuetze/documentation1.5
...
Documentation1.5
2013-11-25 11:08:25 -08:00
Emanuel Schuetze
0d149180dd
Updated documentation for 1.5
...
- Updated all screenshots.
- Improved image handling with autoimage extension.
- Some minor content updates for 1.5 version.
- Fixed wrong list of speakers icon.
2013-11-25 17:14:11 +01:00
Oskar Hahn
49ca243153
Add function get_active_object and bugfixes
...
* Dont throw errors in overlay.get_projector_html if debug == False
* fixe check of active slide in agenda
* Fix #1121
2013-11-25 11:35:03 +01:00
Oskar Hahn
d6a824936d
Merge pull request #1119 from ostcar/translate_languages
...
translate lanuage names in global_settings
2013-11-24 15:08:42 -08:00
Oskar Hahn
d02721a1f1
translate lanuage names in global_settings
...
Fixes : #1118
2013-11-25 00:07:06 +01:00
Emanuel Schuetze
ed427048af
Final update of all languages for 1.5: CS, DE, FR, PT.
2013-11-24 20:37:13 +01:00
Oskar Hahn
f8048da76c
Fixed countdown and projector update issues
...
* agenda_item.get_absolute_url('projector') returns the activate-url of the related slide.
* agenda_item.is_activate() returns True, if the related item is active
* Fixed set_active_slide to accept kwargs
* Reset countdown when saving a new duration time
* Update countdown overlay when begin_speak and end_speak is called
* Fixed blinking countdown
Fixes : #1078 , #1076 , #1075
2013-11-24 10:04:01 +01:00
Norman Jäckel
d2d8b5a39d
Fix start script help text.
2013-11-23 18:49:51 +01:00
Norman Jäckel
2af3b320c8
Merge pull request #1116 from emanuelschuetze/template-fix2
...
Minor template fixes
2013-11-23 08:25:33 -08:00
Emanuel Schuetze
f1fd3208bd
Template fixes
...
- Agenda overview: Fixed padding of duration column.
- Agenda overview: Optimize header information for small devices with bootstrap's row-fluid class.
- Fixed text align in assignment detail template.
2013-11-23 15:05:19 +01:00
Emanuel Schuetze
8ca4f0409f
Use btn-mini class for list of speakers question in agenda view.
2013-11-22 20:39:28 +01:00
Emanuel Schuetze
f59b25e0dc
Updated EN po file.
2013-11-22 15:35:24 +01:00
Emanuel Schuetze
301bc8ac7c
Translate state.name in motion log message.
2013-11-22 15:34:32 +01:00
Emanuel Schuetze
94abda60b5
Added help text for duration field in agenda item form. ( Fixed #1085 )
2013-11-22 10:04:00 +01:00
Norman Jäckel
5bff907b34
Merge pull request #1091 from emanuelschuetze/template-fixes
...
Fixed a lot of template bugs from irc test session.
2013-11-21 10:48:40 -08:00
Dominik Breu
8e6269b495
fix #1085 maybe could be done better but for 1.5 integration this could be used . input 60< is converted to hh:mm
2013-11-21 08:13:24 +01:00
Emanuel Schuetze
9aed1f764d
Fixed a lot of template bugs.
...
- agenda overview: Text align right for duration column.
- item summary slide: Show 'get_title_supplement' after each related agenda item.
- item detail view: Add ":" in button after item content_type
- projector: Show <hr> below title/subtitle line.
- motion view: Check manage permission for delete version button in version history table.
- motion detail view: Update version authorized badges and go to buttons.
- motion list: Link warning icon to newest version.
- assignment detail view: Added ballot paper pdf button.
- Group slide and overview: Show members.
- Use dynamic title column width in participants pdf.
- Fixed missing translations in user settings form.
- IE8/9 fix for projector template style.
- Style linebreak and border in h1 title with css.
2013-11-20 22:05:10 +01:00
Norman Jäckel
c34b407945
Fix templatetag, #1077 .
2013-11-19 17:57:03 +01:00
Oskar Hahn
3d19ae7db2
Merge pull request #1082 from normanjaeckel/SetStateView
...
Add check for set state view, fix #1080 .
2013-11-19 08:13:10 -08:00
Norman Jäckel
31af5c0ce6
Add check for set state view, fix #1080 .
2013-11-19 01:06:38 +01:00
Norman Jäckel
1a33c1c9f1
Add percent base value to all polls, fix #1079 .
2013-11-19 00:19:46 +01:00
Emanuel Schuetze
208c870705
Rename assignment to election in translation strings which are used in the GUI.
...
Updated EN po file.
2013-11-18 17:21:21 +01:00
Emanuel Schuetze
28271019fd
Improved #1023 - Motion csv import: Collect all warnings and errors in one message.
2013-11-18 17:21:21 +01:00
Oskar Hahn
ddffffd3a1
Merge pull request #1071 from emanuelschuetze/fix-1070
...
Fixed #1070 (Clear search index for deletedb and syncdb command)
2013-11-18 08:07:32 -08:00
Oskar Hahn
ecb3db851a
Use the default django message back end
2013-11-18 09:28:49 +01:00
Oskar Hahn
3fc531255f
Merge pull request #1069 from ostcar/reset_passwort_question
...
Make sure QuestionView.get_question_message is in a unicode context.
2013-11-18 00:26:24 -08:00
Oskar Hahn
4db41e3161
Merge pull request #1064 from emanuelschuetze/fix-947
...
Fixed #947 : Move pdf functions of participant app to new pdf.py
2013-11-18 00:25:52 -08:00
Oskar Hahn
4fa2c25978
Make sure QuestionView.get_question_message is in a unicode context.
...
This is important if the attribute question_message is set with
ugettext_lazy which needs an unicode context
Fixes #1066
2013-11-17 11:11:39 +01:00
Emanuel Schuetze
85fc09036f
Fixed #1070 (Clear search index for deletedb and syncdb command)
2013-11-16 20:38:41 +01:00
Emanuel Schuetze
40ef2a31f6
Fixed #947 : Move pdf functions of participant app to new pdf.py
2013-11-15 20:15:21 +01:00
Dominik Breu
0c32ef9c40
fix #1044 Remove GNU GPL header
2013-11-15 16:01:14 +01:00
Andy Kittner
87d46d079d
Rework DjangoStaticFileHandler ( fixes #1034 )
...
Fixes multiple issues
- Unicode errors when path contained non-ascii characters
- 403 errors when the current working directory was not a parent
directory of the static files
- "API abuse" super() implementation of the get() method was passed a
filesystem path instead of the url-path it was expecting
- The above could also lead to 403 errors on case-insensitive file
systems due to the way the base-class resolved and validated paths
with respect to self.root
2013-11-14 22:45:29 +01:00
Norman Jäckel
9dc73fa6de
Verbose name of Assignment inserted, fixed #1036
...
It is neccessary to refresh the database table for the content types, e. g. by deleting the database and runing syncdb.
2013-11-14 22:38:12 +01:00
Andy Kittner
0d4c48a9c0
Set reuse address option ( fixes #1043 )
...
When the server is killed there may still be client-sockets connected in
the TIME_WAIT state, causing the bind() call to fail. With the
REUSEADDR option we can reuse the address immediately unless another
process is actually *listening* on the same address.
that we want to reuse the address
2013-11-14 22:38:12 +01:00
Max Brauer
091a2bc35c
Bugfix in agenda.js ( fixes #1041 )
2013-11-12 21:33:57 +01:00
Oskar Hahn
728a33f5c3
Merge pull request #1021 from DebVortex/feature/fix-issue-994
...
fixes #994 : store collapsed and fixed of widets in cookie, too.
2013-11-12 05:36:08 -08:00
Max Brauer
c7afce30a1
fixes #994 : store collapsed and fixed of widets in cookie, too.
2013-11-12 14:29:48 +01:00
Oskar Hahn
c4c9483b5e
Merge pull request #1046 from emanuelschuetze/translation-fix
...
Fixed typo (titel->title).
2013-11-12 05:07:45 -08:00
Oskar Hahn
d9cf05ef55
Merge pull request #1042 from emanuelschuetze/1.5b2-fixes
...
1.5b2 fixes
2013-11-12 05:07:17 -08:00
Emanuel Schuetze
b8e30188ad
Fixed #1040 : Show only last motion poll results on projector.
2013-11-12 11:13:36 +01:00
Emanuel Schuetze
06b91b89bb
Fixed typo (titel->title).
2013-11-12 10:57:07 +01:00
Oskar Hahn
9d8d9f806f
Fixed agenda slide
...
Fixes #1035
2013-11-12 08:59:20 +01:00
Emanuel Schuetze
2034852fa8
Fixed #1038 : Increase small input fields in poll forms.
2013-11-11 17:36:52 +01:00
Emanuel Schuetze
92b111c0bd
Fixed #1039 : Motion poll edit view: projector icon needs 'if slide is activate' check.
2013-11-11 17:36:12 +01:00
Norman Jäckel
cc0298eaa0
Use encoded string for insert in sys.path and print during main script. Fix #1022 .
2013-11-10 22:21:14 +01:00
Norman Jäckel
84a2fa41f0
Merge pull request #1029 from normanjaeckel/RepairDjangoUpdate
...
Move run_tornado import into runserver function because its imports need...
2013-11-10 13:21:32 -08:00
Norman Jäckel
c4850e4b19
Move run_tornado import into runserver function because its imports needs settings (new in Django 1.6).
2013-11-10 22:15:13 +01:00
Emanuel Schuetze
0a2c73842a
Updated translations (DE, PT, CS).
2013-11-10 21:56:07 +01:00
Norman Jäckel
d2309cbe49
Merge pull request #1026 from normanjaeckel/EnglishTransFile
...
Update English translation files.
2013-11-10 12:27:09 -08:00
Norman Jäckel
7b45231211
Merge pull request #1001 from ostcar/django1.6
...
Update to Django 1.6
2013-11-10 12:26:06 -08:00
Norman Jäckel
ec0a27e545
Update English translation files.
2013-11-10 21:13:57 +01:00
Emanuel Schuetze
1fb0a21d0b
Some more template fixes:
...
- Fixed #992 (Use correct countdown format)
- Fixed #909 (Backend und projector template style)
* Search bar with same border-radius like login button.
* Projector: Fixed overlay message style. Allow HTML code (use template filter 'safe').
* Dashboard: Tooltips, Buttons and Widget fixes.
- Fixed template does not exists error if custom slide is activated.
- Countdown: Add css to show negative countdown in red.
- Add missing translation strings to English po file (for transifex).
2013-11-10 20:50:30 +01:00
Emanuel Schuetze
34701c67a6
Template improvements.
...
- motion detail template: Fixes motion manage state template block.
- mediafile list template: Fixed missing activeline class.
- item detail template: Fixed is_active_slide conditions.
- assignment view template: Use bottongroup instead of single radio buttons.
- Projector template: Updated header and countdown style. Removed footer.
- Added config options to show logo and/or title/description.
- Projector template: New config options to set background color and font color for projector header.
- Make WLAN form labels not translateable.
2013-11-10 20:27:38 +01:00
Emanuel Schuetze
45588024fd
Fixed #957 (Allow list-style in CKEditor)
...
Allowed additional css styles 'color' and 'background-color'
for span html fields in ck-editor (and bleach).
2013-11-10 19:33:38 +01:00
Oskar Hahn
31729534fa
Merge pull request #1016 from emanuelschuetze/fix897
...
Use correct server time for all clients
2013-11-10 08:32:16 -08:00
Emanuel Schuetze
3b8c8145d7
Fixed #897 (Use correct server time for clock/countdown on other clients)
2013-11-09 21:28:45 +01:00
Oskar Hahn
2a7a50a817
Show default_slide if an error occurs in a slide
...
See #925
2013-11-09 15:14:55 +01:00
Oskar Hahn
ab048e3393
Update to Django 1.6
2013-11-07 18:56:06 +01:00
Oskar Hahn
e92af391c3
Merge pull request #1005 from ostcar/activate_view
...
Update scroll and sale in activate view.
2013-11-07 09:53:34 -08:00
Oskar Hahn
5fff885c89
Merge pull request #1012 from ostcar/issue_998
...
removed unused javascript. Fixes #998
2013-11-07 08:03:42 -08:00
Oskar Hahn
fe68fffdda
removed unused javascript. Fixes #998
2013-11-07 13:53:33 +01:00
Oskar Hahn
01eb64c1d2
Update scroll and sale in activate view.
...
Fixes #939
2013-11-07 12:45:17 +01:00
Oskar Hahn
929587971a
Merge pull request #1006 from normanjaeckel/CheckPort
...
Check used port, fix #985 .
2013-11-06 13:03:40 -08:00
Oskar Hahn
2309bd4772
Merge pull request #1004 from ostcar/update_projector_default_slide
...
Update projector when the title of the default slide changes
2013-11-06 12:34:33 -08:00
Norman Jäckel
17a2eb97cb
Check used port, fix #985 .
2013-11-06 17:49:41 +01:00
Oskar Hahn
cc8b573b62
Update projector when the title of the default slide changes
2013-11-06 17:28:17 +01:00
Oskar Hahn
1ebca3b12e
Fixed participant edit view
2013-11-06 17:08:54 +01:00
Oskar Hahn
5040de8dcb
Merge pull request #1000 from ostcar/javascript
...
Fixed some javascript related problems
2013-11-06 07:40:51 -08:00
Oskar Hahn
2d07644d3c
Fixed some javascript related problems
2013-11-06 14:58:30 +01:00
Emanuel Schuetze
97d6cd37b4
Updated EN po file for transifex.
2013-11-06 08:56:40 +01:00
Oskar Hahn
0752d476e4
Change to MIT Licence
...
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
Oskar Hahn
2691e2b239
More Tests for projector views
2013-11-04 14:53:07 +01:00
Oskar Hahn
71666094e7
Add tests for the projector code
2013-10-30 18:58:15 +01:00
Emanuel Schuetze
4234b46b36
Update version to 1.5-dev
2013-10-29 22:31:43 +01:00
Emanuel Schuetze
efcaffaa02
Release 1.5b1
2013-10-29 22:31:28 +01:00
Max Brauer
bd332bd3d5
added possibility to show pdfs on the projector
2013-10-29 22:05:11 +01:00
Emanuel Schuetze
ccdf5ef2e0
Motion PDF: Keep whitespaces in monospace <pre> tags and replace it with ' '.
2013-10-29 14:57:23 +01:00
Oskar Hahn
558b4e9f86
Merge pull request #966 from normanjaeckel/NewCommandDevSettings
...
New command create-dev-settings. Clean up main script. Fix wrong path fo...
2013-10-29 00:08:16 -07:00
Norman Jäckel
3ec18194fa
New command create-dev-settings. Clean up main script. Fix wrong path for Windows version.
2013-10-29 00:48:49 +01:00
Emanuel Schuetze
2c4a2b3628
Fixed #943 : User settings menu button should not run out of the screen (right side)
2013-10-28 21:43:11 +01:00
Oskar Hahn
10bd38d3a5
Fixed reload of javascript
2013-10-28 21:17:32 +01:00
Oskar Hahn
76c0a98ab8
Merge pull request #960 from ostcar/time_format
...
Time format
2013-10-28 13:05:53 -07:00
Oskar Hahn
ffe612359f
use the server_time for countdown and clock
2013-10-28 21:05:32 +01:00
Dominik Breu
ef687ad23c
Fix for wrong format of clock and countdown on projector
2013-10-28 21:05:28 +01:00
Norman Jäckel
b2afa77e25
Add error message if a invalid answer was send via POST to a QuestionView. Fix #940 .
2013-10-28 17:02:18 +01:00
Oskar Hahn
47c60078b3
Use sockjs instead of only websocket
2013-10-27 20:50:10 +01:00
Oskar Hahn
6f7dabe870
Merge pull request #955 from normanjaeckel/Fix927
...
Add message if someone adds himself to the list of speakers. Fix #927 .
2013-10-25 23:59:00 -07:00
Oskar Hahn
e27c746f4a
Merge pull request #954 from emanuelschuetze/password-pdf
...
Use DIN A4 format and wlan ssid qrcode on access data PDF
2013-10-25 23:56:21 -07:00
Emanuel Schuetze
a513477033
Fixed #948 : Use DIN A4 format and wlan ssid qrcode on access data PDF.
2013-10-25 20:51:48 +02:00