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

2237 Commits

Author SHA1 Message Date
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
cad252cd2b Merge pull request #1794 from normanjaeckel/LockoutProtextion 
Added lockout protection, see #1452.
 2016-01-09 12:19:28 +01:00
Norman Jäckel
cb22071886 Added lockout protection, see #1452. 2016-01-09 12:07:31 +01:00
Oskar Hahn
96328f033b Merge pull request #1793 from emanuelschuetze/fixAssignmentPhasesRequest 
Send assignments OPTION request for phases once only.
 2016-01-09 12:05:57 +01:00
Oskar Hahn
db22d1f7dc Merge pull request #1777 from emanuelschuetze/fix1662 
Sort list of speakers (Fixes#1662)
 2016-01-09 12:04:38 +01:00
Oskar Hahn
091c08dabd Merge pull request #1788 from emanuelschuetze/fixSlides 
Fix slide templates
 2016-01-09 12:01:11 +01:00
Emanuel Schuetze
4faf3dd2c0 Send assignments OPTION request for phases once only. 2016-01-09 11:45:25 +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
74110453c8 Rename ItemDetailSlide to ListOfSpeakersSlide (Fixes #1576) 2016-01-09 10:55:12 +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
3304cf48c5 Sort list of speakers (Fixes #1662) 2016-01-09 09:44:01 +01:00
Norman Jäckel
7843cc2ec0 Merge pull request #1785 from emanuelschuetze/fix-template-bugs 
Fix template bugs
 2016-01-09 01:12:51 +01:00
Norman Jäckel
241d3dbc20 Sorted list of speakers. 2016-01-08 23:32:29 +01:00
Emanuel Schuetze
de77cfc38c Fixed zooming/scrolling on slides. 2016-01-08 21:31:58 +01:00
Emanuel Schuetze
9b78b5992b Fix typo 2015-12-30 23:19:53 +01:00
Emanuel Schuetze
98cd4301a6 Generate example csv import files (Fixes #1761) 
- agenda csv file
- motions csv file
- users csv file
 2015-12-30 23:02:20 +01:00
Oskar Hahn
c63bd31db0 Merge pull request #1778 from emanuelschuetze/fix1718 
Fix publish assignment poll function. (Fixes#1718)
 2015-12-22 00:02:44 +01:00
Oskar Hahn
701d3ce228 Merge pull request #1776 from emanuelschuetze/fix1717 
Upgrade angular-ui-tree
 2015-12-22 00:01:50 +01:00
Emanuel Schuetze
b863c7ae13 Upgrade to angular-ui-tree 2.5.0 
With >=2.10.0 there is an error "context is null" if start dragging.
With >=2.6.0 there is a missing angular 1.4 dependency.
 2015-12-19 12:46:53 +01:00
Emanuel Schuetze
6b8aa56e87 Fix publish assignment poll function. 
Set 'votes' to required=False in AssignmentAllPollSerializer.
 2015-12-19 12:38:07 +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
99b4e8c494 Merge pull request #1771 from emanuelschuetze/fix1729 
Added whitespace before triple dots in template (Fixes #1729)
 2015-12-12 11:05:58 +01:00
Oskar Hahn
63d4351c9a Merge pull request #1773 from emanuelschuetze/csv-import 
Improved agenda and users csv import (Fixes #1748)
 2015-12-12 11:05:03 +01:00
Emanuel Schuetze
f5efca1d1e Added whitespace before triple dots in template (Fixes #1729) 2015-12-12 10:16:44 +01:00
Emanuel Schuetze
31c320f9ef Improved csv import for agenda and users. 
- Fix users list.
 2015-12-12 10:12:22 +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
Oskar Hahn
9402d25f4f Merge pull request #1767 from normanjaeckel/ItemDetailSlide 
Removed item detail slide on server and client side.
 2015-12-12 09:31:36 +01:00
Oskar Hahn
fae3747da6 Merge pull request #1769 from normanjaeckel/LoginLogout 
Fixed login and logout view.
 2015-12-12 09:30:00 +01:00
Oskar Hahn
fd90b15a0e Merge pull request #1770 from emanuelschuetze/fix1728 
Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728)
 2015-12-12 09:28:20 +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
Norman Jäckel
e0e74d6c3c Fixed login, logout and password change view. 2015-12-11 23:58:59 +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
ca94a4e720 Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728) 2015-12-11 19:50:50 +01:00
Norman Jäckel
0701838bc8 Merge pull request #1765 from emanuelschuetze/WhoAmI 
Login form
 2015-12-11 15:44:02 +01:00
Norman Jäckel
da37f3a441 Removed item detail slide on server and client side. 
There is now only a list of speakers slide.
 2015-12-11 15:37:13 +01:00
Norman Jäckel
c73671805e Merge pull request #1753 from emanuelschuetze/fix1704 
Project related object (Fixes #1704)
 2015-12-11 15:25:56 +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
Emanuel Schuetze
9001456d19 Fix user.id in password reset request (Fixes #1752) 2015-12-10 15:03:18 +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
Emanuel Schuetze
7bffeba93e Project related object (Fixes #1704) 
- Override generic project and isProjected function in agenda.
- Fix project and isProjected function for list of speakers and move
  to jsDataModel of Agenda.
 2015-12-09 20:02:08 +01:00
Norman Jäckel
1f63f84fde Update version to 2.0b2-dev 2015-12-07 21:55:56 +01:00
Norman Jäckel
c5e3a14a82 Release 2.0b1 2015-12-07 21:55:17 +01:00
Norman Jäckel
2f4b7c192c Updated French translation. 2015-12-07 20:11:46 +01:00
Norman Jäckel
00dd0b419a Updated German translation. 2015-12-07 20:06:05 +01:00
Norman Jäckel
075c00ac4f Updated English language file. 2015-12-07 15:43:45 +01:00
Emanuel Schuetze
3c5f49a127 Updated English translation strings. 2015-12-07 15:15:12 +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
Emanuel Schuetze
232ce522fe Updated translation strings and pot file. 2015-12-06 07:25:07 +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
Norman Jäckel
139a5173b8 Added German translation. 2015-11-30 21:30:37 +01:00
Norman Jäckel
f84b8f29ac Template and translation changes. Updated English language files. 2015-11-30 21:06:31 +01:00
Emanuel Schuetze
5cf2134e95 Fix translation tags. 2015-11-30 20:52:02 +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
Oskar Hahn
aab8b28393 Merge pull request #1724 from emanuelschuetze/project-item-fix 
Added own isProjected function for Agenda factory (Fixes #1704)
 2015-11-30 14:49:17 +01:00
Oskar Hahn
ca201758e8 Merge pull request #1715 from emanuelschuetze/template-improvements 
Template improvements
 2015-11-29 22:32:08 +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
Norman Jäckel
91174afa99 Added error message if a new candidate is already nominated. 2015-11-28 21:34:24 +01:00
Norman Jäckel
6f924e6686 Merge pull request #1714 from ostcar/assignment_poll_candidate 
AngularJS: Added js-data models for assignment poll candidates
 2015-11-28 13:26:56 +01:00
Norman Jäckel
262964cbea Merge pull request #1713 from ostcar/fix_delete_speaker 
AngularJS: Fix deletion of speakers.
 2015-11-28 13:24:58 +01:00
Oskar Hahn
99ef185502 Angular: Added js-data models for assignment poll candidates 2015-11-28 00:27:14 +01:00
Oskar Hahn
5ddedf94e1 angular: Fix deletion of speakers 2015-11-27 23:59:04 +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
Oskar Hahn
e67897941e Added assignment poll and assignment related user to js 2015-11-25 19:28:35 +01:00
Emanuel Schuetze
92719f2b31 Added own isProjected function for Agenda factory 
Allow to check if an related content object item is projected.
 2015-11-25 14:50:23 +01:00
Norman Jäckel
7bff79b377 Added manager to number all agenda items. 2015-11-25 13:05:39 +01:00
Emanuel Schuetze
28df416ec7 Added auto numbering button on agenda list view. 2015-11-25 13:05:39 +01:00
Norman Jäckel
f0080865e6 Added REST API viewpoint to number the agenda. 2015-11-25 13:05:39 +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
9af302ce36 Fix 'operator' error in projector view. 
Move operator factory from users/site.js to users/base.js.
The Motion factory uses 'operator' in motions/base.js which is also
loaded on projector. So operator is required in users/base.js.
 2015-11-23 22:06:54 +01:00
Emanuel Schuetze
f26188e0ff Split motions.js into base, site and projector 2015-11-23 22:06:50 +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
Norman Jäckel
cdd1813c02 Merge pull request #1691 from emanuelschuetze/motions-permissions 
Updated motion permission checks
 2015-11-20 23:18:54 +01:00
Oskar Hahn
02a67097e4 Merge pull request #1690 from emanuelschuetze/rest-password 
Reset default password of an user in UserUpdateCtrl. (Fixes #412)
 2015-11-20 10:26:04 +01:00
Emanuel Schuetze
c93e20b1b3 Updated motion permission checks. 
- Add permission checks in motion form (Fixes #1677)
- Implement get_allowed_actions in motions JavaScript (Fixes #1668)
 2015-11-20 00:15:18 +01:00
Oskar Hahn
b1e7259ce5 AngularClient: Fix operator.pasPerms() after a reload 2015-11-19 21:49:51 +01:00
Emanuel Schuetze
e9cf2fb591 Reset default password of an user in UserUpdateCtrl. (Fixes #412) 2015-11-19 21:49:28 +01:00
Norman Jäckel
19df7c82a2 Enabled possibility to send null for motion poll votes vote value fields. 2015-11-19 19:56:01 +01:00
Oskar Hahn
0cce7f967b Merge pull request #1661 from normanjaeckel/CKEditor 
Added CKEditor to custom slide create and edit form.
 2015-11-18 12:21:39 +01:00
Oskar Hahn
051c98ad88 Merge pull request #1684 from normanjaeckel/MotionFix 
Fixed create view for non staff users, fixed #1670.
 2015-11-18 12:20:08 +01:00
Norman Jäckel
69a6cb7c47 Return strings for special motion vote values. See #1669. 2015-11-18 01:46:58 +01:00
Norman Jäckel
2063dcff51 Fixed create view for non staff users, fixed #1670. 2015-11-18 01:20:49 +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
Oskar Hahn
2495ba609b create MotionPoll in JS 2015-11-11 10:50:49 +01:00
Emanuel Schuetze
798126551b Motions template improvements. 
- Added quickedit form for 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
Oskar Hahn
08c31a6b09 Merge pull request #1666 from normanjaeckel/Mediafile 
Fixed serializer and template. Fixed #1650.
 2015-11-07 07:14:39 +01:00
Norman Jäckel
03fcf950ff Updated logo help text. 2015-11-06 17:25:25 +01:00
Norman Jäckel
cc21b3d015 Fixed mediafile serializer and template. Fixed #1650. 2015-11-06 17:17:27 +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
Oskar Hahn
0e3688fc33 Merge pull request #1653 from normanjaeckel/FixMotionPoll 
Fixed changes in motion poll serializer.
 2015-10-21 23:15:28 +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
Norman Jäckel
0fc915ec35 Fixed changes in motion poll serializer. 2015-10-21 22:24:11 +02:00
Oskar Hahn
17973bae3d Merge pull request #1652 from ostcar/make_os-perms-lite_and_ng-show_compatible 
Fix os-perms-lite to make it compatible to ng-show and ng-hide
 2015-10-21 21:25:29 +02:00
Oskar Hahn
bf3e125786 Merge pull request #1651 from normanjaeckel/MotionPoll 
Changed Motion Poll REST fields.
 2015-10-21 21:25:06 +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
Norman Jäckel
817e15b01a Changed Motion Poll REST fields. 2015-10-21 21:20:38 +02:00
Emanuel Schuetze
fac45fbf2a Added multiselection delete mode for users list view. 
Fix users import: Allows multiple groups.
 2015-10-15 21:09:49 +02:00
Oskar Hahn
69268f0cc7 Merge pull request #1634 from emanuelschuetze/countdown-controls 
Projector elements controls
 2015-10-08 22:27:35 +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
Emanuel Schuetze
4559ffb882 Fix agenda slide and agendaIsProjected function. 2015-09-24 21:43:37 +02:00
Norman Jäckel
30e390dcfb Added API view for server time. 2015-09-24 21:28:30 +02:00
Norman Jäckel
1e08e9411a Cleaned up users app. 2015-09-21 16:23:47 +02:00
Norman Jäckel
e646cce91e Added scale and scroll, up, down and reset. Fixed #1633. 2015-09-18 10:31:22 +02:00
Norman Jäckel
4ad99f2bc9 Cleaned up mediafiles app. Fixed #1629. 2015-09-17 22:58:24 +02:00
Norman Jäckel
4600fd9b02 Merge pull request #1625 from boehlke/master 
Add upload feature to mediafiles module.
 2015-09-17 12:41:10 +02:00
André Böhlke
10b8a1d838 Add upload feature to mediafiles module 2015-09-17 12:35:40 +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
Norman Jäckel
2a23150b78 Fixed agenda tree, fixed #1635. 2015-09-14 22:18:55 +02:00
Norman Jäckel
c8dfb9437b Removed imports from openslides.users in other apps: Cleaned up agenda, assignments and motions. 2015-09-14 21:13:56 +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
Oskar Hahn
f0803f1c03 Merge pull request #1624 from ostcar/agendaTree 
Calculate agenda tree on the client side.
 2015-09-06 15:04:38 +02:00
Oskar Hahn
85be9f23cc Merge pull request #1623 from normanjaeckel/ProjektorElementsOutput 
Updated Projector config field and control views.
 2015-09-06 15:04:26 +02:00
Oskar Hahn
e22b9984e3 Calculate agenda tree on the client side. 
Update changed agenda tree via autoupdate.
 2015-09-06 15:01:41 +02:00
Norman Jäckel
5c4c0367a1 Updated Projector config field and control views. 2015-09-06 14:59:33 +02:00
Norman Jäckel
5fc215c359 Fix docstrings. 2015-09-06 11:48:37 +02:00
Oskar Hahn
1fc7a361eb Merge pull request #1621 from normanjaeckel/User 
Added possibility to update your own user object.
 2015-09-06 11:37:52 +02:00
Norman Jäckel
c8bf754646 Added possibility to update your own user object. Hide default password for non admins. 2015-09-06 11:26:48 +02:00
Oskar Hahn
2c64a161ac fix projector 2015-09-06 10:24:15 +02:00
Norman Jäckel
973d3fa653 Merge pull request #1618 from normanjaeckel/Projector 
Added UUID to projector elements. Added update view.
 2015-09-05 21:23:00 +02:00
Norman Jäckel
47a151c71e Added UUID to projector elements. Added update view. 2015-09-05 21:19:53 +02:00
Oskar Hahn
bd51c6a52c Added osPermLite as alternative to osPerm 2015-09-05 19:17:41 +02:00