Emanuel Schuetze
66d9d22e27
Updated requirements.
2013-10-21 21:27:07 +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
Oskar Hahn
aa2dfab6aa
Merge pull request #935 from normanjaeckel/UrlNameArgs
...
Fix missing url_name_args = [] lines in different views.
2013-10-21 11:00:54 -07:00
Oskar Hahn
54da16d3b0
Merge pull request #924 from normanjaeckel/NewReadme
...
Melt INSTALL.txt, THANKS and README.txt to new README.rst
2013-10-21 10:59:50 -07:00
Norman Jäckel
f74cce96cb
Melt INSTALL.txt, THANKS and README.txt to new README.rst. Change metadate for portable version.
2013-10-21 19:46:52 +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
Norman Jäckel
42efd5ce8e
Merge pull request #928 from emanuelschuetze/1.5-fixes
...
Fixes for 1.5b1
2013-10-21 06:42:28 -07: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
9682a48da2
Merge pull request #916 from ostcar/projector
...
Send js to the projector
2013-10-21 05:05:40 -07:00
Oskar Hahn
82f0df4fea
Send js to the projector
...
* fixed scroll and scale of the projector
2013-10-21 07:53:21 +02:00
Oskar Hahn
d714ac0223
Merge pull request #929 from normanjaeckel/UrlNameArgs
...
Fix url_name_args problems in user and group views. Add tests.
2013-10-20 13:30:18 -07: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
Oskar Hahn
beab5ca93e
Merge pull request #903 from normanjaeckel/CleanUpMain
...
Clean up main and move the code to __main__.py
2013-10-19 22:15:21 -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
Oskar Hahn
563f40a889
Merge pull request #908 from normanjaeckel/MotionAttachment
...
Insert new feature: attachments for motions.
2013-10-18 08:09:44 -07:00
Norman Jäckel
30371e964f
Insert new feature: attachments for motions.
...
Fixed #522 . Database struture changed.
2013-10-18 12:32:29 +02:00
Oskar Hahn
2f288f6cb1
Merge pull request #914 from rolandgeider/issue-626
...
Add CKeditor to the agenda item text field
2013-10-18 02:31:04 -07:00
Roland Geider
8f274c2691
Add CKeditor to the agenda item text field
2013-10-18 10:18:05 +02:00
Oskar Hahn
2b04980fc7
Merge pull request #913 from ostcar/issue-911
...
Cache the results of ItemDelete.get_answer_options
2013-10-17 23:00:50 -07: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
Oskar Hahn
d4b3227daf
Merge pull request #896 from emanuelschuetze/search
...
Search
2013-10-17 22:32:15 -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
21da6c24a8
Merge pull request #894 from ostcar/pylint
...
Cleanups
2013-10-14 09:47:02 -07: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
840ac34c80
Merge pull request #895 from ostcar/utils
...
Cleaned up utils
2013-10-13 12:37:45 -07:00
Oskar Hahn
d644d49579
Cleaned up utils
2013-10-13 20:43:26 +02:00
Oskar Hahn
9dffa2f8e1
Merge pull request #905 from emanuelschuetze/projector-fixes
...
Fixes and improvements for projector and template
2013-10-12 23:11:35 -07: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
a9487c22a7
Merge pull request #899 from ostcar/projector
...
Added projector.api.register_slide_model
2013-10-10 09:49:46 -07: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
Oskar Hahn
38251f0819
Merge pull request #901 from emanuelschuetze/newprojectortemplate
...
Rework projector template with bootstrap
2013-10-07 08:12:28 -07: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
81319e746e
Merge pull request #893 from ostcar/back_to_default_config
...
Added Feature for config app, to return the default value for a key
2013-09-30 13:30:58 -07: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
d926f4da07
Merge pull request #892 from ostcar/issue-891
...
Fixed keyerror on user setting page
2013-09-28 12:49:17 -07:00
Oskar Hahn
4bd40f9764
Merge pull request #889 from ostcar/projector
...
Rework of the projector with websocket
2013-09-24 15:00:50 -07: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
Oskar Hahn
6b95e51c5b
Merge pull request #890 from emanuelschuetze/translation-pt
...
Added Portuguese translation
2013-09-24 13:23:19 -07:00
Emanuel Schuetze
7f172692da
Added Portuguese translation (Thanks to Marco A.G.Pinto)
2013-09-24 22:13:50 +02:00