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

2552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
484963af4e Merge pull request #1207 from emanuelschuetze/fix-1138 
Fixed #1138: Wrong file for projectors logo
 2014-01-27 23:34:53 -08:00
Oskar Hahn
2392c1ab36 Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
Emanuel Schuetze
cfa35241e1 Fixed #1138: Wrong file for projectors logo 2014-01-27 21:15:53 +01:00
Emanuel Schuetze
d15488478d Fixed #1195: Correct path to circle.png on ballot paper (assignment and motion). 2014-01-27 20:54:32 +01:00
Norman Jäckel
9d28f4890e Merge pull request #1192 from emanuelschuetze/naturalsort 
Fixed #1190: Wrong sorting of motion identifier
 2014-01-22 05:25:14 -08:00
Emanuel Schuetze
13eb0ccb30 Fixed #1190: Wrong sorting of motion identifier 
- Added natural sorting JS plugin for motion DataTables (column identifier).
- Added the new requirements python package 'natsort' for natural sorting of motions in PDF.
 2014-01-21 23:14:39 +01:00
Norman Jäckel
5ddadbab6a Merge pull request #1194 from ostcar/jsonfield 
removed duplicated entry from the README.rst
 2014-01-21 11:38:53 -08:00
Oskar Hahn
7f3162f17b removed duplicated entry from the README.rst 
See #1189
 2014-01-17 16:05:49 +01:00
Norman Jäckel
4c3791a9a8 Merge pull request #1193 from emanuelschuetze/rename-static-files 
Rename and clean up static directories.
 2014-01-16 13:35:38 -08:00
Oskar Hahn
f60f668471 Merge pull request #1182 from normanjaeckel/CoupleAssignmentListOfSpeakers 
Coupled assignment candidates with list of speakers. Fixed #1092.
 2014-01-15 00:59:29 -08:00
Emanuel Schuetze
d8d2ad002a Rename and clean up static direcories. 
- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files
 2014-01-14 23:27:12 +01:00
Norman Jäckel
4b63f3a288 Coupled assignment candidates with list of speakers. Fixed #1092. 2014-01-13 15:22:46 +01:00
Oskar Hahn
d72fe39da6 Merge branch 'stable/1.5.x' 2014-01-12 13:38:07 +01:00
Norman Jäckel
5a123ade23 Merge pull request #1181 from ostcar/related_list_of_speakers 
Fixed agenda_item.is_active_slide() with related item and list of speakers
 2014-01-12 04:36:24 -08:00
Oskar Hahn
1ed41f64b6 Merge pull request #1156 from normanjaeckel/AutoPlugin 
Used entry points to detect plugins automaticly.
 2014-01-12 04:08:33 -08:00
Oskar Hahn
bbd7542341 Fixed agenda_item.is_active_slide() with related item and list of speakers 2014-01-12 12:48:38 +01:00
Norman Jäckel
04b0cfb0bc Used entry points to detect plugins automaticly. 2014-01-12 12:48:24 +01:00
Norman Jäckel
bc9bbb7280 Merge pull request #1169 from normanjaeckel/Loader 
Added possibility to use custom templates and static files in user data ...
 2014-01-12 03:48:09 -08:00
Norman Jäckel
e0223c950b Added possibility to use custom templates and static files in user data path directory. 2014-01-12 11:05:54 +01:00
Norman Jäckel
e10d9e5e86 Merge pull request #1170 from ostcar/poll_description 
Added a poll description field for each assignment poll
 2014-01-12 02:03:57 -08:00
Oskar Hahn
6409f828d7 Added a poll description field for each assignment poll 
fixed signals in MainMenuTests
 2014-01-12 10:22:38 +01:00
Oskar Hahn
03c59303d7 Merge pull request #1172 from ostcar/get_absolut_url_mixin 
Added AbsoluteUrlMixin and used it in any model.
 2014-01-12 01:02:14 -08:00
Oskar Hahn
c82ee4ce1f Added AbsoluteUrlMixin and used it in any model. 
cleaned up get_absolute_url() in some models
 2014-01-12 00:35:16 +01:00
