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
Norman Jäckel
218d0bad23
Add message if someone adds himself to the list of speakers. Fix #927 .
2013-10-24 18:24:19 +02:00
Emanuel Schuetze
84d2619289
Improved projector zoom and scroll behaviour.
...
Zoom and scroll the full content div (incl. title and sidebar).
Add zoom and scroll level in projector live view widget.
2013-10-23 19:44:37 +02:00
Norman Jäckel
6175ce25c5
Fix #934 : Error in motion import with bad csv file.
2013-10-22 00:18:58 +02:00
Norman Jäckel
9d80c05f90
Fix url_name_args bug.
...
Fix delete view for motion categories. Add test for custom slide delete view.
2013-10-21 22:51:38 +02:00
Oskar Hahn
8303c4444f
Merge pull request #933 from emanuelschuetze/requirements
...
Requirements
2013-10-21 12:59:10 -07:00
Emanuel Schuetze
f1a8993452
Used reportlabs qrcode widget (instead of extra qrcode package).
2013-10-21 21:27:07 +02:00
Emanuel Schuetze
d76846e385
Updated EN + DE translation file.
2013-10-21 21:20:55 +02:00
Emanuel Schütze
af14f962df
Merge pull request #936 from emanuelschuetze/translation
...
Updated EN djanog.po file.
2013-10-21 11:50:29 -07:00
Emanuel Schuetze
8b8435109b
Updated EN djanog.po file.
2013-10-21 20:46:59 +02:00
Norman Jäckel
b0e3c7d456
Fix missing url_name_args = [] lines in different views.
...
Fix custom slide create and update view.
Fix motion category create and update view.
2013-10-21 19:10:53 +02:00
Emanuel Schuetze
bac918a9e8
Some bug fixing for 1.5b1
...
- Fixed #921 (Check THANKS URL for jQuery UI Nested Sortable)
- Fixed #919 (Permission problem in agenda)
- Fixed #918 (Search does not work for guest users)
- Fixed search-bar position.
- Updated EN po files.
2013-10-21 14:39:28 +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
273140007e
Fix url_name_args problems in user and group views. Add tests.
2013-10-20 21:42:17 +02:00
Oskar Hahn
c399eea2dd
Merge pull request #920 from normanjaeckel/CountdownAndAgenda
...
Countdown and agenda
2013-10-19 22:19:26 -07:00
Norman Jäckel
40faaa39c6
Changed begin speach behavior. Fix merge conflicts. Add tests.
2013-10-19 14:52:37 +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
Norman Jäckel
c63b7f995f
Clean up main.py and move code to __main__.py and utils/main.py.
2013-10-19 14:44:20 +02:00
Emanuel Schuetze
40af20cedb
New feature: couple countdown with list of speakers
...
'Begin speach' button starts countdown, 'end speach' button stops countdown.
2013-10-18 22:30:05 +02:00
Norman Jäckel
30371e964f
Insert new feature: attachments for motions.
...
Fixed #522 . Database struture changed.
2013-10-18 12:32:29 +02:00
Roland Geider
8f274c2691
Add CKeditor to the agenda item text field
2013-10-18 10:18:05 +02:00
Oskar Hahn
68b9a2e291
Cache the results of ItemDelete.get_answer_options
...
Fix #911
2013-10-18 07:49:39 +02:00
Oskar Hahn
d3f673a276
Merge pull request #912 from normanjaeckel/Fix910
...
Fix wrong question_url_name in ItemDelete view. Fix #910 .
2013-10-17 22:36:04 -07:00
Norman Jäckel
d76a04f443
Fix wrong url_name_args in ItemDelete view. Fix #910 .
2013-10-17 22:00:00 +02:00
Emanuel Schuetze
e277b8babf
Full text search with haystack and whoosh.
...
Updated THANKS file.
Portable: Added haystack and whoosh.
2013-10-16 08:58:35 +02:00
Roland Geider
95fe58eb99
Add prototype of full text search integration in openslides
...
Allow for empty title and text body, fix pep8 errors
2013-10-15 22:35:53 +02:00
Oskar Hahn
d937262d28
Use flake8 instead of pep8. Orderd the imports with isort
...
* changed the fab-command pep8 to check
* checked and fixed any code with flake8. Also the urls.py
* checkt the projector app with pylint
2013-10-14 18:43:12 +02:00
Oskar Hahn
d644d49579
Cleaned up utils
2013-10-13 20:43:26 +02:00
Emanuel Schuetze
a4d024f45c
Some template fixes and improvements:
...
- Fixed absoluteurl in motion detail template. Renamed '_edit' to '_update'.
- Fixed wrong projector link ind assigment poll template.
- Improved assignment projector slide.
- Fixed #884 : Add PDF note to translation string "Show paragraph numbering"
2013-10-12 20:29:27 +02:00
Oskar Hahn
6aae8bff15
More projector fixtures
...
* Update projector when polls are updated.
* Update projector when assignment candidates are updated
* Update projector when motion submitter are updated
* Fixed the assignment publish poll view
* Added projector.api.register_slide_model
2013-10-10 18:40:24 +02:00
Emanuel Schuetze
84d5293fbc
Rework (projector) template with bootstrap.
...
- Always use templatetag 'absolute_url' instead of (depricated) 'model_url'.
Search and replace all old arguments: edit -> update, view -> detail, delete
- Fixed bug in setting default value in 'absolute_url' templatetag
(default value is defined in models.py only).
Updated 'backend' template.
2013-10-07 08:57:22 +02:00
Oskar Hahn
d681e94eed
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
AUTHORS
2013-10-04 09:13:51 +02:00
Oskar Hahn
6926630d3e
Added Feature for config app, to return the default value for a key
2013-09-29 15:10:01 +02:00
Oskar Hahn
ecf5248962
Rework of the projector with websocket
...
* Set a static projector title
* absolute_urls for the activate links
* update the projector when a slide changes (in save())
* insert the absolute_url template filter
* Preview to slides
* renamed is_active to is_active_slide
* The SlideMixin has to come before the PersonMixin
* Update list of speakers
* Render Countdown via JS
* Reconnect projector after connection lost
* Overlays can allways be active and do not appear in the widget
* Rewrote the clock as overlay
2013-09-24 23:35:05 +02:00
Oskar Hahn
93079938a3
Fixed keyerror on user setting page
...
Fix #891
2013-09-24 23:31:45 +02:00
Emanuel Schuetze
7f172692da
Added Portuguese translation (Thanks to Marco A.G.Pinto)
2013-09-24 22:13:50 +02:00
Oskar Hahn
d2f5302e28
Merge pull request #888 from ostcar/sucess_message
...
Success_message in utils.views
2013-09-14 21:34:47 -07:00
Max Brauer
bf4825a3e0
Refactored assignments app to use class based views instead of
...
functions.
2013-09-14 18:20:35 +02:00
Oskar Hahn
477daa3fdf
Success_message in utils.views
2013-09-14 11:09:45 +02:00
Oskar Hahn
66679c8efe
Merge branch 'stable/1.4.x'
...
Conflicts:
openslides/__init__.py
2013-09-14 11:07:02 +02:00
Norman Jäckel
cd2f01ed26
Update version to 1.4.3-dev
2013-09-10 21:40:44 +02:00
Norman Jäckel
5854bb1f50
Release 1.4.2
2013-09-10 21:38:30 +02:00
Emanuel Schuetze
f2829eb173
Updated DE and FR translation (one new translation string).
2013-09-10 20:58:59 +02:00
Emanuel Schuetze
e621335169
Updated English translation file (for new translation string in motion config).
2013-09-10 09:07:12 +02:00
Emanuel Schuetze
0246525a7a
Updated DE, FR, CS translation (typo in EN translation string).
2013-09-09 22:12:10 +02:00
Oskar Hahn
7faf59a82b
Merge pull request #878 from ostcar/change_agenda_items
...
Fixed wrong ordering of agenda items after order change
2013-09-09 02:04:27 -07:00
Oskar Hahn
3bf1f24a4a
Fixed wrong ordering of agenda items after order change
...
Fixed #875
2013-09-08 11:17:32 +02:00
Norman Jäckel
404d0fc272
Add on_change_callback to config variables. These callback can be defined in the ConfigVariable object and is called, when the variable is changed.
2013-09-08 11:16:23 +02:00
Oskar Hahn
a28ca8a4a3
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/assignment/models.py
2013-09-07 16:48:55 +02:00
Norman Jäckel
26607da154
Fix delete of assignments with related agenda items.
2013-09-07 16:33:10 +02:00
Oskar Hahn
b228a02429
Merge remote-tracking branch 'openslides/stable/1.4.x'
2013-09-07 15:42:16 +02:00
Oskar Hahn
5ad3085551
Merge pull request #871 from normanjaeckel/DefaultWidgetSorting
...
Add default sorting of widgets. Fix #493
2013-09-07 06:36:21 -07:00
Oskar Hahn
afe186add4
Fixed repr in widget
2013-09-07 15:19:03 +02:00
Norman Jäckel
a50617676a
Add default sorting of widgets. Fix #493
2013-09-07 15:13:27 +02:00
Emanuel Schuetze
1045f14026
Fixed missing creation time of motion version.
...
Show now string if identifier is not set set (in widgets and motion detail).
2013-09-07 14:31:21 +02:00
Norman Jäckel
c800884a43
Use GenericForeignKey for agenda related items, fix #865
2013-09-07 14:30:25 +02:00
Oskar Hahn
9084216f06
Merge branch 'stable/1.4.x'
2013-09-07 00:15:31 +02:00
Emanuel Schuetze
cb7d54973d
Fixed #858 : Removed max value (8) of config field "motion_min_supporters".
...
Removed supporters signature field in motion pdf to prevent the unused signature fields
which are printed for each required supporters if you have a high minimum supporters number.
2013-09-06 21:59:54 +02:00
Emanuel Schuetze
48f8e82eda
Fixed #859 : New config option to disable paragraph numbering in motion pdf
...
Default value: disabled
2013-09-06 21:59:54 +02:00
Emanuel Schuetze
9dcdf67398
Fixed typo in English translation string in djangojs.po.
2013-09-06 21:59:53 +02:00
Emanuel Schuetze
67175042f9
Fixed #857 : Use jquery plugin 'bsmSelect' for <select multiple> form elements.
2013-09-06 21:59:52 +02:00
Emanuel Schuetze
011786d360
Updated CKEditor from 4.1.1 to 4.2.
2013-09-06 21:59:52 +02:00
Emanuel Schuetze
ec61bd8cdc
Fixed #854 : IE fix for ckeditor's plugin insertpre:
...
Removed 'class' attribute to fix viw in IE8+.
Use monospace in insertpre dialog in IE.
Updated German translation file.
2013-09-06 21:59:50 +02:00
Norman Jäckel
c88d180808
Deletes config cache after each test if it exists.
2013-08-19 18:05:03 +02:00
Oskar Hahn
25bac4a704
Fixed a bug when setting a config var before getting one
2013-08-19 17:59:35 +02:00
Oskar Hahn
20cf960c82
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/core/templatetags/tags.py
2013-08-19 17:54:50 +02:00
Oskar Hahn
1113b6d861
Added template filter 'absolute_url'
2013-08-19 11:21:29 +02:00
Oskar Hahn
99895a28d1
Fix get_absolute_url for deleted persons.
...
Fix #845
2013-08-19 10:50:37 +02:00
Oskar Hahn
967c199a56
Removed utils from INSTALLED_APPS.
...
Moved utils.management and utils.templatetags to core
2013-08-11 09:40:14 +02:00
Oskar Hahn
b8d23164f7
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/__init__.py
2013-07-29 20:52:05 +02:00
Norman Jäckel
1225c5bbb6
Update version to 1.4.2-dev
2013-07-29 20:19:29 +02:00
Norman Jäckel
119fb90bfd
Release 1.4.1
2013-07-29 20:17:26 +02:00
Oskar Hahn
b03e8cc06b
Fixed #833
2013-07-29 19:45:06 +02:00
Emanuel Schuetze
20d7a3b539
Add paragraph around each motion version warning (to show each warning in one line).
2013-07-29 09:06:36 +02:00
Norman Jäckel
30c3f5ea64
Disable deleting active versions of a motion
2013-07-28 01:14:15 +02:00
Oskar Hahn
b7edee8fdf
Merge pull request #836 from ostcar/issue-833
...
Fixed tooltip and duration in agenda.
2013-07-27 15:29:21 -07:00
Oskar Hahn
8743d75d10
Use get_active_version in motion.__unicode__()
...
Fixes the bug, that motion.__unicode__() raises an AttributeError, if the active_version
was None.
Fixes #822
2013-07-27 10:11:28 +02:00
Oskar Hahn
b39cb8e8a4
Fixed tooltip and duration in agenda.
...
The tooltip did not show the end of an agenda item, but of the hole event.
If a item was closed, it was not used to calculate the end of the event.
Fixed #833
2013-07-27 10:02:40 +02:00
Emanuel Schuetze
bb538953ee
Added Czech translation (Thanks to Pavel Fric!)
2013-07-26 21:37:58 +02:00
Oskar Hahn
7726fa87a9
Merge pull request #831 from ostcar/issue-823
...
Generate poll-urls via model_url
2013-07-25 14:11:33 -07:00
Norman Jäckel
2128e787bf
Start Browser on custom IP, fixed #827
2013-07-25 17:03:04 +02:00
Oskar Hahn
b83b1c49e9
Generate poll-urls via model_url
...
Fixed Bug to wrong poll urls
Fixed #823
2013-07-18 09:50:54 +02:00
Oskar Hahn
ec3db2ffff
Prepare OpenSlides master for the next major release
2013-07-18 08:50:08 +02:00
Norman Jäckel
9d01881986
Update version to 1.4.1-dev
2013-07-08 20:08:10 +02:00
Norman Jäckel
304c572f85
Release 1.4
2013-07-08 20:05:31 +02:00
Oskar Hahn
526eeb5cea
Merge pull request #818 from ostcar/issue_814
...
Fixed #814 Sorting of candidates in the assignment
2013-07-08 05:27:19 -07:00
Oskar Hahn
47d70d5a73
Fixed #814 Sorting of candidates in the assignment
2013-07-08 14:08:27 +02:00
Oskar Hahn
f2d13e5ec9
Merge pull request #817 from ostcar/master
...
Issue 794
2013-07-08 05:03:40 -07:00
Oskar Hahn
8ebf3f9038
Merge pull request #815 from emanuelschuetze/csv-files
...
Updated CSV files with demo data. Minor fixes for motion.
2013-07-08 04:49:08 -07:00
Oskar Hahn
f39e8dd92e
Fixed #794 bug when a non speaking list slide was active, when a projector tab was opend
2013-07-08 13:44:44 +02:00
Emanuel Schuetze
b12fdb09cd
Updated German translation (some typos).
2013-07-08 13:40:06 +02:00
Norman Jäckel
d703ef9c4f
Rename visual strings of permissions: Add plural s ( fix #797 ). Also update all language files.
2013-07-08 00:03:47 +02:00
Emanuel Schuetze
5bff15762e
Motion detail template: Removed category from title (already in meta block)
2013-07-07 23:04:26 +02:00
Emanuel Schuetze
7e5c3f6a27
Removed whitespace in filename of motion pdf (identifier: PrefixNumber).
2013-07-07 22:00:10 +02:00
Oskar Hahn
aca2570cb7
Merge pull request #800 from andkit/portable-improvements
...
Portable improvements
2013-07-06 23:57:00 -07:00
Oskar Hahn
04ee38dcc0
Merge pull request #809 from emanuelschuetze/fixes-1.4
...
Fixed #798 and #803
2013-07-05 08:08:48 -07:00
Emanuel Schuetze
3fadb99ffd
Fixed #803 (Groups not translated on user detail view and overview pdf)
2013-07-05 15:49:10 +02:00
Emanuel Schuetze
4625c4731d
Updated translation. Fixed #798 (typo in translation of permissions).
2013-07-05 14:51:37 +02:00
Andy Kittner
b568546fb8
Add some explanation to is_portable(); fixes #729
2013-07-04 23:29:56 +02:00
Norman Jäckel
834851acbd
Typo in assignment view ( fixed #805 )
2013-07-04 15:40:47 +02:00
Emanuel Schuetze
5dd65cb173
Fixed motion pdf and template issues:
...
- Fixed #790 (Unicode Error while creating motion pdf if motion text contains umlauts and motion is imported from CSV)
- Fixed #742 : Added categories and identifier to motion pdf.
- Fixed wrong title order (app title - OpenSlides).
2013-06-28 12:43:58 +02:00
Emanuel Schuetze
db7e22229e
Fixed comments by norman.
2013-06-27 09:20:28 +02:00
Emanuel Schuetze
cf773c34a8
Updated translations.
2013-06-26 21:36:06 +02:00
Oskar Hahn
bf8482fc03
Merge pull request #786 from emanuelschuetze/1.4-fixes
...
Some template and doc fixes
2013-06-26 10:11:28 -07:00
Oskar Hahn
7d1eb5207a
Fixes #765 . Avoids the django AbstracUser username validator
...
Also changed added a white-space in the default username again
2013-06-26 19:00:52 +02:00
Emanuel Schuetze
64e7cfd98e
Some template and doc fixes
...
- Fixed #766 (agenda overview parent item look).
- Fixed #767 (Documentation sphinx bootstrap theme: html header)
- Fixed #785 (Enlarged doc screenshots by hover via CSS)
- Updated sphinx-bootstrap-theme to 0.2.4
- Add btn class for agenda end time tooltip
2013-06-25 22:15:51 +02:00
Norman Jäckel
7dddd70493
Fix whitespaces in translated strings.
2013-06-25 17:44:31 +02:00
Emanuel Schuetze
4a0c40a333
Fixed white projector live view in IE 10 (missing transform-origin).
2013-06-25 14:03:36 +02:00
Norman Jäckel
c3d0c0f852
Update translation source files
2013-06-21 23:36:23 +02:00
Oskar Hahn
00d57e3011
Fixed #463 , typo in urls.py
2013-06-21 09:01:56 +02:00
Norman Jäckel
bad64144da
Fix translation of messages with additional content
2013-06-20 23:36:23 +02:00
Norman Jäckel
989f6b2d84
Space in Motion Log
2013-06-20 22:37:32 +02:00
Norman Jäckel
96c5b1d2dc
Fix numbering with category prefix in simple workflow, fix #769
2013-06-20 18:03:22 +02:00
Oskar Hahn
08a71c17a3
Fixed #770 . Ordering of Users in GroupForm regulated by the config var.
2013-06-20 08:33:55 +02:00
Norman Jäckel
c5beb07fbc
Update version to 1.4-dev (final)
2013-06-17 20:19:02 +02:00
Norman Jäckel
0039207899
Release 1.4c1
2013-06-17 20:17:32 +02:00
Oskar Hahn
32771d946e
Merge pull request #754 from emanuelschuetze/fixes-for-1.4c1
...
IE-Template fix and README/main.py updates.
2013-06-17 11:13:05 -07:00
Emanuel Schuetze
42809048f9
Updated and adjusted options help text in main.py and README.
2013-06-17 19:59:58 +02:00
Emanuel Schuetze
f191d3687b
Updated French translations (by Moira via transifex).
2013-06-17 17:54:05 +02:00
Emanuel Schuetze
7dc2b0d904
Fixed #753 (Wrong scaling of projector live view in Internet Explorer)
...
Supports IE8+ only. Dropped IE7 support.
2013-06-17 17:30:46 +02:00
Emanuel Schuetze
c450dfb1d5
Fixed typo.
2013-06-17 10:44:55 +02:00
Oskar Hahn
c14302dd6f
small translation update
2013-06-16 18:44:14 +02:00
Oskar Hahn
64af0b162f
Create admin-user after syncdb
2013-06-16 17:07:55 +02:00
Emanuel Schuetze
5237e1d90d
Fixed #745 and #744 : Make widgets fixable and collapsable.
...
Fixed widget header style issues.
2013-06-16 12:15:52 +02:00
Oskar Hahn
fd731d68fa
Merge pull request #733 from normanjaeckel/Fix_Syncdb
...
Disable interactive mode of the syncdb command, fixed #696
2013-06-16 02:31:27 -07:00
Norman Jäckel
31547f8e1a
Save identifier in MotionSetStateView, fixed #739
2013-06-16 01:06:47 +02:00
Norman Jäckel
dfc160af5b
Disable interactive mode of the syncdb command, fixed #696
2013-06-16 01:05:22 +02:00
Oskar Hahn
575da78f3a
Editview for releated agenda items.
...
Releated Agenda Items need there own edit view to edit some agenda specifc
values.
Also added a new filter 'trans' to translate variables.
Fixes #710
2013-06-16 00:55:07 +02:00
Oskar Hahn
9853f2c433
Change the Workflow of a motion in CreateView.
...
The Manager can choose the workflow in the createview. The default value
is the workflow from the config.
In the UpdateView the workflow in which the motion is, is choosen by
default.
The workflow will only be reset, if it is changed.
2013-06-16 00:53:49 +02:00
Emanuel Schuetze
a383a4305b
Fixed some (pdf) template issues and updated (DE) translation.
...
- Fixed #737 (Motion edit link is missing for normal delegate users)
- Fixed motion pdf filename errors (now use motion-<identifier>.pdf or if no identifier: motion-<title>.pdf with using djangos slugify for special chars in title)
- Fixed motion pdf build error if there is an unauthorized version
- Enlarge max_length of event name field to 50 chars.
- Align participant import instruction with motion import page.
- Added title field to particpants-demo_en.csv.
- participant overview: Show comma after last_name only if first_name and last_name are given.
- Changed all page titles to "<specific action page> - <event-name>" (moved event-name to the end of the string)
- Updated EN tranlation string.
- Updated DE translations.
2013-06-15 17:50:30 +02:00
Oskar Hahn
e630d600ed
Fixes #648
...
delete function for the motion versions
2013-06-15 09:18:21 +02:00
Norman Jäckel
3afc58be9e
Add request to all widgets, fixed #653
2013-06-13 23:45:30 +02:00
Norman Jäckel
48f237a92f
Print listening info to command line
2013-06-13 16:58:34 +02:00
Oskar Hahn
6dad2e5161
Listen per default to the public
2013-06-13 16:58:34 +02:00
Oskar Hahn
efd10eaecc
Fixed #718
...
An string argument was not used in the assignment app
2013-06-13 16:47:35 +02:00
Norman Jäckel
a0c023cf45
Use ordinal numbers in assignment and motion polls, fixes #456 . Include humanize app to portable
2013-06-13 15:48:55 +02:00
Oskar Hahn
42ad1113fa
Fixed #724
...
The motion updated view now uses the last_versio instead of the active_Version
2013-06-11 11:42:20 +02:00
Norman Jäckel
aa0728ff60
User lockout protection, fixed #666
...
Protection of updating and deleting users and groups if this caused a lockout of the requesting user.
2013-06-11 11:02:40 +02:00
Oskar Hahn
4b0c62d29a
Fixes #721
...
Saving the anonymous user into a list of speakers.
Also raises an AttributeError if someone tries to save the anonymous user
into any person field.
2013-06-09 18:57:42 +02:00
Norman Jäckel
0d1db941b8
Insert LocalizedModelChoiceField for use in MotionSetWorkflowMixin. Fixed #713 .
2013-06-09 16:41:58 +02:00
Emanuel Schuetze
a3038f3eb2
Set version to 1.4rc1-dev.
2013-06-04 01:05:15 +02:00
Emanuel Schuetze
27ed6a7c1d
1.4b2 release.
2013-06-04 01:02:25 +02:00
Emanuel Schütze
37da0cc7bb
Merge pull request #709 from emanuelschuetze/fixes-for-1.4b2
...
Fixes and improvements for 1.4b2
2013-06-03 15:58:13 -07:00
Emanuel Schuetze
a96b8a7833
Updated FR translations (Thanks to Moira).
2013-06-04 00:47:29 +02:00
Emanuel Schuetze
880b3cd19b
Updated DE translations.
2013-06-04 00:47:29 +02:00
Andy Kittner
9826e3ec06
Add a simple wxPython based gui frontend for openslides
2013-06-04 00:07:22 +02:00
Andy Kittner
fb91317ce1
Add command to backup the database
2013-06-04 00:07:22 +02:00
Andy Kittner
21c739a94f
Add --no-run parameter
...
This parameter allows e.g. to synchronize the database without starting
the webserver.
2013-06-04 00:07:22 +02:00
Emanuel Schuetze
cf791e599a
Updated EN translation strings and updated EN po files.
...
Template fixes and improvements.
2013-06-03 23:33:01 +02:00
Emanuel Schuetze
bdfdb4c064
Fixed #652 : Button for ageda item with related sid.
2013-06-03 22:42:16 +02:00
Emanuel Schuetze
4126c180c8
Fixed #701 : Check bootstrap tooltips on all buttons.
2013-06-03 22:42:16 +02:00
Emanuel Schuetze
cd84d64071
Fixed #702 : list of speakers projetor/overlay style.
2013-06-03 22:42:15 +02:00
Emanuel Schuetze
ef6eaf8fa4
Fixed #703 : Mcrophon icons for list of speakers
2013-06-03 22:42:14 +02:00
Emanuel Schuetze
e5e7e1bcce
Template improvements.
...
Improved agenda and participants overview.
2013-06-03 22:38:45 +02:00
Emanuel Schütze
d615c63eb1
Merge pull request #705 from normanjaeckel/ChangeMotionDefaultNumbering
...
Motion: Change default numbering method
2013-06-03 13:35:34 -07:00
Norman Jäckel
dc5b1e0893
Motion: Change default numbering method
2013-06-03 19:18:59 +02:00
Norman Jäckel
5c18635418
Change order of agenda fields
2013-06-03 19:16:42 +02:00
Norman Jäckel
a575a7a8c6
Fix #696
2013-06-03 00:23:47 +02:00
Norman Jäckel
93b02fa62b
Update docstrings, small enhancements to Oskar's motion rework.
2013-06-02 23:28:17 +02:00
Oskar Hahn
cd19920223
Rework of the motion model, to make it more explcit.
2013-06-02 23:28:17 +02:00
Norman Jäckel
d4739f5dd7
Fixed #130 : New config var for removal of supports when a motion is edited by the submitter in early state.
2013-06-02 15:48:21 +02:00
Emanuel Schuetze
5643065b84
Added en po files and updated en and fr po files (makemessages only) for transifex.
2013-06-01 21:58:25 +02:00
Oskar Hahn
4faf91424b
Fixed #682 Error if a group was added to a list of speakers
2013-06-01 09:10:15 +02:00
Norman Jäckel
e5db00b637
Add tests for the list of speakers global links. Add end_speach link on the list of speakers widget.
2013-05-31 17:25:48 +02:00
Oskar Hahn
4aeb329d7c
Merge pull request #690 from normanjaeckel/DeleteFeatureRejectVersion
...
Fix #679
2013-05-31 06:44:59 -07:00
Norman Jäckel
31c04c280a
Fix #679
2013-05-31 14:54:53 +02:00
Norman Jäckel
7624dc67af
Fixed #687
2013-05-31 14:34:49 +02:00
Stefan Frauenknecht
1e188761d4
Validator for agenda_start_time aded. PEP8 issue 'missing whitespace after ','' resolved
2013-05-31 14:01:30 +02:00
Norman Jäckel
9e5088d49e
Fixed #683
2013-05-31 13:15:55 +02:00
Emanuel Schuetze
d5becd5c18
Fixed #431 : Template improvements (removed unused loaded tags and check of all html template files)
2013-05-30 23:25:49 +02:00
Emanuel Schuetze
17778ac80f
Fixed #574 : Changed DOCTYPE to HTML5 (for base.html and base-projector.html).
2013-05-30 22:23:48 +02:00
Emanuel Schuetze
a97cf4a680
Motion import improved:
...
- add semicolon support (use utils/csv_ext.py as participant import)
- show all warnings of each line in one warning message
- show success message with total counter (x of n motions imported).
- improved warning and error strings
2013-05-30 22:23:38 +02:00
Emanuel Schuetze
4ec33106ed
Fixed #680 (Open all PDFs in new tab).
2013-05-29 22:59:33 +02:00
Emanuel Schuetze
9fb2052b3d
Bugfixing, template improvements, translation updates.
...
- Fixed #649 : Clean old motion fragments in template and pdf (about motion notes).
- Fixed motion pdf issues: missing submitters, voting result and make motion state translateable- Added post_save function also for UserUpdateView.
2013-05-29 22:59:24 +02:00
Norman Jäckel
9d698854a9
Insert Next Speaker Button in speaker widget
2013-05-24 01:44:58 +02:00
Norman Jäckel
6566a2897c
Fixed #675 : CSS for list of speakers slide and overlay
2013-05-24 00:52:09 +02:00
Norman Jäckel
00910b218e
Fix appearance of agenda items with related sid, also some other small fixes and template fixes
2013-05-24 00:31:52 +02:00
Norman Jäckel
099ed76d0e
Insert info to list of speakers overlay widget checkbox
2013-05-23 23:31:57 +02:00
Norman Jäckel
c94f78c430
Fix message_list loop with a map
2013-05-23 23:19:53 +02:00
Norman Jäckel
894f16ec53
Several template and bug fixes, some minor view behavior changes
2013-05-23 00:32:32 +02:00
Emanuel Schuetze
c59f729a80
Set version to 1.4b2
2013-05-17 01:33:04 +02:00
Emanuel Schuetze
d5221d2ab5
Release 1.4b1.
2013-05-17 01:31:45 +02:00
Emanuel Schuetze
eedc79ca8f
Added non_field.errors in form.html.
2013-05-16 23:59:22 +02:00
Norman Jäckel
bf58f2a6cc
Ensure that the user has either a first name or a last name
2013-05-16 23:59:22 +02:00
Norman Jäckel
a65a4662ae
Fixed Pep 8 Error
2013-05-16 23:44:07 +02:00
Emanuel Schuetze
fa8b9d3888
Fixed translation issue for motion state.
2013-05-16 22:53:38 +02:00
Emanuel Schütze
6dbd606232
Merge pull request #660 from normanjaeckel/TranslatedStateChanged
...
Translate changed state in motion log (Fixed #656 )
2013-05-16 13:37:09 -07:00
Norman Jäckel
148ac53d11
Translate changed state in motion log ( Fixed #656 )
...
The database has to be reset.
2013-05-16 21:51:11 +02:00
Emanuel Schuetze
b5a5acbf2c
Some last (template) improvements for next release
...
- Added dataTable function for group overview table.
- Added default form help text for groups and an explanation for group overview table.
- Updated translation.
- Translate group name in form.
- Username: FirstName instead of First_Name
- Hide group 'registered' from UserForm
- Linked persons/candidates/submitter etc. to UserView
- Fixed permissions in template
Translation
2013-05-16 21:03:42 +02:00
Oskar Hahn
e76aa499f3
Merge pull request #659 from normanjaeckel/LogMotionImport
...
Log Entry for imported motions Fixed #655
2013-05-16 04:36:39 -07:00
Oskar Hahn
9a881eceeb
Merge pull request #651 from normanjaeckel/Workflow_Adjustablility_2
...
Workflow adjustablility (new feature)
2013-05-16 04:35:58 -07:00
Oskar Hahn
1dab39012c
Merge pull request #661 from normanjaeckel/PermitRejectVersionLog
...
Log permitting and rejecting motion versions (Fixed #657 )
2013-05-16 04:31:41 -07:00
Norman Jäckel
c163d6984d
Insert motion preamble in text field of the form of new motions ( Fixed #643 )
2013-05-16 01:38:51 +02:00
Norman Jäckel
5adf55bc8c
Log permitting and rejecting motion versions ( Fixed #657 )
2013-05-16 01:28:39 +02:00
Norman Jäckel
27da18f489
Fixed #655 Log Entry for imported motions
2013-05-16 00:58:37 +02:00
Norman Jäckel
bca8d3af15
Update view contains possibility for managers to change the workflow. Also other small fixes.
2013-05-16 00:25:44 +02:00
Emanuel Schuetze
c1996b81fc
Updated translation.
2013-05-15 09:43:59 +02:00
Emanuel Schuetze
4849955a16
Some more template improvements
...
- Better config icon.
- Renamed media to files (only for GUI).
- Add datatable function for motion and asssignemnt overview table. Removed old filter/sorting code.
- Some more template styling work.
2013-05-15 09:43:11 +02:00
Oskar Hahn
cefd509ae4
Merge pull request #650 from emanuelschuetze/template-improvements
...
Template improvements
2013-05-14 14:31:53 -07:00
Emanuel Schuetze
d1b6c38880
Fixed #627 (Open Link in new Tab) by setting back bootstrap.min.js to 2.3.0 release.
...
(bootstrap*.css are still from 2.3.1)
2013-05-14 23:21:46 +02:00
Emanuel Schuetze
b082f8a8fc
A lot of template improvements
...
- Translate group name in participant overview table.
- Move 'status_link' function from participants.js to utils.js for using in VoteCollector plugin.
- Added hook 'post_js' for VoteCollector plugin.
- Fixed poll id in poll_form.
- Improved 'show log' button
- Used welcome_title for default custom slide
- Used bootstraps' fluid grid nesting for responsive layout of widgets.
- Added microphone icon for 'add-me-to-list-of-speakers' button.
- Format motion identifier and title in (motion and account) widgets.
- Format list of speakers (slide, overlay, view, overview)
- Format list of speakers widget and view. Added view to link to current list of speakers (without add to list).
- Fixed motion slide. Made up/down animation faster and the scroll way shorter.
- Fixed icon name.
- Set default context of 'extra_javascript' to use kwargs['context']['extra_javascript'].append('...') without error.
- Fixed translation of motion state.
Moved css code.
2013-05-14 23:20:54 +02:00
Norman Jäckel
f07485627f
Motion identifier setting and versioning.
...
Now the view decides, whether to setup a new version or not. Automatic identifier setting is the default. Also some fixes of the motion save method.
2013-05-13 23:13:14 +02:00
Oskar Hahn
b8b5acd5f2
Merge pull request #639 from normanjaeckel/Url_name_args
...
Fixed 'Can't create agenda item of a motion'
2013-05-13 11:51:15 -07:00
Norman Jäckel
0f17f74fee
Fix and update motion csv import.
2013-05-13 18:30:20 +02:00
Oskar Hahn
485518975a
motion csv import
2013-05-13 18:25:59 +02:00
Norman Jäckel
864d20274e
Fixed #636 . Insert general url_name_args attribute to some generic views in utils.views.
2013-05-13 18:15:53 +02:00
Oskar Hahn
865860a96f
Merge pull request #640 from normanjaeckel/Fixes
...
Some Fixes
2013-05-13 05:06:29 -07:00
Oskar Hahn
e9a361cfea
Merge pull request #637 from normanjaeckel/ShowCategory
...
Show category in motion table. Fix template when a motion has no category.
2013-05-12 13:58:47 -07:00
Norman Jäckel
a469831f1f
Fixed link 'Put me on the list of speakers' when the list is already closed.
2013-05-12 02:06:55 +02:00
Norman Jäckel
af493d28e8
Items now appear also in the personal info widget (where someone is on the list of speakers).
2013-05-12 01:46:40 +02:00
Norman Jäckel
af6659a67e
Hide list of speakers overlay on list of speakers slide
2013-05-12 01:16:41 +02:00
Norman Jäckel
3ba5fd2dc6
Fixed bad typo in import users function
2013-05-12 00:56:40 +02:00
Norman Jäckel
411f8d0892
Fixed hiding of orga items on summary slides
2013-05-11 16:26:43 +02:00
Norman Jäckel
76d7409830
Change version view. New way to get name and version from plugins.
2013-05-11 14:27:46 +02:00
Norman Jäckel
98c7611622
Fixed wrong permission on agenda detail view
2013-05-11 13:53:43 +02:00
Norman Jäckel
96f5122c00
Show category in motion table. Fix template when a motion has no category.
2013-05-11 00:20:42 +02:00
Norman Jäckel
719b6ff790
Rework on list of speakers. Insert a method to get a formated list for various use in the templates.
2013-04-29 20:17:50 +02:00
Oskar Hahn
52e16d2e34
Show a defined value of last speakers
...
Some work on the design of the speaker-list on the projector
2013-04-29 20:05:42 +02:00
Norman Jäckel
0b85164b84
Add second time field for list of speakers. Now you can click begin and end speach.
2013-04-29 20:05:42 +02:00
Oskar Hahn
b0e5854833
Fixed #629
2013-04-28 10:21:31 +02:00
Oskar Hahn
04edef9d8a
Fixed #604
2013-04-28 10:02:19 +02:00
Oskar Hahn
100238bc66
Fixed #580
2013-04-28 09:37:15 +02:00
Oskar Hahn
04b3a196ad
Merge pull request #620 from CatoTH/ckeditor-4.1.1
...
Upgrade CKEditor from 4.1rc to 4.1.1
2013-04-25 06:17:07 -07:00
Oskar Hahn
017561572d
Merge pull request #621 from CatoTH/Issue615
...
sortable and disableSelection are not always defined; lead to issue #615
2013-04-25 06:16:32 -07:00
Norman Jäckel
b6f2176cc8
Move Version page out of config menu. Insert Link into the footer.
2013-04-25 12:37:44 +02:00
Tobias Hößl
5865a73a3e
sortable and disableSelection are not always defined; lead to issue #615
2013-04-24 19:51:33 +02:00
Tobias Hößl
4aa033989a
Upgrade CKEditor from 4.1rc to 4.1.1
2013-04-24 19:04:02 +02:00
Emanuel Schuetze
8ca8b6911d
Set version to 1.4b1-dev
2013-04-24 15:50:49 +02:00
Emanuel Schuetze
b43a6ae1f6
Release 1.4-alpha1
2013-04-24 15:31:55 +02:00
Emanuel Schuetze
e268d43580
Fixed motion poll pdf (use correct delegates group, use template without header/footer)
2013-04-24 15:14:29 +02:00
Emanuel Schuetze
5071daa148
Updated translations.
2013-04-24 14:36:04 +02:00
Emanuel Schuetze
210df06c76
Minor template fixes.
2013-04-24 11:58:09 +02:00
Emanuel Schuetze
81b82c559d
Updated jQuery UI to v1.10.2.
...
Changed link in agenda view to static file.
2013-04-24 11:34:24 +02:00
Emanuel Schuetze
abad75c129
A lot of template improvements and translation fixes
...
- Fixed agenda widget for special slide views (e.g. list of speakers, summary).
- Fixed back to motion(s) link
- Set icon for list of speakers widget.
- Fixed overlay widget layout of form elements.
- Added submenu with other config_pages to version.html.
- Updated completly DE translations, fixed EN strings.
- Coding style: Use correct ugettext and ugettext_lazy strings. Use "as _" for ugettext only.
Updated translation.
- Improved projector template (clock image, fixed facicon, added subtitle for list of speakers)
- Changed permission strings ('oneself'). Added check if group(pk=3) exists.
- Added event name and description to base template. Some minor template layout fixes.
- Use static subtile (no context var). Show last 2 old_speakers for projector.
- Cut old_speakers.
- Projektor template style changes (e.g. overlay list of speakers).
2013-04-24 10:38:03 +02:00
Oskar Hahn
f581169e1e
Fixed saving anonymous user in a PersonField
2013-04-24 09:28:58 +02:00
Tobias Hößl
acba281581
Sorting agenda items with nestedSortable.
2013-04-23 17:24:27 +02:00
Norman Jäckel
7fbe609d04
Rename the state flag dont_set_new_version_active to leave_old_version_active.
2013-04-22 22:31:58 +02:00
Oskar Hahn
ba75a34017
Fixed list of speakers overlay cache problem
2013-04-22 22:09:09 +02:00
Oskar Hahn
02d1025346
Motion poll PDF
2013-04-22 21:47:40 +02:00
Oskar Hahn
4f9041df65
Merge pull request #603 from ostcar/participant_name
...
Fixed username
2013-04-22 12:38:09 -07:00
Oskar Hahn
6b558907c0
Fixed username
2013-04-22 13:49:13 +02:00
Oskar Hahn
0549d22ec8
Fixed manage.py runserver.
...
The reload function did not work
2013-04-21 18:42:58 +02:00
Oskar Hahn
2d7bf8ca9a
fixed #558
2013-04-19 19:56:59 +02:00
Oskar Hahn
10b51f6897
Fixed #595
2013-04-19 19:39:33 +02:00
Oskar Hahn
db1503ad7b
Format fix
2013-04-19 19:15:57 +02:00
Roland Geider
56844d93f2
Move CKeditor configuration to a separate JS file
...
Remove unneeded try-except block
2013-04-18 13:26:01 +02:00
Emanuel Schuetze
1d1f5fa218
Added html support for motion text.
...
Use html parser 'beautifulsoup' to replace html tags which not supported by reportlab pdf.
'pip install bs4' required.
Fixed nested ol lists and unicode warning.
New requirement: beautifulsoup4
HTML support for reportlab.
Move parse html code into new function. Added missing html support in pdf for motion reason.
Added version number for bleach and beautifulsoup4. Moved to core requirements block.
Added bs4, bleach and html5lib requirements to portable build script. Updated portable readme for 1.4.
2013-04-18 13:23:40 +02:00
Roland Geider
01885c9304
Add first version of server-side filtering of HTML with bleach
...
Fix formatting (pep8 and otherwise)
Make the CleanHtml a mixin so it can be used easier, add a test case
Mark HTML fields as 'safe' in the template
Update list of allowed HTML tags, take special care for reportlab
Add heading tags to white list
Rename get_clean_html to get_clean_html_fields
2013-04-18 13:20:27 +02:00
Tobias Hößl
ce333d4c40
Initial attempt to integrate CKEditor into OpenSlides
2013-04-18 13:20:27 +02:00
Emanuel Schuetze
e81ed882ca
Fixed #553 : Switch projector control scroll arrows
2013-04-15 22:04:59 +02:00
Oskar Hahn
33f74c3025
List of speakers. Part 2
2013-04-15 19:28:44 +02:00
Emanuel Schuetze
1a416e5726
Updated template and some minor fixed for list of speakers. Updated projector slide.
2013-04-15 19:23:37 +02:00
Oskar Hahn
fa95119936
New Feature: List of speakers.
2013-04-15 19:23:37 +02:00
Oskar Hahn
f52df88cd6
fixed error on new overlay api
2013-04-15 15:47:18 +02:00
Oskar Hahn
bbf4b33086
New Overlay API
2013-04-15 13:24:08 +02:00
Norman Jäckel
0155690630
Protection for participant managers, Issue #122
...
Raises a validation error, if a non-superuser user edits himself and
removes the last group containing the permission to manage participants
2013-04-14 23:52:20 +02:00
Norman Jäckel
82b1796875
Fixed issue #585 . Sort group members by first name or last name in group detail view according to config variable
2013-04-13 18:13:11 +02:00
Oskar Hahn
632c9476ed
Merge pull request #584 from emanuelschuetze/participants-1
...
Participants fields: add 'title', remove 'type', use 'groups'
2013-04-09 13:25:18 -07:00
Emanuel Schuetze
2c5bae7b01
#560 fixed: FormField to choose permissions is too small
2013-04-09 20:12:57 +02:00
Emanuel Schuetze
9f6da9f33b
Reorder GroupDetailView code in view.py.
2013-04-09 19:53:18 +02:00
Emanuel Schuetze
2a97a61a14
Remove participants field 'type'. Use 'group' field instead. Updated csv import, overview table and user detail view
2013-04-09 11:21:55 +02:00
Emanuel Schuetze
051f9af1f7
#436 : New participant field 'title'
2013-04-09 08:51:31 +02:00
Norman Jäckel
82c804e2d6
Inserted a new config variable 'Stop submitting of new motions'
...
Normal delegates can not submit a new motion when this is set to true. Inserted also a new template filter to relate to config variables in if-clauses.
2013-04-05 11:49:57 +02:00
Roland Geider
e40a2e9332
Restart tornado on file changes, respect port and adress flags
2013-04-03 23:20:56 +02:00
Oskar Hahn
e7def39323
Merge pull request #582 from normanjaeckel/AgendaConfigJSFix
...
Moved javascript code for agenda config into extra file.
2013-04-03 10:21:08 -07:00
Norman Jäckel
5d472b274a
Update tests to extend test cover by coverage
2013-04-03 17:55:30 +02:00
Norman Jäckel
623cf60adf
Moved javascript code for agenda config into extra file. Moved translation to correct area for javascript files.
2013-04-03 14:51:19 +02:00
Norman Jäckel
b310d6077e
Move personal info widget to a new app: account.
2013-04-03 00:17:23 +02:00
Norman Jäckel
e3eabada8b
Update default groups and permissions.
2013-04-02 15:50:40 +02:00
Norman Jäckel
e1b149cde3
New config app. Apps only have to define config vars once. Config pages, forms and so on are created automaticly.
...
Changes after some reviews are done.
Problematic is still that the JS can not be moved to an extra file because of the template tags in the code.
2013-03-28 15:31:13 +01:00
Emanuel Schuetze
71ac7a1cdb
New feature: qr-code for system url on participants password pdf.
...
(Note: New dependency! Run 'pip install qrcode')
Fixed pep8 issues. Create qr-code image for system url one time only.
New feature: qr-code for system url on participants password pdf.
(Note: New dependency! Run 'pip install qrcode')
Fixed pep8 issues. Create qr-code image for system url one time only.
Print qrcode image from StringIO stream.
Adapted table stylesheet for better integration of reportlab's Image object.
Fixed pep8 issue.
Made qrcode import as optional feature. Fixed pep8 issue.
2013-03-22 14:35:40 +01:00
Oskar Hahn
f5e6f736dc
Merge pull request #572 from normanjaeckel/Fileupload_3
...
Mediafile (new)
2013-03-20 03:23:50 -07:00
Norman Jäckel
156acc451f
Insert whitespace. Fix docstrings.
2013-03-20 11:17:24 +01:00
Norman Jäckel
d81c3bb1f8
Change order of classes for User and Group
2013-03-18 22:43:46 +01:00
Norman Jäckel
d82bb6ee33
Small modifications. Enhencement of tests.
2013-03-18 22:41:42 +01:00
Norman Jäckel
ad0e157bd1
Insert new app to upload files via the frontend. Let tornado server media files. Insert icon-mediafile css class. Insert extra_stylfiles context variable.
2013-03-18 21:44:02 +01:00
Norman Jäckel
571649d5a6
Fix typo in assignment.
2013-03-18 21:31:24 +01:00
Emanuel Schuetze
4e6818fb1a
Compressed jquery-ui files (for agenda config).
2013-03-18 20:22:54 +01:00
Emanuel Schuetze
b3fca8f6f2
Updated bootstrap from 2.2.2 to 2.3.1
2013-03-18 20:19:17 +01:00
Oskar Hahn
3832aa4178
Tests for the motion views
2013-03-15 12:18:27 +01:00
Oskar Hahn
c46ec570bf
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-15 02:16:26 +01:00
Oskar Hahn
81eb92a761
fixed pep8
2013-03-15 02:14:15 +01:00
Oskar Hahn
1a2ebf7b3b
removed some unused functions
2013-03-15 01:34:17 +01:00
Emanuel Schuetze
d180b4f331
Reverted support/unsupport changes (question)
2013-03-14 23:45:17 +01:00
Emanuel Schuetze
20118ae833
Improved version.get command
2013-03-14 23:35:57 +01:00
Emanuel Schuetze
2a2c704bf2
GetVersionMixin not required. Fixed htmldiff function.
2013-03-14 23:26:41 +01:00
Emanuel Schuetze
3f4df58807
Moved htmldiff function to utils.py. Fixed travis build error (pep8).
2013-03-14 23:22:11 +01:00
Emanuel Schuetze
49765bbe6e
Merge remote branch 'upstream/master' into motiontemplate
2013-03-14 23:05:38 +01:00
Emanuel Schuetze
b2dc3820bd
Changed motion.number to motion.identifier.
2013-03-14 23:04:32 +01:00
Emanuel Schuetze
88a32dc546
Updated motion version warnings (not latest/authorized version)
2013-03-14 22:56:25 +01:00
Emanuel Schuetze
73430e45d8
Changed style for empty category table.
2013-03-14 22:54:33 +01:00
Emanuel Schuetze
fa098f6bd3
Typo.
2013-03-14 22:54:00 +01:00
Oskar Hahn
43cd5aba00
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-14 22:44:11 +01:00
Oskar Hahn
63932a348e
Merge pull request #561 from emanuelschuetze/datatables-participants
...
Datatables for participants table (reworked)
2013-03-14 14:40:01 -07:00
Emanuel Schuetze
0587c2019a
Integrated DataTables function for participants table (for client side sorting/filtering/pagination). Removed old server side sorting/filtering code.
...
Fixed csv import (added success url).
Added large csv file for testing import of >1000 participants.
Removed lage csv example file for paticipants (will be sustitute by a test script in future).
2013-03-14 22:34:40 +01:00
Oskar Hahn
545d4be04f
fixed update of person_api
2013-03-14 22:32:00 +01:00
Emanuel Schuetze
247f6c9431
Merge remote branch 'upstream/master' into motiontemplate
...
Conflicts:
openslides/motion/models.py
openslides/motion/views.py
2013-03-14 21:36:02 +01:00
Emanuel Schuetze
a1a11ff53c
New motion version diff view. Improved version history table in motion detail template.
2013-03-14 21:28:03 +01:00
Oskar Hahn
2944b6ded3
fixed travis
2013-03-13 00:29:53 +01:00
Oskar Hahn
71b9bd0a08
dont set identifier prefix, if it is empty
2013-03-12 23:54:37 +01:00
Oskar Hahn
b2c888b151
set identifier
2013-03-12 23:35:08 +01:00
Oskar Hahn
304887e8f3
Changed comlex workflow automaticly set the identifier
2013-03-12 22:13:17 +01:00
Oskar Hahn
d21185a449
Merge branch 'master' of github.com:OpenSlides/OpenSlides into category
2013-03-12 22:05:20 +01:00
Oskar Hahn
9cd69f59e0
Motion Identifier
2013-03-12 22:03:56 +01:00
Norman Jäckel
03fff46517
Add new TestCase class in utils to call the signal on running every test.
2013-03-12 21:38:22 +01:00
Norman Jäckel
9679be1867
Move builtin groups to a signal.
2013-03-12 20:58:22 +01:00
Emanuel Schuetze
196ad217b0
Fixed version history.
2013-03-11 23:58:45 +01:00
Emanuel Schuetze
d41ce146e2
Added category_delete function to template.
2013-03-11 21:50:16 +01:00
Emanuel Schütze
db97d3c312
Merge pull request #2 from ostcar/category
...
Category Delete View
2013-03-11 13:45:54 -07:00
Oskar Hahn
31ba70efd1
Category Delete View
2013-03-11 21:38:07 +01:00
Norman Jäckel
514577f7c6
Built-in Workflows are created by listening to a signal which is sent after syncdb.
2013-03-11 21:32:09 +01:00
Emanuel Schuetze
d9fbaf9aa7
Updated motion category template.
2013-03-11 21:29:56 +01:00
Emanuel Schütze
ff848a865a
Merge pull request #1 from ostcar/category
...
Category
2013-03-11 12:46:42 -07:00
Oskar Hahn
f411040c3a
Append missing files
2013-03-11 20:43:23 +01:00
Oskar Hahn
bc7be27131
Add CategoryFormField to the MotionForm
2013-03-11 20:41:02 +01:00
Oskar Hahn
2614a1cb2f
Categories for Motions
2013-03-11 20:17:19 +01:00
Emanuel Schuetze
1b93cec209
Merge remote branch 'upstream/master'
...
Conflicts:
openslides/motion/models.py
2013-03-11 19:16:16 +01:00
Emanuel Schuetze
42c847dfba
Update motion templates to new template design. Added some missing model and view functions.
2013-03-11 18:26:22 +01:00
Emanuel Schuetze
5c70b4a044
Update after comments: Removed user context var. Removed condition in unupport state check.
2013-03-11 16:56:56 +01:00
Emanuel Schuetze
ee0e599a6c
Update motion templates to new template design. Added some missing model and view functions.
2013-03-09 14:29:40 +01:00
Emanuel Schuetze
71b1bede6f
Set new button als primary/blue button.
2013-03-09 14:17:30 +01:00
Emanuel Schuetze
c3c200b423
Changed link to new csv import wiki page on github.
2013-03-09 14:16:28 +01:00
Emanuel Schuetze
48e1282cb9
Show duration clock only if start/end time is set.
2013-03-09 14:15:03 +01:00
Emanuel Schuetze
56a510e89c
Removed link to professional support in base template (footer).
2013-03-08 08:31:52 +01:00
Oskar Hahn
51a9e41015
Set new django setting. Put tornado code in a seperate file.
2013-02-27 18:54:06 +01:00
Oskar Hahn
757b97e4cb
Merge pull request #542 from frauenknecht/master
...
Issue #539 Default config value in agenda app
2013-02-22 03:54:30 -08:00
Stefan Frauenknecht
45856fc9b0
add signal callback to provide defaults
2013-02-20 23:50:34 +01:00
Stefan Frauenknecht
f81abe215f
Revert last changes
2013-02-20 23:48:04 +01:00
Stefan Frauenknecht
343aa018e4
Fixed Issue #539 - Default config value in agenda app
2013-02-20 22:09:40 +01:00
Norman Jäckel
03d57d17b0
Fix state attributes in motion pdf.
2013-02-19 23:43:20 +01:00
Norman Jäckel
6b71142747
Recover commit 6a639fe498
2013-02-18 22:08:21 +01:00
Oskar Hahn
853dcf8334
fixed pep8
2013-02-18 20:06:46 +01:00
Oskar Hahn
f388f3d41a
handle static files with tornado
2013-02-18 19:58:18 +01:00
Oskar Hahn
2822c39f8a
Merge branch 'master' into tornado
2013-02-18 19:08:58 +01:00
Oskar Hahn
ce1e1c112f
fixed pep8
2013-02-18 18:59:24 +01:00
Oskar Hahn
4f3f917812
some small code design changes
2013-02-18 18:56:37 +01:00
Oskar Hahn
cb5b735565
Merge branch 'master' into HEAD
2013-02-18 18:34:52 +01:00
Oskar Hahn
051723e686
Merge branch 'master' of github.com:OpenSlides/OpenSlides
...
Conflicts:
openslides/motion/models.py
openslides/motion/workflow.py
2013-02-18 18:31:35 +01:00
Norman Jäckel
2603d93d69
Fix PEP8 and tests.
2013-02-17 17:07:44 +01:00
Stefan Frauenknecht
1d1d72d45a
Fixed if condition with duration property which can be None
2013-02-16 11:55:40 +01:00
Stefan Frauenknecht
8103c09b81
PEP8 errors resolved
2013-02-16 10:41:22 +01:00
Emanuel Schuetze
0b3b91b8d5
Show item-tooltip in bootstrap tooltip style.
2013-02-15 08:51:08 +01:00
Emanuel Schuetze
4f60160667
Added missing success_url_name.
2013-02-15 08:50:42 +01:00
Emanuel Schuetze
e9c996340a
Used custom build jquery-ui javascript components file. Integrated required jquery-ui styles (no remote link). Added used jquery components/addons to THANKS file.
2013-02-15 08:39:36 +01:00
Norman Jäckel
8363b06fc1
Move motion exceptions to its own file in the motion app.
2013-02-14 19:27:36 +01:00
Norman Jäckel
2e37e4c18b
Comment the dev-file workflow.py
2013-02-14 11:16:46 +01:00
Norman Jäckel
f2dde228c9
Work on motion workflow system.
...
Also: Insert new base exception for OpenSlides.
Also: Insert a workflow field to the state class. Update tests. Rename versioning attribute.
2013-02-13 23:04:24 +01:00
Emanuel Schuetze
e3428d3e83
Some style work.
2013-02-11 23:01:48 +01:00
Emanuel Schuetze
e101fb8212
Merge branch 'master' into agenda-orga-items
...
Conflicts:
openslides/agenda/static/styles/agenda.css
openslides/agenda/templates/agenda/config.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/static/styles/base.css
requirements.txt
2013-02-11 22:36:19 +01:00
Emanuel Schuetze
a51a296434
Changed agenda start/end time to djangos DATETIME_FORMAT.
2013-02-09 22:59:15 +01:00
Oskar Hahn
6a639fe498
Add todos
2013-02-06 11:11:49 +01:00
Oskar Hahn
5573077b88
fixed pep8
2013-02-06 09:34:44 +01:00
Oskar Hahn
27c73092e1
Merge remote-tracking branch 'emanuel/newtemplate' into new_motion
...
Conflicts:
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
2013-02-06 09:25:27 +01:00
Emanuel Schuetze
ce51f0ef7e
template: minor style changes
2013-02-05 23:42:30 +01:00
Emanuel Schuetze
6b4ee0e4f6
Updated translation.
2013-02-05 23:09:23 +01:00
Emanuel Schuetze
c8ddb21760
Fixed wrong hiding of open agenda child items if parent item is closed
2013-02-05 22:36:05 +01:00
Emanuel Schuetze
e49efb40d8
template: Added new css class for minimum column width.
2013-02-05 22:03:43 +01:00
Emanuel Schuetze
bfd01e67b6
template: Removed unused 'cycle' template tag.
2013-02-05 21:55:41 +01:00
Emanuel Schuetze
d809ff95bb
template: Removed unused participant.css
2013-02-05 21:51:09 +01:00
Emanuel Schuetze
64e3c1f3cb
template: Removed unused 'load staticfiles'.
2013-02-05 21:41:26 +01:00
Emanuel Schuetze
8388774f12
template: Minor style changes.
2013-02-05 21:33:07 +01:00
Emanuel Schuetze
82e35bebff
Fixed wrong deletion if user clicks "no" in confirm form.
2013-02-05 21:31:45 +01:00
Emanuel Schuetze
0c5459f96e
template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
2013-02-05 20:40:55 +01:00
Oskar Hahn
042f1a8571
Fixed typo
2013-02-05 18:49:32 +01:00
Oskar Hahn
a08cf84ab8
Wrote docstrings to the motion app
2013-02-05 18:46:46 +01:00
Emanuel Schuetze
8f05ada6a1
template style and new icons
2013-02-05 17:05:40 +01:00
Stefan Frauenknecht
d6084f7c8b
Create items with duration loger than 23:59. Show start and end date. Duration has tooltip showing end date and time.
2013-02-05 16:36:57 +01:00
Emanuel Schuetze
80b0ab5252
template: Updated dashboard. Fixed ajax functionality. Adapted style.
2013-02-05 11:24:41 +01:00
Emanuel Schuetze
6db0210ef3
Updated jquery form plugin to v3.26.0-2013.01.28
2013-02-05 11:22:01 +01:00
Emanuel Schuetze
5e44bba941
Updated jquery from 1.9.0 to 1.9.1.
2013-02-05 11:15:23 +01:00
Emanuel Schuetze
404bf7f0b5
template: Added missing back link.
2013-02-04 13:38:29 +01:00
Emanuel Schuetze
36f5c97dbe
Added assignment context menu (more actions). Fixed 'back to election' link.
2013-02-04 13:18:10 +01:00
Emanuel Schuetze
e822efdc81
Some template style work.
2013-02-04 13:06:36 +01:00
Oskar Hahn
a34731c00e
fixed pep8 in motion.pdf
2013-02-03 20:12:44 +01:00
Oskar Hahn
90614cc637
Updated some views for the new utils.views style
2013-02-03 19:43:36 +01:00
Oskar Hahn
139ba74459
Merge remote-tracking branch 'emanuel/newtemplate' into new_template
...
Conflicts:
.travis.yml
INSTALL.txt
openslides/agenda/templates/agenda/base_agenda.html
openslides/agenda/templates/agenda/edit.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/agenda/templates/agenda/widget.html
openslides/assignment/templates/assignment/base_assignment.html
openslides/assignment/templates/assignment/config.html
openslides/assignment/templates/assignment/edit.html
openslides/assignment/templates/assignment/overview.html
openslides/assignment/templates/assignment/poll_view.html
openslides/assignment/templates/assignment/view.html
openslides/assignment/templates/assignment/widget.html
openslides/config/templates/config/general.html
openslides/motion/templates/motion/base_motion.html
openslides/motion/templates/motion/config.html
openslides/motion/templates/motion/edit.html
openslides/motion/templates/motion/import.html
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
openslides/motion/templates/motion/widget.html
openslides/motion/views.py
openslides/participant/templates/participant/base_participant.html
openslides/participant/templates/participant/config.html
openslides/participant/templates/participant/edit.html
openslides/participant/templates/participant/group_edit.html
openslides/participant/templates/participant/group_widget.html
openslides/participant/templates/participant/import.html
openslides/participant/templates/participant/login.html
openslides/participant/templates/participant/overview.html
openslides/participant/templates/participant/password_change.html
openslides/participant/templates/participant/settings.html
openslides/participant/templates/participant/user_widget.html
openslides/projector/templates/projector/base_projector.html
openslides/projector/templates/projector/control_countdown.html
openslides/projector/templates/projector/control_overlay_message.html
openslides/projector/templates/projector/custom_slide_widget.html
openslides/projector/templates/projector/live_view_widget.html
openslides/projector/templates/projector/new.html
openslides/projector/templates/projector/overlay_widget.html
openslides/templates/base.html
openslides/utils/template.py
openslides/utils/views.py
requirements.txt
2013-02-03 19:03:18 +01:00
Oskar Hahn
b8a353fa7c
Added PDF view for the motions
2013-02-03 18:18:29 +01:00
Oskar Hahn
42082ae3c2
fixed pep8
2013-02-03 14:14:07 +01:00
Oskar Hahn
cbd4acbd4b
fixed motion tests
2013-02-03 13:55:42 +01:00
Oskar Hahn
ef7f6cf476
Permission system for MotionVersions
2013-02-03 13:24:29 +01:00
Oskar Hahn
e7c65b3db1
Moved some methodes from utils.views.DeleteView to QuestionMixin
2013-02-03 13:23:55 +01:00
Oskar Hahn
f4ea611fb8
Wrote log messages for motion changes
2013-02-03 10:02:06 +01:00
Oskar Hahn
65a18953bd
Added translatable log to the new motion system
2013-02-02 21:40:23 +01:00
Oskar Hahn
15b13c2bcd
Handel null=True in PersonField
2013-02-02 21:19:37 +01:00
Oskar Hahn
2e430b4406
check permission in motion view
2013-02-02 10:59:07 +01:00
Oskar Hahn
3ffb16d4d8
Fixed pep8 errors
2013-02-02 10:52:13 +01:00
Oskar Hahn
4cc6539f0c
Added get_allowed_actions to new motion app
2013-02-02 10:24:28 +01:00
Oskar Hahn
a27bd7eade
Add motion to agenda
2013-02-02 00:51:08 +01:00
Oskar Hahn
910e0f17e7
Add slide Date to the motion
2013-02-02 00:37:43 +01:00
Oskar Hahn
1518543a9a
Added motion widget and deletion of motions
2013-02-02 00:27:16 +01:00
Oskar Hahn
0f7d0e349c
Fixed URLs in projector views
2013-02-02 00:26:08 +01:00
Oskar Hahn
bd317aed31
Wrote tests for openslides.motion.models.Motion
2013-02-01 19:19:18 +01:00
Oskar Hahn
6c3eb0f765
fixed urls in views from the participant app
2013-02-01 17:35:27 +01:00
Oskar Hahn
1a2f0a1b5a
Added links to set and reset the state of a motion
2013-02-01 17:20:11 +01:00
Oskar Hahn
ac41a02ac5
Block supporting, unsupporting and creation of poll in some states
2013-02-01 16:44:06 +01:00
Oskar Hahn
fb82a1787b
Add workflows for motions
2013-02-01 16:33:45 +01:00
Stefan Frauenknecht
7f03e02e9a
Item type changed from CharField to IntegerField. Constant type names added.
2013-02-01 15:13:40 +01:00
Stefan Frauenknecht
9f3dae8059
ConfigForm: Base classes reordered
2013-02-01 14:47:51 +01:00
Stefan Frauenknecht
c595701597
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
2013-02-01 14:41:52 +01:00
Oskar Hahn
3f02a28002
Added a poll delete view to the new motion app
2013-02-01 13:24:44 +01:00
Oskar Hahn
b6256b73e0
Changed utils.views.DeleteView
2013-02-01 13:24:30 +01:00
Emanuel Schuetze
d3b679442c
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling.
2013-02-01 12:55:04 +01:00
Oskar Hahn
da7a7a9d68
Add Poll-system to the new motion app
2013-02-01 12:51:54 +01:00
Oskar Hahn
adeaf248ef
Changed utils.- and poll.views
2013-02-01 12:51:01 +01:00
Stefan Frauenknecht
5a9b7fdca5
Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
2013-01-31 20:37:55 +01:00
Stefan Frauenknecht
9746b3818f
Rework code to ommit unnecessary filter call.
2013-01-31 20:32:29 +01:00
Stefan Frauenknecht
3dfd16558a
Blanks removed
2013-01-31 18:35:52 +01:00
Emanuel Schuetze
033ecd9497
Added new glyphicons icons.
2013-01-31 10:20:53 +01:00
Emanuel Schuetze
82ad5e2de0
Major changes for new twitter bootstrap template (e.g. replaced icons)
2013-01-31 10:19:56 +01:00
Stefan Frauenknecht
65ebcbc991
#41 Time for each agenda item finished
2013-01-30 17:39:53 +01:00
Stefan Frauenknecht
bc9dcffff4
#41 Time for each agenda item
2013-01-29 14:28:42 +01:00
Oskar Hahn
d911e311d6
Let the user support and unsupport the motion
2013-01-26 18:18:02 +01:00
Oskar Hahn
7bcfa16737
Merge branch 'master' of github.com:OpenSlides/OpenSlides into new_motion
...
Conflicts:
openslides/motion/templates/motion/view.html
openslides/utils/views.py
2013-01-26 17:57:35 +01:00
Oskar Hahn
87e42cf9f8
Let the user choose if the motion should have a new version
...
via config or form
2013-01-26 17:09:13 +01:00
Oskar Hahn
0702d49e2e
Save the supporter
2013-01-26 16:42:23 +01:00
Oskar Hahn
d3b340769b
Added motion config tab
2013-01-26 16:33:55 +01:00
Oskar Hahn
ecb6419f8c
fixed apply and success url in utils.views
2013-01-26 16:19:53 +01:00
Oskar Hahn
567e6c975a
Show initial submitters in the update-form
2013-01-26 16:05:30 +01:00
Oskar Hahn
8708ba5da6
Only save new version, when version-data has changed
2013-01-26 15:39:35 +01:00
Oskar Hahn
1f87749742
Save the submitters to the motion
2013-01-26 15:25:54 +01:00
Oskar Hahn
1ae140c11e
Add docstrings to the motion class
2013-01-26 12:28:51 +01:00
Roland Geider
bebaadf850
Actually do the right check for further args
2013-01-23 21:24:02 +01:00
Roland Geider
3bfead298d
Add custom management command to start the application with tornado
2013-01-23 21:12:36 +01:00
Roland Geider
a14f9b30ad
Fix help text
2013-01-23 19:37:12 +01:00
Andy Kittner
22e8457894
Add an option to suppress starting of web browser ( closes #436 )
2013-01-22 21:04:07 +01:00
Roland Geider
70407feab8
Use the tornado server to serve the application
2013-01-19 10:51:42 +01:00
Emanuel Schuetze
b8532fabe4
Removed files from images to img dir.
2013-01-18 22:23:31 +01:00
Emanuel Schuetze
da4ed365bc
Updated js and css libraries (twitter bootstrap to 2.2.2 and jquery to 1.9.0).
2013-01-18 22:10:00 +01:00
Emanuel Schuetze
a4592ec849
Reworked projector activate buttons in agenda widget.
2013-01-18 21:44:47 +01:00
Emanuel Schuetze
586425354d
Reworked new template, especially agenda and dashboard.
2013-01-08 23:05:35 +01:00
Oskar Hahn
0231fe37f5
Start to rewrite the motion app
2013-01-08 20:22:03 +01:00
Stefan Frauenknecht
aee24425bc
Ticket 433 - Organisational items
2013-01-05 23:52:29 +01:00
Norman Jäckel
deb0d5b2e5
Some fixes. Update requirements.txt and setup.py.
2013-01-05 23:20:38 +01:00
Emanuel Schuetze
369f418b0e
Fixed missing endif
2013-01-05 15:43:52 +01:00
Emanuel Schuetze
13cd52bd96
Merged (conflicts).
2013-01-05 15:29:57 +01:00
Oskar Hahn
6417f5f107
fixed pep8 error
2013-01-05 14:56:22 +01:00
Oskar Hahn
2fcf0b3a07
fixed typo in utils/views.py
2013-01-05 14:46:05 +01:00
Oskar Hahn
56510f94a8
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-01-05 13:44:35 +01:00
Stefan Frauenknecht
bb74674c41
Deprecated import django.conf.urls.defaults adjusted.
2013-01-05 12:39:20 +01:00
Oskar Hahn
ae8641bcad
Raise an error if an CreateView does not define a apply_url
2013-01-05 01:48:03 +01:00
Oskar Hahn
3229d86d4d
Import urls.py needed django functions from django.conf.urls
2013-01-05 01:05:38 +01:00
Oskar Hahn
2f28655a25
Show Tabs if there do not define some permissions
2013-01-05 01:03:42 +01:00
Norman Jäckel
d842214e26
Fix typo in template.
2013-01-04 19:14:56 +01:00
Oskar Hahn
5d754984a3
fixed pep8 errors
2013-01-04 12:39:42 +01:00
Oskar Hahn
c1903848f2
Update openslides/__init__.py
2013-01-04 11:49:43 +01:00
Emanuel Schuetze
d671740966
Fixed merged errors.
2013-01-02 23:22:12 +01:00
Emanuel Schuetze
4ae7f3e243
Merge remote branch 'upstream/master' into newtemplate
...
Conflicts:
openslides/application/views.py
openslides/assignment/templates/assignment/overview.html
openslides/assignment/templates/assignment/view.html
openslides/assignment/views.py
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/motion/templates/motion/config.html
openslides/motion/templates/motion/edit.html
openslides/motion/templates/motion/import.html
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
openslides/participant/templates/participant/base_participant.html
openslides/participant/templates/participant/config.html
openslides/participant/templates/participant/group_edit.html
openslides/participant/templates/participant/group_overview.html
openslides/participant/templates/participant/overview.html
openslides/projector/templates/projector/base_projector.html
openslides/projector/templates/projector/dashboard.html
openslides/projector/templates/projector/live_view_widget.html
openslides/static/styles/base.css
openslides/templates/base.html
openslides/templates/front_page.html
openslides/utils/utils.py
2013-01-02 23:01:43 +01:00
Oskar Hahn
8a84f72891
fixed more url-template-tags
2012-12-16 17:35:06 +01:00
Oskar Hahn
5ea863ca81
Let the user choose the language in his settings
2012-12-16 17:26:53 +01:00
Oskar Hahn
b79fedc215
fixed jsonfield for django 1.5
2012-12-14 15:36:57 +01:00
Oskar Hahn
804f842650
Updated the url template tag
2012-12-14 15:10:14 +01:00
Oskar Hahn
366b8e0f1f
Droped support for python 2.5
2012-12-14 14:21:53 +01:00
Oskar Hahn
a07146098b
Changed Version to 1.4.dev
2012-12-14 14:14:01 +01:00
Emanuel Schuetze
c83348923a
Set version number to 1.3.1a0-dev (unreleased)
2012-12-10 22:36:18 +01:00
Emanuel Schuetze
bf98224ebd
Fixed missing translation.
2012-12-10 20:34:37 +01:00
Emanuel Schuetze
9a0bca7fea
Set 1.3 final release.
2012-12-10 20:30:32 +01:00
Emanuel Schuetze
56a5778260
Updated translation (fixed minor typo).
2012-12-10 20:06:17 +01:00
Emanuel Schuetze
c48c4e0e90
Added missing remove icon (for unsupport motion button).
2012-12-10 19:44:35 +01:00
Oskar Hahn
67f6b36ebc
Updated fr translation from transifex
2012-12-09 14:17:52 +01:00
Oskar Hahn
84324cf317
Updated translations
2012-12-09 12:59:56 +01:00
Oskar Hahn
0369edae1e
Added translationcontext for posts in assignment
2012-12-09 10:48:45 +01:00
Oskar Hahn
442e5fba60
Added fr translation
2012-12-09 10:40:41 +01:00
Oskar Hahn
fc4c4c3f95
Revert "Updated fr translation"
...
This reverts commit 7ff0825dc3
.
2012-12-05 20:07:11 +01:00
Oskar Hahn
05c029d8e5
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-12-04 00:20:41 +01:00
Oskar Hahn
7ff0825dc3
Updated fr translation
2012-12-04 00:20:11 +01:00
Norman Jäckel
046db10d3a
Hide group registered in the group widget.
...
Make custom slides text scrollable.
Fix template of personal_info_widget.
2012-12-01 19:32:58 +01:00
Norman Jäckel
a5022a3f00
Fix pep8 in openslides/__init__.py
2012-12-01 14:05:19 +01:00
Norman Jäckel
4410e454c8
Update test for version string.
2012-12-01 13:39:29 +01:00
Norman Jäckel
e7744f8210
Merge branch 'master' into Version_String
2012-12-01 13:10:29 +01:00
Oskar Hahn
e76ec5e975
Added a new command to the startscript to show the version
2012-11-29 15:01:49 +01:00
Norman Jäckel
d53017eea8
Get git commit id also in detached head mode.
2012-11-28 18:02:33 +01:00
Norman Jäckel
589c209c79
Merge branch 'master' into Version_String
...
Conflicts:
openslides/__init__.py
openslides/config/views.py
2012-11-28 17:54:29 +01:00
Oskar Hahn
ab4c5791ad
Merge pull request #61 from ostcar/master
...
Forbid the deletion of the registered group
2012-11-28 05:16:10 -08:00
Oskar Hahn
8306e7bf6e
Don't allow to remove the registered group
2012-11-28 13:59:14 +01:00
Oskar Hahn
48b530487b
Merge pull request #59 from emanuelschuetze/master
...
Prepared 1.3-rc1
2012-11-27 13:59:38 -08:00
Emanuel Schuetze
a010df5d1f
Reverted person.sort_name AttributeError fix ( e0ce1052c0
)
2012-11-27 22:54:07 +01:00
Oskar Hahn
e7c47395bb
Gave the empty user all the attributes it needs
2012-11-27 22:46:54 +01:00
Emanuel Schuetze
ae35a8c719
Updated translations
2012-11-27 21:30:45 +01:00
Emanuel Schuetze
94928c20c5
Updated translation msg strings.
2012-11-27 21:22:57 +01:00
Emanuel Schuetze
301a379fa6
Prepared 1.3-rc1 release.
2012-11-27 20:13:18 +01:00
Emanuel Schuetze
40984a6508
Merge remote branch 'upstream/master'
2012-11-27 20:10:13 +01:00
Oskar Hahn
4dfd4ac67f
fix _proper_unicode
2012-11-26 15:48:23 +01:00
Oskar Hahn
bdfb714013
fixed pep8 in pdf.py
2012-11-26 10:35:29 +01:00
Oskar Hahn
c276bce780
Let travis test pep8
2012-11-26 10:11:36 +01:00
Oskar Hahn
abd21dd345
Added more tests for the agenda
2012-11-26 10:05:51 +01:00
Oskar Hahn
fddf929ab5
Load groups_de when creating the database
2012-11-25 01:07:39 +01:00
Oskar Hahn
ab4b117a93
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-25 00:55:37 +01:00
Oskar Hahn
a31a67c32e
removed initial_data
2012-11-25 00:55:25 +01:00
Oskar Hahn
804b514597
Merge pull request #57 from andkit/bug-409
...
Fix #409
2012-11-24 12:29:44 -08:00
Oskar Hahn
3f469ab9d6
Commited the fix for get_version
2012-11-24 21:26:09 +01:00
Oskar Hahn
b3806d8cdd
some tests for the agenda
2012-11-24 21:10:55 +01:00
Andy Kittner
5979b23b04
Merge remote-tracking branch 'origin/master' into bug-409
...
Conflicts:
openslides/main.py
2012-11-24 20:49:04 +01:00
Andy Kittner
21a51523a4
Make pep8.py happy
2012-11-24 20:35:06 +01:00
Emanuel Schuetze
ec60207cfd
Fixed typo (candidation -> candidature)
2012-11-24 17:39:28 +01:00
Emanuel Schuetze
e0ce1052c0
Catch AttributeError for 'person.sort_name' in assignment/models.py
2012-11-24 17:34:56 +01:00
Andy Kittner
c405e9b648
Rework default settings handling ( fixes #409 )
2012-11-24 15:00:36 +01:00
Oskar Hahn
6b2645d11c
reordered the tests
...
moved the tests from the openslides-module to an own module
configured coverage
2012-11-24 15:00:17 +01:00
Oskar Hahn
bd32994296
cleanup
...
Removed unused imports and fixed pep8 errors
2012-11-24 14:01:21 +01:00
Oskar Hahn
f5a438cf9f
cleanup in utils
2012-11-24 01:42:10 +01:00
Norman Jäckel
4c97291598
Remove non-used revision template var.
2012-11-23 11:33:34 +01:00
Norman Jäckel
baebfbb585
Fix get_version, insert and use get_git_commit_id.
2012-11-23 11:31:30 +01:00
Oskar Hahn
9943e84a96
default permissions for the registered group
...
plus some cleanup for the registered and the anonymous group
2012-11-23 09:35:41 +01:00
Emanuel Schuetze
bba301a4b3
#420 : Use clean layout for group slide: Remove printing group users; print group name and number of members only. (Later we need a solution to print users fullname not username.)
2012-11-22 22:07:33 +01:00
Emanuel Schuetze
c115ea59a0
Fixed typo in comment.
2012-11-22 21:48:49 +01:00
Oskar Hahn
fa1c384d28
made use of defaults in get_or_create
2012-11-22 18:47:50 +01:00
Oskar Hahn
1049141483
Created a default group for registered users
2012-11-22 18:39:54 +01:00
Oskar Hahn
e168445497
fixed error, which allowed admins to delete the anonymous grou
2012-11-22 17:29:49 +01:00
Oskar Hahn
1dc7d45670
sort persons in motions
2012-11-22 17:00:09 +01:00
Oskar Hahn
8014f327a2
Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api
2012-11-22 16:35:26 +01:00
Oskar Hahn
fbf81e7780
sort persons
2012-11-22 16:19:09 +01:00
René Köcher
ed33b47666
Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides
...
Conflicts:
openslides/locale/de/LC_MESSAGES/django.po
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-22 12:52:11 +01:00
René Köcher
9f51a24311
#419 - aftermath
...
- remove accidental print statements left over from debugging
- create missing groups on import
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-22 10:26:44 +01:00
René Köcher
36f83808fd
Implement #419 : Add group column for motion csv import
...
The motion import now features an additional column to indicate that the import should be created by an existing group.
If the column is missing it is considered as 'off' and first / last name are used as always.
If the column exists and contains 'y','yes','j','ja','true', '1' or 1 first name will be ignored and last name will be interpreted as a group name.
If the group exists and can act as a person the motion will be imported and assigned to this group.
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-21 23:38:25 +01:00
Emanuel Schuetze
cbd04327bb
Reverted: Administrator can be deleted by other manager. (partly reverted 533c65562d
after discus it with oskar because import also possible as non-admin)
2012-11-21 23:26:54 +01:00
Emanuel Schuetze
8aec947303
Removed unused widget file (duplicate of welcome_widget.html).
2012-11-21 23:05:38 +01:00
Emanuel Schuetze
830f85109d
Minor formatting work.
2012-11-21 23:03:14 +01:00
Emanuel Schuetze
d5ee6d69b6
Enlarged users select box in new/edit group form.
2012-11-21 22:06:22 +01:00
Emanuel Schuetze
4877eed46c
Updated translation.
2012-11-21 21:45:27 +01:00
Emanuel Schuetze
ec1a15a835
#175 : Adjusted group slide; analog to user slide.
2012-11-21 21:45:19 +01:00
Oskar Hahn
2acfd02144
Merge pull request #45 from normanjaeckel/GroupSlide
...
Insert a slide for groups
2012-11-21 12:18:17 -08:00
Emanuel Schuetze
f3c865ee3c
#176 : Adjusted user slide. Show only relevant information in a nice and clear layout.
2012-11-21 21:05:56 +01:00
Emanuel Schuetze
c5a2f896e2
Fixed typo in identifier 'assignment_candidates'.
2012-11-21 20:12:08 +01:00
Emanuel Schuetze
da0757e40f
#417 : Don't hide vote results table if status is reset
2012-11-21 19:39:55 +01:00
Emanuel Schuetze
17d813e08b
Show error message for NameError.
2012-11-21 19:36:12 +01:00
Norman Jäckel
af6c403936
Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector.
2012-11-21 15:14:38 +01:00
Norman Jäckel
06af94fb91
Fix assignment poll choosing the right method (yes-no-abstain True or False)
2012-11-21 15:03:29 +01:00
Norman Jäckel
8e886a22ef
Insert a slide for groups
2012-11-21 14:22:30 +01:00
Norman Jäckel
00e77ba0fc
Use join for the group list also in the participant view
2012-11-21 14:09:47 +01:00
Norman Jäckel
5939b98772
Use join for group list in UserSlide.html
2012-11-21 14:07:14 +01:00
Norman Jäckel
d69e5a246b
Fix urls.py - Redirect from / to the dahsboard
2012-11-21 13:41:16 +01:00
Emanuel Schuetze
7fa86f7de0
Used blocktrans instead of trans
2012-11-20 12:37:16 +01:00
Emanuel Schuetze
ec10f357cf
Used RedirectView from openslides.utils.views. Used reverse_lazy
...
instead of hard coded redirect url.
2012-11-20 12:19:12 +01:00
Emanuel Schuetze
5e97ece5f4
#278 : Used cycle rowcolor in vote results table also for inavlid votes row
2012-11-19 23:52:48 +01:00
Emanuel Schuetze
0fbb7dced3
Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!)
2012-11-19 23:30:09 +01:00
Emanuel Schuetze
844b2892f1
Updated translation for professional support footer.
2012-11-19 23:05:38 +01:00
Emanuel Schuetze
c5595effef
Updated translation.
2012-11-19 22:59:13 +01:00
Emanuel Schuetze
93d2dc8d7d
Restructuring and optimization of assignment templates.
...
(Now: elected candidates are marked in candidate list; blocked candidates not visible for status 'finished')
2012-11-19 22:54:09 +01:00
Emanuel Schuetze
0cf4191934
Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty.
2012-11-17 23:44:41 +01:00
Emanuel Schuetze
b10cf331ab
Updated translation
2012-11-17 22:24:29 +01:00
Emanuel Schuetze
27fa32b718
Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard)
2012-11-17 22:14:49 +01:00
Emanuel Schuetze
e338529865
#296 : Localised the datetime in PDF header
2012-11-17 21:44:17 +01:00
Emanuel Schuetze
71eb529adf
Fixed #403 : Moved projector control icons into projector live widget (Added RequestContext to check perms in template.)
2012-11-17 20:59:30 +01:00
Emanuel Schuetze
f1fb68a569
#375 : Missing translation of participant type in participant PDF list. (Now get_type_display() is used.)
2012-11-17 20:02:16 +01:00
Andy Kittner
28cf531e4d
Pass along database path to create_settings if started as portable version
2012-11-09 13:45:52 +01:00
Oskar Hahn
b8bbec3a04
Merge pull request #42 from emanuelschuetze/master
...
Several minor fixes for 1.3-beta2
2012-11-09 01:16:37 -08:00
Oskar Hahn
6719cca7e1
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-09 09:52:00 +01:00
Oskar Hahn
54fb61d211
fixed main.py and manage.py for the openslides.exe
2012-11-09 09:51:10 +01:00
Emanuel Schuetze
81570b61e6
Rename submenu titel 'projector' to 'dashboard'.
2012-11-08 20:11:06 +01:00
Emanuel Schuetze
216ac95cfb
Redirect to dashboard after submit widget selection form.
2012-11-08 20:08:09 +01:00
Emanuel Schuetze
5623bb6888
Move professional support message into base template footer.
2012-11-08 19:13:31 +01:00
Emanuel Schuetze
533c65562d
Don't allow to deactivate or delete the superuser or yourself.
...
Otherwise it's very danger to lock out your current (superuser) session.
2012-11-08 18:57:53 +01:00
Emanuel Schuetze
e601d8a5a3
Fixed display_name of widgets.
2012-11-08 09:43:04 +01:00
Emanuel Schuetze
7c75f42d85
Updated translations.
2012-11-08 09:42:35 +01:00
Oskar Hahn
cbea48ab7e
Merge pull request #40 from emanuelschuetze/master
...
Fixed type in pdf list
2012-11-08 00:26:12 -08:00
Oskar Hahn
de7d4ed6cd
Merge pull request #34 from normanjaeckel/UserSlide
...
Add UserSlide with new template.
2012-11-08 00:25:04 -08:00
Emanuel Schuetze
8d599d6428
Fixed type in participants PDF list.
2012-11-08 09:22:23 +01:00
Oskar Hahn
f551b2fa6d
Merge pull request #39 from emanuelschuetze/master
...
Last translation update for 1.3-beta2
2012-11-07 13:43:02 -08:00