ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,303 Commits 6 Branches 42 Tags 64 MiB
bdf1679eb0
Commit Graph

2303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
bdf1679eb0 Rename classes in the config api. 
Also change attributes for config collection without view.
 2013-12-06 10:47:20 +01:00
Norman Jäckel
399ab5a96c Merge pull request #1143 from normanjaeckel/PluginAPI 
Change API for plugins, esp. for names and versions of plugins. Also enh...
 2013-12-05 07:47:59 -08:00
Norman Jäckel
fee983045b Change API for plugins, esp. for names and versions of plugins. Also enhance possibility to patch existing OpenSlides urlpatterns. 
Fix some other tests by the way.
 2013-12-05 16:40:54 +01:00
Oskar Hahn
863e5262a6 Merge pull request #1147 from normanjaeckel/EditOwnFiles 
Enable update and delete view for uploader refering to his own files.
 2013-12-04 07:18:59 -08:00
Norman Jäckel
91ca066aa5 Enable update and delete view for uploader refering to his own files. 2013-12-03 01:53:37 +01:00
Oskar Hahn
13df334e24 Merge pull request #1144 from normanjaeckel/DeactivateParticipantWidgets 
Disable participant widgets by default. Fixes #988.
 2013-12-02 09:40:46 -08:00
Oskar Hahn
947abd9930 Merge pull request #1142 from normanjaeckel/MoveTest 
Move test
 2013-12-02 09:39:59 -08:00
Norman Jäckel
43c6efa222 Disable participant widgets by default. Fixes #988. 2013-12-02 18:03:28 +01:00
Norman Jäckel
f1d1d57e69 Move widget test to correct directory. 2013-12-02 17:53:13 +01:00
Oskar Hahn
2cf2774e58 Merge pull request #1139 from DerPate/fix_last_gpl_header 
remove the last occurence of gnu gpl license header fix #1130
 2013-12-02 07:46:09 -08:00
Dominik Breu
a3bf29acf2 remove the last occurence of gnu gpl license header fix #1130 2013-12-01 22:52:08 +01:00
Norman Jäckel
b6b6809442 Merge pull request #1134 from normanjaeckel/NewWidgetAPI 
New widget api
 2013-12-01 12:50:01 -08:00
Norman Jäckel
1fb1f17d15 New API for widgets using a metaclass. 
It is now possible to define a default state and to submit extra stylefiles and javascript files when defining a widget in an app. This is done by a new metaclass in openslides.utils.dispatch. Also fixed some other tests.
 2013-12-01 21:30:12 +01:00
Oskar Hahn
2f75202c9b Merge pull request #1133 from normanjaeckel/SplitMaster 
Update version to 1.6a1-dev.
 2013-11-25 23:34:36 -08:00
Norman Jäckel
f510399230 Update version to 1.6a1-dev. 2013-11-25 23:42:52 +01:00
Norman Jäckel
abee1f04ba Merge pull request #1129 from normanjaeckel/Release-1.5 
Release 1.5
 2013-11-25 11:32:01 -08:00
Norman Jäckel
dfa334782e Update version to 1.5.1-dev 2013-11-25 20:26:06 +01:00
Norman Jäckel
dc529feda4 Release 1.5 2013-11-25 20:26:06 +01:00
Oskar Hahn
521c57a827 Merge pull request #1128 from emanuelschuetze/readme 
Added sphinx extention 'autoimage' to README.
 2013-11-25 11:24:31 -08:00
Emanuel Schuetze
fa84c04492 Added used sphinx extention 'autoimage' to README. 
Thanks to author Pedro Kroger who has allowed us to use it under MIT.
 2013-11-25 20:18:17 +01:00
Oskar Hahn
5541861176 Merge pull request #1125 from emanuelschuetze/documentation1.5 
Documentation1.5
 2013-11-25 11:08:25 -08:00
Norman Jäckel
9c6981021e Merge pull request #1127 from emanuelschuetze/readme 
Updated README: Removed qrcode. Moved bootstrap.
 2013-11-25 10:59:17 -08:00
Emanuel Schuetze
b00911d1de Updated README: Removed qrcode. Moved bootstrap. 2013-11-25 19:53:25 +01:00
Norman Jäckel
77bf9f0e3a Merge pull request #1126 from normanjaeckel/PrepareRelease 
Updated metadata files for final release.
 2013-11-25 10:53:07 -08:00
Norman Jäckel
047dce9842 Updated metadata files for final release. 2013-11-25 19:41:06 +01:00
Emanuel Schuetze
0d149180dd Updated documentation for 1.5 
- Updated all screenshots.
- Improved image handling with autoimage extension.
- Some minor content updates for 1.5 version.
- Fixed wrong list of speakers icon.
 2013-11-25 17:14:11 +01:00