Norman Jäckel
3fe9169786 Merge pull request #1175 from normanjaeckel/MultipleParticipantsForm 
Added form field for multiple creation of new participants. Fixed #178.
 2014-01-11 15:26:36 -08:00
Oskar Hahn
5ea13deccc Merge pull request #1174 from ostcar/json_field 
Use the jsonfield as requirement
 2014-01-11 14:42:39 -08:00
Norman Jäckel
b95a856904 Added form field for multiple creation of new participants. Fixed #178. 2014-01-11 23:09:59 +01:00
Oskar Hahn
90f9313faa Use the jsonfield as requirement 2014-01-11 23:01:29 +01:00
Oskar Hahn
56c8dcdac1 Merge branch 'stable/1.5.x' 2014-01-11 22:58:39 +01:00
Oskar Hahn
558bef2e91 Merge pull request #1167 from normanjaeckel/MainError 
Fixed error in main script when using other database engine. Fixed #1166.
 2014-01-11 13:49:57 -08:00
Oskar Hahn
cde6232477 Merge branch 'stable/1.5.x' 
Conflicts:
	openslides/projector/projector.py
	openslides/templates/base.html
 2014-01-11 22:30:14 +01:00
Norman Jäckel
26ec43bcea Merge pull request #1171 from ostcar/remove_edit 
removed edit and view in get_absolute_view
 2014-01-11 08:56:42 -08:00
Oskar Hahn
ad09a18e3f removed edit and view in get_absolute_view 2014-01-11 17:39:16 +01:00
Norman Jäckel
0051987286 Merge pull request #1165 from ostcar/list_of_speaker_overlay 
Fix list_of_speaker overlay
 2014-01-11 08:05:07 -08:00
Oskar Hahn
4c86c9cd07 Fix list_of_speaker overlay 
* Issue a warning message, if a overlay raises a exception
* Fixed #1131
 2014-01-11 09:21:35 +01:00
Norman Jäckel
19ccbd3b17 Fixed error in main script when using other database engine. Fixed #1166. 2014-01-11 08:51:17 +01:00
Norman Jäckel
0a9a99cfb0 Merge pull request #1162 from normanjaeckel/MoveDashboard 
Move dashboard to core app.
 2014-01-10 09:34:46 -08:00
Norman Jäckel
21ff62dd32 Changes in projector and core app and in utils. 
Changed api for main menu entries.
Enhanced http error pages using a classed based views.
Moved dashboard and select widgets view from projector to core app.
Also some small clean ups.
 2014-01-10 16:17:54 +01:00
Oskar Hahn
5c44a279fc Merge pull request #1164 from normanjaeckel/Issues-1.5.1 
Fix issues for 1.5.1
 2014-01-08 04:43:01 -08:00
Norman Jäckel
22960748a3 Added permission to see participants also to the manager group. See #1150. 2013-12-23 19:14:11 +01:00
Norman Jäckel
1e52959f70 Fixed error when a file was removed from filesystem. Fixed #1120. 2013-12-23 18:46:04 +01:00
Norman Jäckel
03fd7fd142 Fixed http status code when requesting a non-existing static page using Tordado web server. Fixed #1161. 2013-12-23 17:42:11 +01:00
Norman Jäckel
452e6cfaed Merge pull request #1149 from normanjaeckel/PersonalInfoClass 
Inserted api for the personal info widget.
 2013-12-09 03:22:28 -08:00
Norman Jäckel
9a3243706b Inserted api for the personal info widget. 2013-12-09 12:16:16 +01:00
Norman Jäckel
9bb7cd1388 Merge pull request #1146 from normanjaeckel/ReworkPoll 
Rename some classes of the poll api. Clean up the poll api.
 2013-12-06 15:38:41 -08:00
Norman Jäckel
405fadb6f5 Rename some classes of the poll api. Clean up the poll api. 2013-12-07 00:24:11 +01:00
Norman Jäckel
e718dd7b25 Merge pull request #1145 from normanjaeckel/ReworkConfig 
Rework config
 2013-12-06 01:53:53 -08:00
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