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
Oskar Hahn
e046dd5302
Merge pull request #1719 from normanjaeckel/AssignmentRESTReq
...
Added error message if a new cnadidate is already nominated.
2015-11-29 22:22:36 +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
a8e7ee40ad
Merge pull request #1712 from ostcar/fix_item_sort
...
Angular: downgrade ui-tree to fix the agenda sort view
2015-11-28 20:52:38 +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
Norman Jäckel
6dee05328d
Merge pull request #1711 from ostcar/fix_assignment_autoupdate
...
Angular: Eject assignment related users before a assignment is updated
2015-11-28 13:22:27 +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
f41b9626d1
Angular: downgrade ui-tree to fix the agenda sort view
2015-11-27 23:55:26 +01:00
Oskar Hahn
9a7dea26e0
Angular: Eject assignment related users before a assignment is updated
2015-11-27 22:26:30 +01:00
Oskar Hahn
6a4cc97469
Merge pull request #1709 from emanuelschuetze/assignments-rework
...
Assignments template improvements
2015-11-27 20:16:41 +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
Norman Jäckel
91cc2b1bc1
Merge pull request #1705 from ostcar/assignment_js
...
Added assignment poll and assignment related user to js
2015-11-25 23:17:21 +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
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
