Emanuel Schuetze
648d5a6ad7
Fixed CKEditor stuff:
...
- Added missing insertpre plugin and allow <pre> tag with class
attribute. Added font style to base.css.
- Removed unused link to old ckeditor.css (now managed by
django-ckeditor).
2014-07-14 22:54:53 +02:00
Norman Jäckel
ae99784372
Enabled reload always when DEBUG==True.
2014-05-19 22:29:05 +02:00
Oskar Hahn
22bacd1054
bind the reload of the webserver on the debug settings
...
fix #1163
2014-05-19 22:18:45 +02:00
Oskar Hahn
16a6ad4a9e
Merge pull request #1278 from rolandgeider/ckeditor
...
Replace own CKeditor with dedicated app
2014-05-19 15:15:54 +02:00
Norman Jäckel
38a4cf1bc3
Merge pull request #1295 from emanuelschuetze/pdf-fix
...
PDF: Added missing 'fontName'.
2014-05-19 09:57:50 +02:00
Norman Jäckel
5dc4742f2f
Merge pull request #1291 from emanuelschuetze/fix-1235
...
Fixed #1235 (DeprecationWarning in utils.views.PDFView).
2014-05-19 09:54:45 +02:00
Roland Geider
e9d52245cb
Replace own CKeditor with dedicated app
2014-05-19 00:00:18 +02:00
Emanuel Schuetze
5f202c22a7
PDF: Add missing 'fontName'.
...
And set 'registerFontFamily(...)' to use bold/italic in regular paragraphs.
2014-05-18 13:57:20 +02:00
Emanuel Schuetze
bacc9ca87b
Fixed #1235 (DeprecationWarning in utils.views.PDFView)
2014-05-17 13:42:18 +02:00
Norman Jäckel
b16641c0dc
Renamed 'permission_required' to 'required_permission' etc.
...
Renamed method and attribute of openslides.utils.views.PermissionMixin. Renamed attribute of widgets and main menu entries. Fixed #1160 .
2014-05-15 20:07:09 +02:00
Norman Jäckel
43429d4015
Changed some docstrings.
2014-05-12 22:57:57 +02:00
Norman Jäckel
b8cd2d360b
Merge pull request #1270 from emanuelschuetze/fix1178
...
Adds plugin directory for win32 portable version (Fixed #1178 ).
2014-05-05 21:07:51 +02:00
Emanuel Schütze
7add4c5691
Portable: Create empty plugins directory.
...
Fixed file permissions.
2014-05-05 21:01:25 +02:00
Andy Kittner
3584da89c3
Automatically load plugins from portable plugins dir; closes #1178
...
All modules/ packages in the openslides/plugins subdirectory of the
portable version will be automatically added to INSTALLED_PLUGINS
2014-05-05 00:55:22 +02:00
Emanuel Schütze
3ece699cd6
Add get_win32_portable_user_data_path() function in main.py to return
...
correct user data path ("/openslides") of portable version.
2014-05-05 00:55:17 +02:00
Norman Jäckel
d638d5b7e2
Fixed bug of numbering view when there are orga items. Renamed toRoman to to_roman.
2014-05-04 14:00:28 +02:00
Stefan Frauenknecht
2c5b3a8e4f
Automatic numbering of agenda items
2014-05-04 13:47:01 +02:00
Norman Jäckel
42796f6118
Added global chatbox for managers.
2014-04-27 20:58:22 +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
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
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
ce8274fb53
Inserted command line option to translate config strings during database setup. Fixed #460 .
2014-01-31 02:03:43 +01: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
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
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
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
cde6232477
Merge branch 'stable/1.5.x'
...
Conflicts:
openslides/projector/projector.py
openslides/templates/base.html
2014-01-11 22:30:14 +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
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
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
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
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
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
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
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
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
Norman Jäckel
17a2eb97cb
Check used port, fix #985 .
2013-11-06 17:49:41 +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
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
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
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
Oskar Hahn
82f0df4fea
Send js to the projector
...
* fixed scroll and scale of the projector
2013-10-21 07:53:21 +02:00
Norman Jäckel
a1ad1e4c49
Some changes in __main__.py and utils.main and other.
...
Reinsert --no-browser option.
Move some code to utils.main.
Some other small style changes.
Fix merge conflict misstakes.
Change settings behavior. Add tests.
Fix rebase problems.
2013-10-19 14:44:46 +02:00
Andy Kittner
21a1d77e29
fix gui/portable for pull request #903
2013-10-19 14:44:20 +02:00