ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,170 Commits 6 Branches 42 Tags 64 MiB
851252dfe8
Commit Graph

3170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
947a976b86 Merge pull request #965 from ostcar/fixed_utils_view_test 
Reenabeld the test for the QuestionView
 2013-10-28 00:54:39 -07:00
Oskar Hahn
466e2ae565 Merge pull request #959 from ostcar/sockjs 
Use sockjs instead of only websocket
 2013-10-28 00:51:21 -07:00
Oskar Hahn
47c60078b3 Use sockjs instead of only websocket 2013-10-27 20:50:10 +01:00
Oskar Hahn
b84197d17b Reenabeld the test for the QuestionView 2013-10-27 16:00:27 +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
Oskar Hahn
d38606c191 Merge pull request #953 from emanuelschuetze/portable-fix 
Fixed portable build error and updated create_portable.txt
 2013-10-25 23:54:26 -07:00
Oskar Hahn
98667d9479 Merge pull request #952 from emanuelschuetze/zoom 
Improved projector zoom and scroll behaviour.
 2013-10-25 23:53:26 -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
571e3d9efc Fixed portable build error for pillow package. Updated create_portable.txt. 2013-10-24 08:51:12 +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
Oskar Hahn
7fcc786cf9 Merge pull request #946 from normanjaeckel/FixImport 
Fix #934: Error in motion import with bad csv file.
 2013-10-22 11:48:50 -07:00
Oskar Hahn
4b54bf80b5 Merge pull request #950 from normanjaeckel/Fix949 
Change link in install instruction (Setuptools). Fix #949.
 2013-10-22 11:42:36 -07:00
Norman Jäckel
37e6bfa008 Change link in install instruction (Setuptools). Fix #949. 2013-10-22 17:39:20 +02:00
Norman Jäckel
6175ce25c5 Fix #934: Error in motion import with bad csv file. 2013-10-22 00:18:58 +02:00
Oskar Hahn
b0b91e94c0 Merge pull request #941 from normanjaeckel/UrlNameArgsFix 
Fix url_name_args bug.
 2013-10-21 14:43:45 -07:00
Oskar Hahn
7f4b0d2bb9 Merge pull request #942 from emanuelschuetze/changelog 
Updated Changelog for 1.5b1
 2013-10-21 14:43:15 -07:00
Emanuel Schuetze
63312ce914 Updated Changelog for 1.5b1 2013-10-21 22:54:14 +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
Oskar Hahn
7e488fdb0c Merge pull request #937 from emanuelschuetze/translation 
Updated EN + DE translation file.
 2013-10-21 12:58:05 -07:00
Emanuel Schuetze
f1a8993452 Used reportlabs qrcode widget (instead of extra qrcode package). 2013-10-21 21:27:07 +02:00
Emanuel Schuetze
66d9d22e27 Updated requirements. 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
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