Oskar Hahn
e1e5ffd14c Merge pull request #1123 from ostcar/overlay_error 
dont throw errors in overlay.get_projector_html
 2013-11-25 08:13:24 -08:00
Oskar Hahn
49ca243153 Add function get_active_object and bugfixes 
* Dont throw errors in overlay.get_projector_html if debug == False
* fixe check of active slide in agenda
* Fix #1121
 2013-11-25 11:35:03 +01:00
Norman Jäckel
096af30835 Update documentation 2013-11-25 09:08:44 +01:00
Emanuel Schuetze
0e82ffc888 Prepare handbook for 1.5. 2013-11-25 09:08:44 +01:00
Oskar Hahn
d6a824936d Merge pull request #1119 from ostcar/translate_languages 
translate lanuage names in global_settings
 2013-11-24 15:08:42 -08:00
Oskar Hahn
d02721a1f1 translate lanuage names in global_settings 
Fixes: #1118
 2013-11-25 00:07:06 +01:00
Norman Jäckel
e42857bfc3 Merge pull request #1124 from emanuelschuetze/translations 
Final update of all languages for 1.5: CS, DE, FR, PT.
 2013-11-24 14:46:37 -08:00
Emanuel Schuetze
ed427048af Final update of all languages for 1.5: CS, DE, FR, PT. 2013-11-24 20:37:13 +01:00
Oskar Hahn
a604b36385 Merge pull request #1122 from andkit/fix-1110 
Fix for issue #1110
 2013-11-24 08:15:02 -08:00
Andy Kittner
72c25ce2f5 Show friendly error message when portable dir is not writable (closes #1110) 2013-11-24 16:54:30 +01:00
Norman Jäckel
4af1d32dd1 Merge pull request #1115 from ostcar/projector 
Fixed countdown and projector update issues
 2013-11-24 07:46:15 -08:00
Oskar Hahn
f8048da76c Fixed countdown and projector update issues 
* agenda_item.get_absolute_url('projector') returns the activate-url of the related slide.
* agenda_item.is_activate() returns True, if the related item is active
* Fixed set_active_slide to accept kwargs
* Reset countdown when saving a new duration time
* Update countdown overlay when begin_speak and end_speak is called
* Fixed blinking countdown

Fixes: #1078, #1076, #1075
 2013-11-24 10:04:01 +01:00
Oskar Hahn
3be0507f1b Merge pull request #1117 from normanjaeckel/StartScriptFix 
Fix start script help text.
 2013-11-23 13:09:46 -08:00
Norman Jäckel
d2d8b5a39d Fix start script help text. 2013-11-23 18:49:51 +01:00
Norman Jäckel
2af3b320c8 Merge pull request #1116 from emanuelschuetze/template-fix2 
Minor template fixes
 2013-11-23 08:25:33 -08:00
Norman Jäckel
c2042f5dec Merge pull request #1113 from emanuelschuetze/wxpython 
Wxpython license file (fixes #1109)
 2013-11-23 08:23:59 -08:00
Norman Jäckel
ef6730f8bf Merge pull request #1112 from emanuelschuetze/template-fix 
Minor template fix
 2013-11-23 08:22:41 -08:00
Emanuel Schuetze
f1fd3208bd Template fixes 
- Agenda overview: Fixed padding of duration column.
- Agenda overview: Optimize header information for small devices with bootstrap's row-fluid class.
- Fixed text align in assignment detail template.
 2013-11-23 15:05:19 +01:00
Oskar Hahn
af79b511aa Merge pull request #1106 from ostcar/requirements 
Changed requirements to flexible versions in setup.py
 2013-11-23 02:40:19 -08:00
Emanuel Schuetze
d67c562b7a Added wxpython license file. (Fixed #1109) 2013-11-22 20:48:28 +01:00
Emanuel Schuetze
8ca4f0409f Use btn-mini class for list of speakers question in agenda view. 2013-11-22 20:39:28 +01:00
Norman Jäckel
980ce56bc3 Merge pull request #1108 from emanuelschuetze/duration 
Duration field and EN translation file
 2013-11-22 10:30:22 -08:00
Oskar Hahn
bce3aab8e7 Merge pull request #1105 from normanjaeckel/FixTest 
Fix tests.
 2013-11-22 08:00:41 -08:00
Emanuel Schuetze
f59b25e0dc Updated EN po file. 2013-11-22 15:35:24 +01:00