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

422 Commits

Author SHA1 Message Date
Norman Jäckel
96b4fb9fd9 Merge pull request #2376 from tsiegleauq/issue2300-pdf-line-numbers 
Add line numbers to pdf (fixes #2300)
 2016-09-20 21:15:25 +02:00
Emanuel Schuetze
875b7b2ddd Reduced font-size of outline numbers. 2016-09-20 16:57:57 +02:00
Sean Engelhardt
cc5ff21005 Add line numbers to pdf (fixes #2300) 2016-09-20 11:34:19 +02:00
FinnStutzenstein
9347a78d56 Make the sidebar scroll and one typofix 2016-09-19 09:05:55 +02:00
Norman Jäckel
858f4a2b43 Merge pull request #2405 from emanuelschuetze/fixAlerts 
Fixed syntax of all uib-alerts.
 2016-09-18 22:54:29 +02:00
Emanuel Schuetze
2a825adde4 Disable projector auto reload after 5 minutes. 
Auto reload no longer used because client gets all required data
after reconnection via websocket.
 2016-09-18 22:34:54 +02:00
Emanuel Schuetze
a7f5d4dd3c Fixed syntax of all uib-alerts. 
Required after ui-bootstrap upgrade.
 2016-09-18 21:09:37 +02:00
Norman Jäckel
00913a6333 Added management command to change config values. Fixed #2400. 2016-09-18 13:17:21 +02:00
Norman Jäckel
76250c5851 Changed loading of JavaScript files. 2016-09-18 11:23:51 +02:00
Emanuel Schuetze
852b175f3e Upgraded a lot of javascript libs. 
Some template fixes required for upgrading ui-bootstrap.
 2016-09-18 00:45:00 +02:00
Oskar Hahn
6abb0976c2 Change system for autoupdate on the projector (#2394) 
* Second websocket channel for the projector

* Removed use of projector requirements for REST API requests.

Refactored data serializing for projector websocket connection.

* Refactor the way that the projector autoupdate get its data.

* Fixed missing assignment slide title for hidden items.

* Release all items for item list slide and list of speakers slide. Fixed error with motion workflow.

* Created CollectionElement class which helps to handle autoupdate.
 2016-09-17 22:26:23 +02:00
Norman Jäckel
d7936c53e3 Updated settings files. Fixed timezone support. 2016-09-16 21:17:00 +02:00
Emanuel Schütze
2753af3585 Merge pull request #2277 from FinnStutzenstein/FeatureCSV 
Improved motions table with CSV export
 2016-09-08 14:47:54 +02:00
Finn Stutzenstein
a05a29c99a A new motions table with csv export 2016-09-08 14:38:32 +02:00
Norman Jäckel
1cdcad7d47 Fixed bug in templateHook directive. Fixed #2362. 2016-09-08 00:58:02 +02:00
Emanuel Schütze
34f85da1d8 Merge pull request #2352 from FinnStutzenstein/Issue2349 
Fixing resolving of Config for projector resolution (fixes #2349)
 2016-09-07 20:10:53 +02:00
Norman Jäckel
261b23affa Merge pull request #2326 from tsiegleauq/issue2301 
Limit image scale in pdf documents (fixes #2301)
 2016-09-06 16:41:58 +02:00
Finn Stutzenstein
fd78ccdb01 Fixing resolving of Config for projector resolution (fixes #2349) 2016-09-06 12:09:50 +02:00
Norman Jäckel
0fddfdd25a Merge pull request #2356 from emanuelschuetze/fix 
Fixed missing translation and form errors.
 2016-09-06 00:33:40 +02:00
Emanuel Schuetze
d7b092300d Fixed missing translation and form errors. 2016-09-05 23:13:07 +02:00
Tobias Hößl
b701127f04 Fix a styling problem 2016-09-05 20:03:41 +02:00
Emanuel Schuetze
7abdc2e615 Increase the allowed characters for event name config to 100. 
Same limit as event_description.
 2016-09-01 15:32:59 +02:00
Norman Jäckel
c87111e81d Merge pull request #2318 from FinnStutzenstein/projectorSize 
Control the resolution of the projector
 2016-09-01 14:59:53 +02:00
Finn Stutzenstein
a8dcc2abdc Control the resolution of the projector 2016-08-31 14:18:29 +02:00
Norman Jäckel
31e47e0ac5 Merge pull request #2308 from FinnStutzenstein/Issue1213 
Handle duplicates during user import (fixes #1213)
 2016-08-31 13:05:03 +02:00
Finn Stutzenstein
78ec30d6b2 Handle duplicates during user import 2016-08-31 12:23:38 +02:00
Emanuel Schuetze
24b95e5fbc Scale image size also in detail and projector view. 2016-08-31 09:58:26 +02:00
sean
33f463599a limit image scale in pdf documents (fixes #2301) 2016-08-30 12:54:55 +02:00
Emanuel Schütze
6efbe7b210 Merge pull request #2255 from matakuka/search_filter 
Added search filtering by category (fixes #2019, fixes #2239)
 2016-08-25 17:53:55 +02:00
Maximilian Krambach
e06b4db664 Added search filtering by category (fixes #2019, fixes #2239) 2016-08-25 17:49:36 +02:00
Maximilian Krambach
3221ce18f6 new view for current list of speakers (fixes #2212) 2016-08-25 17:35:57 +02:00
Maximilian Krambach
126cfb9000 Parent items for Agenda items (fixes #2213) 2016-08-25 13:51:54 +02:00
Emanuel Schütze
73095948ca Merge pull request #2260 from FinnStutzenstein/Feature435 
New matrix interface for group editing (closes #435)
 2016-08-22 15:26:10 +02:00
Finn Stutzenstein
bf3a1ce714 New matrix interface for group editing (closes #435) 2016-08-22 15:05:06 +02:00
Tobias Hößl
d986d551e0 Line numbers and inline editing 2016-08-20 11:18:17 +02:00
Norman Jäckel
5ea9cbf4d1 Merge pull request #2289 from emanuelschuetze/motionpdf 
Minor motion PDF improvements.
 2016-08-19 22:42:56 +02:00
Emanuel Schuetze
8a329a81e6 Minor motion PDF improvements. 2016-08-19 22:13:12 +02:00
Norman Jäckel
70a732bce8 Merge pull request #2280 from normanjaeckel/TemplateHook 
Added template hooks for plugins.
 2016-08-19 21:13:55 +02:00
Norman Jäckel
c38cf562d5 Added template hooks for plugins. 2016-08-19 21:08:54 +02:00
Thomas Junk
92a541215f pdfmake incl. fixes 2016-08-19 16:21:46 +02:00
Thomas Junk
546c4e65f6 PDFMake implemented 2016-08-19 14:10:30 +02:00
Finn Stutzenstein
ee95af9acc Added a possibility to sort and renumber all motions in a category 2016-08-18 14:54:09 +02:00
Oskar Hahn
8d58368937 Added missing migrations for #2269 2016-08-15 19:15:05 +02:00
Oskar Hahn
fac9e71c29 Remove default permissions for session 
fixes #2262
 2016-08-13 07:37:27 +02:00
Emanuel Schütze
320de66783 Merge pull request #2261 from emanuelschuetze/config-translations 
Fixed missing translations of config options (Fixes #2193)
 2016-08-09 20:18:49 +02:00
Emanuel Schuetze
282bc45790 Fixed missing translations of config options (Fixes #2193, fixes #2245) 2016-08-09 17:06:24 +02:00
Finn Stutzenstein
b115691675 Messages now allow HTML tags (Fixes #2127) 2016-08-05 12:38:19 +02:00
Norman Jäckel
2627724c55 Merge pull request #2199 from matakuka/noBrowserLanguage 
sets language to en if no browser language is set
 2016-07-11 14:19:14 +02:00
Maximilian Krambach
31df629fc9 sets language to en if no browser language is set 2016-07-06 09:52:32 +02:00
Emanuel Schuetze
31657d0cf3 Fixed and update English translation strings. 2016-06-28 10:18:43 +02:00
Norman Jäckel
b45e0ea09f Fixed coding style. 2016-06-16 10:28:14 +02:00
Maximilian Krambach
a5a00a7eda Config translations moved to client side (Issue #2093) 2016-06-12 11:46:46 +02:00
Joel Macht
b7d83e786f Fix linebreak on tags, add spacing and remove commas (Fixes #2147) 2016-06-10 18:17:42 +02:00
Oskar Hahn
fe64941aab Big Mode for OpenSlides 
Uses django channels instead of tornado for the autoupdate. Therefore
tornado is nolonger a dependency of OpenSlides (but channels).

This uses websockets instead of SockJS.

Use the flag insecure in the start command to provide static files serving.

Use a new session backend that has a ForeignKey to User.
 2016-06-09 11:14:39 +02:00
Maximilian Krambach
5061ea1770 typo fixing (issue #2181) 2016-06-08 22:18:35 +02:00
Maximilian Krambach
649300cfb8 Add a back button to tag overview (Fixed #2151) 2016-06-08 16:41:27 +02:00
Norman Jäckel
8c5c5dc556 Fixed bug on config view. 2016-06-06 14:19:57 +02:00
Oskar Hahn
2221b23447 Redesign of the config variables. 
Removed the config cache and created files for each app in which the
config variables are defined.
 2016-06-03 13:47:54 +02:00
Erik Steenman
4b7ba02b7d Change the z-index of .fullscreen to 100. 
Z-Index 199 places the fullscreen content just below the various
projector overlays, such as messages and timers.
 2016-05-10 14:51:30 +02:00
Emanuel Schuetze
e151e7c84c Fix z-index of chatbox and projector sidebar. 2016-04-17 22:18:16 +02:00
Emanuel Schuetze
06d333c067 Template fixes for better smartphone usage. 
- Remove on-focus-me directive on every list view.
  (Otherwise smartphones/tablets opens always the keyboard on each list view.)
- Make some columns 'optional' in list view to see only the most important columns
  on small devices.
- Add z-index for projector sidebar. Show it in full width on small
  devices.
- Remove padding on small devices.
 2016-04-17 19:56:38 +02:00
Emanuel Schuetze
9481d037e8 Reduce sizes of used logos. 2016-04-13 11:06:50 +02:00
Emanuel Schuetze
cb605d619e Mark missing translation string. 2016-04-03 11:53:40 +02:00
Emanuel Schuetze
0565d57789 Template fixes 
- Fix config groups. Use group index instead of group names (with blanks).
- Use 100% width for all chosen fields.
 2016-03-21 19:56:53 +01:00
Norman Jäckel
e2383dc770 Merge pull request #2051 from emanuelschuetze/templateFixes2 
Template improvements
 2016-03-20 21:21:52 +01:00
Emanuel Schuetze
3479a0636e Allow to enter countdown time in seconds or 'mm:ss' format. 2016-03-20 21:07:20 +01:00
Emanuel Schuetze
2af38f75bb Fix edit current slide button. 2016-03-20 21:07:16 +01:00
Norman Jäckel
5af25351fa Merge pull request #2049 from emanuelschuetze/fix2028 
Catch 404 errors in resolve promise if user has not all required permissions
 2016-03-20 20:48:58 +01:00
Emanuel Schuetze
5e08e073f4 Fix translation strings in motions and users forms. 2016-03-19 13:06:36 +01:00
Emanuel Schuetze
0cd6bb272c Projector template improvements 
- Vertical centering event title (if no description available)
- Fix sorting of main agenda item list.
- Show countdowns side-by-side. Allow edit if countdown is running.
 2016-03-19 07:30:18 +01:00
Emanuel Schuetze
03f08628c7 Catch 404 errors in resolve promise if user has not all required permissions. 
- fix motion detail/list, agenda item detail, assignment list, mediafile list
- add fontpage permission check
- use agenda item title for motion title if available (to show item number)
- fix groupFilter reset in users list
- fix users permission string

Fixes #2028. Fixes #2038.
 2016-03-18 21:41:16 +01:00
Emanuel Schuetze
140869ebd7 Fix translation strings. 2016-03-18 20:11:04 +01:00
Emanuel Schuetze
89446ce4f6 Use angular-chosen instead of ui-select for better performance. 
The jQuery select field from angular-chosen is used for all ui-select
fields. See https://github.com/leocaseiro/angular-chosen/

Use input delay on users filter field with 'debounce'.

Fixed #2006.
 2016-03-18 14:37:03 +01:00
Emanuel Schuetze
a8d9581664 Allow html in event name and description. 2016-03-14 17:09:37 +01:00
Emanuel Schuetze
1b25d9c376 Added loading spinner icon. 
Only for loading resolve object from server.
 2016-03-14 17:09:37 +01:00
Emanuel Schuetze
85326d75f2 New configs for font color in header and h1 on projector (Fixes #2020) 2016-03-08 23:01:17 +01:00
Norman Jäckel
56936c86ab Used bulk_create to create the initial projector during migration. Fixed #2035. 2016-03-07 19:09:45 +01:00
Norman Jäckel
ce3576f306 Merge pull request #2034 from emanuelschuetze/fix2005 
Fix main menu on small devices (Fixes #2005)
 2016-03-07 19:00:08 +01:00
Emanuel Schuetze
876d9408fe Fix main menu on small devices (Fixes #2005) 
Use bootstraps navbar-toggle button to bring up a
vertical responsive main menu.
Some additional responsive CSS impmprovements.
 2016-03-06 20:14:52 +01:00
Norman Jäckel
132c6e81ec Forwarding JSON instead of Django model instances to autoupdate loop. 
- Used raw SQL for createing default projector during inital migration.
- Removed default_password and hidden agenda items from autoupdate data for some users.
- Removed old get_collection_and_id_from_url() function.
 2016-03-06 14:24:53 +01:00
Norman Jäckel
4daa61888f Massive refactoring for autoupdate optimization. 2016-03-06 14:22:40 +01:00
André Böhlke
3db2f2fc16 "durchstich" for autoupdate optimization 2016-03-06 14:22:40 +01:00
Emanuel Schuetze
b78c9bc7bd Allow pdf scrolling on projector (Fixes #1949). 2016-03-05 22:44:00 +01:00
Emanuel Schuetze
7029852043 Template fixes 
- switch projector live view minimize/maximize buttons
- show agenda/item split buttons (project only main agenda items, project subitem)
  only if subitems are available
 2016-03-03 08:46:18 +01:00
Norman Jäckel
de871f3f9c Squished migrations files. 2016-03-02 14:26:47 +01:00
Norman Jäckel
a2a6637c89 Rename and refactor some ProjectorElement methods. Fixed #1631. 2016-02-27 20:56:03 +01:00
Norman Jäckel
9fbb12944c Updated start script help text and custom commands. Fixed #1987. 2016-02-25 23:17:04 +01:00
Emanuel Schuetze
a6be43809f Agenda list slide improvements 
- project summary of selected item
- show full tree OR main agenda items only
- show done items grey (without icon)
 2016-02-25 13:37:59 +01:00
Emanuel Schuetze
16fd87cc93 Use a global variable for the limiting number of users in select fields. (Fixed #1989) 2016-02-23 22:24:41 +01:00
Emanuel Schuetze
0613304724 Use colorpicker for projector header color config. 2016-02-23 22:24:41 +01:00
Emanuel Schuetze
ba49781b39 Show orange countdown in last x seconds of speaking time (add new config) 2016-02-23 22:24:38 +01:00
Emanuel Schuetze
647e62fb0d Set focus for chat input 2016-02-23 22:24:33 +01:00
Emanuel Schuetze
84ea0bf1f5 Several important fixes for beta4 
- Fix socket error in autoupdate (Check if socket exists)
- Add missing translation string for core permission
- Fix KeyError in extract_default_password function in users/views.py
- Improve Pagination. Fix users list for users without can_see_extra_data permissions.
- Limit the number of users in ui-select field
- Fix csv header names in users import help text.
- Use config options (enable logo/title) on projector.
- Nicer font style for main and sub items on agenda slide.
- Fix JS error if this.groups is undefined for anonymous.
 2016-02-17 17:49:44 +01:00
Norman Jäckel
75f4a2e62d Work on JavaScript coding style. 2016-02-16 00:56:56 +01:00
Norman Jäckel
40a3d4534e Merge pull request #1972 from emanuelschuetze/tinymce 
Use tinymce instead of CKEditor.
 2016-02-16 00:27:58 +01:00
Emanuel Schuetze
16f1ad5731 Use tinymce instead of CKEditor. 
- better integration of tinymce in bower and gulp
- Improve support for html tags in reportlab's motion pdf.
- Now paste from word works without problems
  (That was the main reason of switching to tinymce:
   The data loss problem with MS Word is still unfixed in CKEditor,
   see https://dev.ckeditor.com/ticket/13174)
- The editor is now used for customslides (text), motions (text,
  reason) and users (about).
- Use mediafile image list for tinymce.
- Use own repository for tinymce-i18n: OpenSlides/tinymce-i18n
 2016-02-16 00:22:01 +01:00
Norman Jäckel
2d5f5c685c Merge pull request #1964 from emanuelschuetze/assignmentpoll 
Assignmentpoll slide
 2016-02-15 23:50:43 +01:00
Emanuel Schuetze
503325220f Show selected poll on assignment slide. 2016-02-15 23:47:31 +01:00
Emanuel Schuetze
aee8ed2f3b Template fixes 
- Show correct last speakers on list of speakers slide.
- Fixes config input type.
- Fixes config style for checkboxes.
- Improved line-height on projector for scaling.
 2016-02-14 22:19:14 +01:00
Norman Jäckel
cc55aff8cc Added possibility to hide config variables. 2016-02-14 21:38:26 +01:00