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

6017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
ec600c98f8 Merge pull request #1701 from normanjaeckel/AutoNumbering 
Added REST API viewpoint to number the agenda.
 2015-11-25 13:31:17 +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
Norman Jäckel
bdcf58f2eb Merge pull request #1698 from emanuelschuetze/agenda-templates 
Improvements for related agenda items
 2015-11-25 13:04:36 +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
Oskar Hahn
78c7b2497f Merge pull request #1702 from emanuelschuetze/split-motions-js 
Split motions.js into base, site and projector
 2015-11-24 15:56:22 +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
Oskar Hahn
984022baa4 Merge pull request #1679 from emanuelschuetze/chat 
Chatbox
 2015-11-23 10:35:26 +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
Oskar Hahn
c6d9701369 Merge pull request #1696 from normanjaeckel/RemoveTranslations 
Remove translations for projector exception messages.
 2015-11-22 22:03:02 +01:00
Norman Jäckel
c5f5fbf203 Remove translations for projector exception messages. 2015-11-21 00:01:48 +01:00
Norman Jäckel
1ef41b68bd Merge pull request #1683 from normanjaeckel/Translations 
Updated Englisch language files.
 2015-11-20 23:25:26 +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
2458cc97fb Merge pull request #1689 from ostcar/fix_pas_perms_after_reload 
AngularClient: Fix operator.pasPerms() after a reload
 2015-11-19 22:34:03 +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
Oskar Hahn
07bd763a63 Merge pull request #1688 from normanjaeckel/VotesField 
Enabled possibility to send null for motion poll votes vote value fie…
 2015-11-19 20:37:11 +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
Oskar Hahn
6dee5d87f0 Merge pull request #1685 from normanjaeckel/VoteString 
Return strings for special motion vote values. See #1669.
 2015-11-18 12:19:10 +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
Norman Jäckel
2417549755 Merge pull request #1663 from emanuelschuetze/motions-template2 
Work on motions app.
 2015-11-11 11:17:24 +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
ce52dde13a Merge pull request #1665 from normanjaeckel/ProfilePassword 
Added possibility to reset password. Work on user app in general.
 2015-11-08 22:58:30 +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
Oskar Hahn
4e8566904a Merge pull request #1667 from normanjaeckel/Logo 
Updated logo help text.
 2015-11-07 07:13:43 +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
fb4a261cc5 Merge pull request #1659 from ostcar/related_items 
Related items
 2015-10-29 15:47:56 +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
Oskar Hahn
d3a6c05a68 Merge pull request #1658 from normanjaeckel/RemoveBleach 
Removed bleach.
 2015-10-27 13:25:09 +01:00
Norman Jäckel
2dacdc8e87 Removed bleach. 2015-10-26 20:58:22 +01:00
Norman Jäckel
09a3f22fda Merge pull request #1657 from ostcar/fix_for_python_3.5 
Update beautifulsoup4 to support python 3.5
 2015-10-25 21:51:51 +01:00
Oskar Hahn
b6b371d39a Update beautifulsoup4 to support python 3.5 2015-10-25 21:42:46 +01:00
Oskar Hahn
3533a41520 Merge pull request #1656 from normanjaeckel/Cleanup 
Split and cleaned up JS files.
 2015-10-24 16:14:02 +02:00