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

286 Commits

Author SHA1 Message Date
Norman Jäckel
87e3c536da Deleted Django default permission of some apps. Fixed #1643. 2016-01-25 14:48:54 +01:00
Oskar Hahn
0d1a8aa174 Merge pull request #1878 from emanuelschuetze/fix1783 
Add checkbox 'show as agenda item'. (Fixes #1783)
 2016-01-24 22:16:43 +01:00
Emanuel Schuetze
9ddc558085 Add checkbox 'show as agenda item'. (Fixes #1783) 
Used for customslide, motion and assignment forms.
Changed default value of agenda.type to HIDDEN_ITEM (=2) in model.py.
 2016-01-23 20:22:56 +01:00
Emanuel Schuetze
4d6aade16a Send option request for config page just once (Fixes #1813) 
Add permission check in config template.
 2016-01-23 01:02:05 +01:00
Emanuel Schuetze
94366f35ab Use os-perms instead of os-perms-lite. Removed os-perms-lite. (Fixes #1826) 2016-01-21 22:26:11 +01:00
Emanuel Schuetze
646bf52ea7 Show countdown in red if negative (projector and control panel). 
Show 00:00 instead of --:--
 2016-01-21 21:43:02 +01:00
Emanuel Schuetze
b291473c61 Set guest_enabled in rootScope to use it in login form after reload. (Fixes #1849) 
- Justified login form elements (same width).
 2016-01-21 21:14:55 +01:00
Emanuel Schuetze
42f9cfdf45 List views: show number of filtered AND total rows. 
Improve css animation for ng-enter/ng-leave.
 2016-01-21 20:43:04 +01:00
Emanuel Schuetze
76dc29cddf Use uib-alert instead of deprecated alert tag. 2016-01-18 21:09:28 +01:00
Emanuel Schuetze
851252dfe8 Format all JavaScript functions in same syntax. 
Required for use minified js code in production mode.
 2016-01-17 22:32:48 +01:00
Emanuel Schuetze
0e24d9b632 Modify motion/assignment/customslide in form dialog without updating list/detail view. 2016-01-17 21:19:32 +01:00
Oskar Hahn
440a38b387 Merge pull request #1843 from emanuelschuetze/motionsTemplate 
Motion template fixes
 2016-01-14 08:49:48 +01:00
Emanuel Schuetze
bc60b7e7ca Several template improvements 
- Move Languages services from site.js to base.js
  Now the detected browser language is used as projector language.
- Use verboseName instead of agendaSupplement.
- Show submitters on projector (load Users on Controller).
- Improve list of speakers (slide and item detail).
 2016-01-14 00:14:48 +01:00
Norman Jäckel
3fc82a596c Fixed server error in config update view. Fixed #1828. 2016-01-13 15:04:47 +01:00
Emanuel Schuetze
2f8c894104 Motion template fixes 
- Fix missing workflows in Motion create form.
- redesign motion meta box
- use table format for motion voting results
 2016-01-13 14:32:15 +01:00
Oskar Hahn
007a92a96b Merge pull request #1841 from emanuelschuetze/ProjectorRedesign 
Redesign projector template (Fixes #1787)
 2016-01-13 11:28:06 +01:00
Oskar Hahn
aa6a099840 Merge pull request #1809 from emanuelschuetze/CustomSlideAttachment 
Custom slide attachment
 2016-01-13 11:26:46 +01:00
Emanuel Schuetze
d0b9b2a492 Added reduced projector logo. 
Added openslides blue color value to logo README.
 2016-01-13 10:47:27 +01:00
Emanuel Schuetze
09b88fb4a6 Redesign projector template. 2016-01-13 10:28:49 +01:00
Emanuel Schuetze
93e2296bdc A lot of template fixes 
- Reset password from current (unsaved) value of default_password.
- MotionForm, AssignmentForm and UserForm factory for open ngDialog.
  Fixes edit url redirect problem.
- Added back-to-detail-view-button to list of speakers view.
- Add translation context.
- Fixed (missing) translation strings.
- Fixed tags and category list views.
- motion detail: Use select box for changing state.
- motion slide updated
 2016-01-13 10:22:24 +01:00
Emanuel Schuetze
f2375008d8 Added attachments for customslide views. (Fixes #1681) 2016-01-10 11:55:37 +01:00
Norman Jäckel
8a6ca904dc Added attachments to custom slides. 2016-01-10 11:51:00 +01:00
Norman Jäckel
ca659351eb Merge pull request #1825 from emanuelschuetze/fixTemplates 
Fixed permissions in list views.
 2016-01-10 01:07:51 +01:00
Oskar Hahn
87d647ac4d Merge pull request #1824 from ostcar/fix_tornado 
Fix tornado
 2016-01-10 01:03:16 +01:00
Emanuel Schuetze
071b0a76be Fixed permissions in list views. 2016-01-10 01:02:13 +01:00
Norman Jäckel
7005ab7f64 Disabled autocomplete for chat box. 2016-01-10 00:46:23 +01:00
Oskar Hahn
4bc0b1d19c fix autoupdate and hide some groups in user edit form 2016-01-10 00:44:02 +01:00
Oskar Hahn
c30116f5c1 Merge pull request #1815 from emanuelschuetze/candidateElected 
Mark candidate as elected. Updated assignment detail.
 2016-01-09 22:37:39 +01:00
Emanuel Schuetze
2c46d3ae0a Mark candidate as elected. Updated assignment detail. 2016-01-09 22:35:04 +01:00
Oskar Hahn
3ae6482863 Fix autoupdate of config 2016-01-09 22:13:55 +01:00
Oskar Hahn
2f8138f672 Merge pull request #1811 from normanjaeckel/SquishMigrations 
Squished all migrations.
 2016-01-09 21:04:54 +01:00
Norman Jäckel
8d1c351c9a Squished all migrations. 2016-01-09 19:10:57 +01:00
Norman Jäckel
544efdb06e Merge pull request #1806 from ostcar/fix_autoupdate_after_reload 
Fix autoupdate after auth
 2016-01-09 18:55:24 +01:00
Oskar Hahn
5069649e14 Fix autoupdate after auth 
Remove data after logout
 2016-01-09 18:25:18 +01:00
Norman Jäckel
193d318bc9 Merge pull request #1803 from ostcar/os_filter 
Add osFilter that filters for an explicit text
 2016-01-09 17:07:31 +01:00
Emanuel Schuetze
4a9f265b68 Used is_hidden instead of item.typ. Improve hidden filter. 
Fixed JS error in users and assignments.
 2016-01-09 16:55:21 +01:00
Oskar Hahn
e3b6fd8d6d Add osFilter that filters for an explicit text 2016-01-09 16:45:47 +01:00
Norman Jäckel
68ec516e6f Merge pull request #1799 from emanuelschuetze/loginText 
Show info text in login form (Fixes #1754)
 2016-01-09 16:07:55 +01:00
Emanuel Schuetze
11470d3b57 Move welcome config values to general section. 
Use textarea for welcome text.
 2016-01-09 16:05:06 +01:00
Emanuel Schuetze
b035ee7d7c Improved legal notice page (Fixes #267) 2016-01-09 14:44:49 +01:00
Oskar Hahn
c2041dca6f Merge pull request #1796 from normanjaeckel/MoveTranslations 
Remove model field verbose names. Move help texts.
 2016-01-09 14:25:42 +01:00
Emanuel Schuetze
363c928517 Show info text in login form (Fixes #1754) 2016-01-09 14:22:32 +01:00
Norman Jäckel
e406b92745 Remove model field verbose names. Move help texts. 2016-01-09 14:17:51 +01:00
Emanuel Schuetze
54b1c8e350 Show agenda titles with correct numbering 2016-01-09 14:01:30 +01:00
Oskar Hahn
622dadd4ef Merge pull request #1795 from normanjaeckel/StaticImpressumPage 
Added config field for legal notes.
 2016-01-09 13:22:54 +01:00
Norman Jäckel
d7e39be708 Added config field for legal notes. 2016-01-09 13:01:18 +01:00
Oskar Hahn
4b69c57c78 Merge pull request #1789 from ostcar/update_requirements 
Update requirements
 2016-01-09 12:22:41 +01:00
Oskar Hahn
552998b067 Update requirements, fixt a lot of warnings 
Set python 3.4 as minimal supported python version
 2016-01-09 12:19:46 +01:00
Oskar Hahn
091c08dabd Merge pull request #1788 from emanuelschuetze/fixSlides 
Fix slide templates
 2016-01-09 12:01:11 +01:00
Oskar Hahn
308f55bb3f Merge pull request #1782 from ostcar/search 
Added a search on the server side.
 2016-01-09 11:44:08 +01:00
Oskar Hahn
75dcbab5d1 Add search on the server side. 2016-01-09 11:35:57 +01:00
Emanuel Schuetze
5cab3bf3dc Added indentation of subitems on agenda slide (Fixes #1716) 2016-01-09 10:34:34 +01:00
Norman Jäckel
6c33c60600 Merge pull request #1786 from normanjaeckel/LoginInfoView 
Added login info text in config and view.
 2016-01-09 10:24:56 +01:00
Norman Jäckel
ecf561e305 Added login info text in config and view. 2016-01-09 10:01:17 +01:00
Emanuel Schuetze
de77cfc38c Fixed zooming/scrolling on slides. 2016-01-08 21:31:58 +01:00
Norman Jäckel
d3e8c68a51 Merge pull request #1775 from emanuelschuetze/templateStuff 
Fixed some template bugs (#1727)
 2015-12-19 11:53:53 +01:00
Oskar Hahn
66e0fe272b Merge pull request #1764 from normanjaeckel/DefaultPermissions 
Deleted Django's default permissions.
 2015-12-12 09:32:40 +01:00
Emanuel Schuetze
c275b08178 Fixed some template bugs (#1727) 
- Fixed z-index of messages and countdowns.
- Sidebar: Live view open by default. Improve section style.
- Set default value for open_posts in assignments create form.
- Redefine default values in motions create form.
 2015-12-12 00:30:05 +01:00
Emanuel Schuetze
041b01afe5 Login dialog behavior if guest mode enabled/disabled (Fixes #1750) 2015-12-11 21:18:45 +01:00
Emanuel Schuetze
5d29af5f52 Improved login form. 
- Add redirect after aborting login. (Fixes #1762)
- Use new state paramater 'guest_enabled' for login form.
 2015-12-11 13:45:53 +01:00
Norman Jäckel
24cb58dc12 Added guest enabled info to WhoAmI view. 2015-12-11 13:44:58 +01:00
Norman Jäckel
114a38e4ee Deleted Django's default permissions. 2015-12-10 00:31:27 +01:00
Emanuel Schuetze
f050e04f0a Redirect to login dialog if user is not logged in (Fixes #1750) 2015-12-09 20:45:52 +01:00
Norman Jäckel
1b1e8f8ba2 Used our own repository for Open Sans font. 2015-12-06 23:55:30 +01:00
Emanuel Schuetze
5c6977c46d Template fixes 2015-12-06 17:26:10 +01:00
Oskar Hahn
37cd431aa9 Merge pull request #1737 from emanuelschuetze/motion-csv-import 
Add motion csv import (Fixes #1675)
 2015-12-05 23:53:08 +01:00
Emanuel Schuetze
d987a1138d Added motion csv import (Fixes #1675) 
using pre-import checks and preview table.
 2015-12-05 21:44:19 +01:00
Emanuel Schuetze
f5452082f0 Use transparent favicon. 
- Added favicon to projector template.
 2015-12-02 14:20:59 +01:00
Norman Jäckel
696bfb0883 Fixed comment. 2015-12-01 15:45:35 +01:00
Emanuel Schuetze
b81704a88f Fixed translations in agendaSupplement. 2015-12-01 13:45:54 +01:00
Emanuel Schuetze
e23121ed0f Updated language menu. 
- improved header menu style
- define new Languages factory
- make it easier to define new languages
 2015-12-01 12:06:15 +01:00
Emanuel Schuetze
bf940b177c Fixed gettext strings in JavaScript. 
- Added browser lanugage detection.
- Use gettextCatalog.getString(..) instead of gettext(..) in JS code.
- updated pot file
 2015-11-30 23:52:42 +01:00
Emanuel Schuetze
fa267b68c2 New template design 
- Great thanks to Jörn Bensch (from triagonale.de) for new base
  template!
- A lot of adaptations in all templates for new design.
 2015-11-30 20:36:33 +01:00
Emanuel Schuetze
2b5c9c09b2 Template improvements 
- use modal dialogs for new/edit views of customslide/motions/assigments
- use hover actions in all list views
- Show assignment candidate names
- support yesnoabstain/vote assignment poll
- Generic solution for open edit dialog.
 2015-11-29 22:26:59 +01:00
Oskar Hahn
9a7dea26e0 Angular: Eject assignment related users before a assignment is updated 2015-11-27 22:26:30 +01:00
Emanuel Schuetze
35a8042759 Assignments template improvements 
- list view with quickview
- ngDialog for create/update view
- candidates
- polls
 2015-11-27 00:19:37 +01:00
Emanuel Schuetze
968083e9e5 Improved related agenda items 
- Added QuickEdit mode for related agenda items
- show/hide hidden agenda items
- Added ng-dialog for modal create/update dialogs of customslides
- use generic links for list of speakers, edit, delete, project
- Moved projector elements to sidebar of index template (In progress!
  It will be improved with new base template design).
- Fixed error if chat messages is empty.
- Moved ngSanitize to base.js to use ng-bind-html in projector slides.
 2015-11-25 12:18:14 +01:00
Emanuel Schuetze
3c0fcfebac Reworked on chatbox in base template. 2015-11-22 22:46:18 +01:00
Norman Jäckel
b1dfd2a4e9 Added first chatbox draft on client side. 2015-11-22 22:45:59 +01:00
Norman Jäckel
c5f5fbf203 Remove translations for projector exception messages. 2015-11-21 00:01:48 +01:00
Norman Jäckel
1016af3c52 Updated English language files. 2015-11-20 23:23:01 +01:00
Emanuel Schuetze
e3f57a250c Use custom ckeditor options 2015-11-17 23:25:09 +01:00
Norman Jäckel
d299579f16 Added CKEditor to custom slide create and edit form. 2015-11-17 23:25:09 +01:00
Emanuel Schuetze
ed72a90306 Reworked all motions templates. 
motion detail:
- added progres bar for motionpoll
- added support/unsupport function
- show log

motion list:
- added state filter
- added css animations for enter/leave

motion form:
- use angular-formly (instead of old ng-fab-forms with no angular 1.4.x support)

general:
- Workflow states use new field 'css_class' (instead of unused
  'icon'). Added migration file.
- added 'allowed_actions' to rest api for each motion (by Norman)
- updated all JavaScript dependencies (bower.json)
 2015-11-11 10:50:49 +01:00
Oskar Hahn
c379544e97 Fixed motion states, handled workflow field. 2015-11-11 10:50:49 +01:00
Emanuel Schuetze
5b37a21c87 Motion detail updated for polls. 
bower.json: updated ui-select
New QuickEdit feature in motion list.
 2015-11-11 10:50:49 +01:00
Norman Jäckel
8154b0324b Added possibility to reset password. Work on user app in general. 2015-11-08 22:10:24 +01:00
Norman Jäckel
03fcf950ff Updated logo help text. 2015-11-06 17:25:25 +01:00
Oskar Hahn
12a08b9732 New Agenda Item 
Changed agenda item, so it can not be manualy created, but is always created
when a custom slide, motion or assignment is created.
 2015-10-29 15:44:43 +01:00
Norman Jäckel
32b23df763 Split and cleaned up JS files. Added test. 2015-10-22 00:28:01 +02:00
Norman Jäckel
f8cf279d82 Added JSHint to Gulp. Split up JS-Code in users app. 2015-10-21 22:44:07 +02:00
Oskar Hahn
1f0ab173d3 Fix os-perms-lite to make it compatible to ng-show and ng-hide 2015-10-21 21:21:48 +02:00
Emanuel Schuetze
dda16af532 Added controls for projector elements 
countdowns, messages, scale/scroll/edit current slide
Use global serverOffset.
Fixed #1645 (wrong time of projector clock).
Show countdown description on projector slide.
 2015-10-08 19:21:25 +02:00
Norman Jäckel
30e390dcfb Added API view for server time. 2015-09-24 21:28:30 +02:00
Norman Jäckel
e646cce91e Added scale and scroll, up, down and reset. Fixed #1633. 2015-09-18 10:31:22 +02:00
Oskar Hahn
264895b773 Configure js-data for projector elements to "replace" on inject. 
fixes #1632
 2015-09-17 12:04:45 +02:00
Norman Jäckel
187cb0c42f Fixed blue line for active projector elements. 2015-09-16 23:59:20 +02:00
Emanuel Schuetze
7f9c8b6a38 Agenda item list: new multiselect delete mode 
Remove action column.
 2015-09-14 20:35:24 +02:00
Norman Jäckel
8c48d67df0 Fixed projector. 2015-09-14 20:30:37 +02:00
Norman Jäckel
6d76454925 Added model, serializer and viewset for chat messages. 2015-09-07 17:13:42 +02:00