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

4172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
f288cb4967 Merge pull request #2374 from normanjaeckel/LoadJavaScript 
Changed loading of JavaScript files.
 2016-09-18 12:24:40 +02:00
Norman Jäckel
3d8d7bb695 Merge pull request #2398 from emanuelschuetze/upgrade-requirements 
Upgraded requirements.
 2016-09-18 12:15:49 +02:00
Norman Jäckel
76250c5851 Changed loading of JavaScript files. 2016-09-18 11:23:51 +02:00
Emanuel Schütze
cdf6b79a36 Updated confirm message. 2016-09-18 11:03:30 +02:00
Emanuel Schuetze
b936976f37 Upgraded requirements. 
Use twisted<16.4 for easier install (without compiling).
Use lowercase name 'openslides' in bower.jspon and packages.json to
prevent warning.
 2016-09-18 10:51:47 +02:00
Norman Jäckel
edf997524e Merge pull request #2397 from emanuelschuetze/upgrade-js-libs 
Upgraded a lot of javascript libs.
 2016-09-18 10:41:11 +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
6ade5630ff Merge pull request #2395 from emanuelschuetze/fix2069 
Fixed motion form to save form with default text (Fixes #2069).
 2016-09-17 17:00:59 +02:00
Emanuel Schuetze
d1458dcca1 Fixed motion form to save form with default text (Fixes #2069). 
Use workaround: Added 'novalidate' to motion form. Otherwise user
can't save form if text editor field contains default value.
 2016-09-17 15:45:59 +02:00
Emanuel Schütze
4b0594a83b Merge pull request #2393 from normanjaeckel/FixAutoupdateConnction 
Reconnect autoupdate after some migrations. Fixed #2377.
 2016-09-17 13:42:51 +02:00
Norman Jäckel
5f65830d47 Reconnect autoupdate after some migrations. Fixed #2377. 2016-09-17 13:36:32 +02:00
Norman Jäckel
27223c35d9 Merge pull request #2364 from CatoTH/motion-detail-behaviour-services 
Move inline editing methods into a separate service
 2016-09-17 12:17:31 +02:00
Norman Jäckel
7998df03a3 Merge pull request #2382 from FinnStutzenstein/2350 
Option to generate multiple new passwords (closes #2350)
 2016-09-17 12:05:30 +02:00
Norman Jäckel
e0f8dd9e29 Merge pull request #2392 from emanuelschuetze/ui-sref 
Use ui-sref instead of ng-click (with $state.go).
 2016-09-17 12:02:15 +02:00
Emanuel Schuetze
8e3463b1df Use ui-sref instead of ng-click (with $state.go). 
For agenda item list and detail template.
 2016-09-17 11:44:33 +02:00
Norman Jäckel
1e87bdca4b Merge pull request #2391 from emanuelschuetze/issue2238 
Upgraded to tinymce 4.4.x and tinymce-ui 0.0.17 (Fixes #2238).
 2016-09-17 11:19:24 +02:00
Norman Jäckel
ca9c946b6f Merge pull request #2390 from emanuelschuetze/agend-item-check 
Template checks if user has no permission to see agenda items.
 2016-09-17 11:00:53 +02:00
Norman Jäckel
f8610dad96 Merge pull request #2389 from emanuelschuetze/motionCommentFixes2 
Motion comment permission fixes on server and client.
 2016-09-17 10:58:36 +02:00
Norman Jäckel
429fdb31fa Merge pull request #2383 from FinnStutzenstein/Issue2335 
Unprivileged users don't see ban icon (fixes #2335)
 2016-09-17 10:57:04 +02:00
Emanuel Schuetze
028dd71608 Upgraded to tinymce 4.4.x and tinymce-ui 0.0.17 (Fixes #2238). 2016-09-17 10:47:11 +02:00
Emanuel Schuetze
c55e55e91b Template checks if user has no permission to see agenda items. 2016-09-17 10:17:40 +02:00
Emanuel Schuetze
485c6ece87 Motion comment permission fixes on server and client. 
- Show motion comment fields in form also for users without can_manage but with
  can_see_and_manage_comments permission.
- Ignore comments data if user is not allowed to send comments (in create view).
 2016-09-16 23:35:37 +02:00
Norman Jäckel
c66396df80 Merge pull request #2373 from normanjaeckel/CleanupSettings 
Updated settings files. Fixed timezone support.
 2016-09-16 21:54:33 +02:00
Norman Jäckel
d7936c53e3 Updated settings files. Fixed timezone support. 2016-09-16 21:17:00 +02:00
FinnStutzenstein
bdeeb53f9b Confirm multiple deletions (fixes #2384) 2016-09-15 14:48:03 +02:00
FinnStutzenstein
3720fd1b0d Right test for false (fixes #2335) 2016-09-13 13:19:51 +02:00
FinnStutzenstein
42f723f3cb Option to generate multiple new passwords (closes #2350) 2016-09-13 12:52:50 +02:00
Tobias Hößl
2605239244 Move inline editing methods into a separate service 2016-09-08 19:22:09 +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
ddc1f5d0b9 Merge pull request #2367 from emanuelschuetze/motionCommentFixes 
Fixes and template improvements for motion comments.
 2016-09-08 13:24:08 +02:00
Norman Jäckel
b661a6e215 Merge pull request #2370 from normanjaeckel/Issue2315 
Migration for new permission matrix
 2016-09-08 13:20:49 +02:00
Norman Jäckel
25d3b6d552 Merge pull request #2368 from matakuka/motionComment 
Moved MotionComment factory to base.js.
 2016-09-08 12:00:10 +02:00
Norman Jäckel
cd3c470919 Changed migration coding style. 2016-09-08 11:40:58 +02:00
Maximilian Krambach
bcd15d2691 moved MotionComment factory to base.js 2016-09-08 11:25:03 +02:00
Emanuel Schuetze
9ed37c00af Fixes and template improvements for motion comments. 
Fixed erros while creating motion as anonymous user.
 2016-09-08 11:18:56 +02:00
Emanuel Schütze
a0acf75f08 Merge pull request #2366 from normanjaeckel/FixTemplateHooks 
Fixed bug in templateHook directive. Fixed #2362.
 2016-09-08 10:26:15 +02:00
Finn Stutzenstein
4ffe2b5a80 Migration for new permission matrix 2016-09-08 08:38:17 +02:00
Norman Jäckel
1cdcad7d47 Fixed bug in templateHook directive. Fixed #2362. 2016-09-08 00:58:02 +02:00
Norman Jäckel
f6ece5f6b3 Merge pull request #2365 from normanjaeckel/FixSettings 
Added password hasher settings. Fixed #2354.
 2016-09-08 00:25:01 +02:00
Norman Jäckel
f2c17f1787 Added password hasher settings. Fixed #2354. 2016-09-08 00:13:01 +02:00
Norman Jäckel
f2c3e535a5 Merge pull request #2344 from normanjaeckel/MotionRecommendation 
Added recommendations for motions.
 2016-09-07 23:58:14 +02:00
Norman Jäckel
4bed8f6c11 Added recommendations for motions. 
Also changed label of former state 'commited a bill' to 'refered to committee'. Fixed #2342.
 2016-09-07 23:46:38 +02:00
Norman Jäckel
41cb8b37cd Merge pull request #2283 from normanjaeckel/MotionComments 
Added generic fields for comments for motions.
 2016-09-07 22:11:59 +02:00
Norman Jäckel
ab845b4137 Added generic fields for comments for motions. 2016-09-07 20:43:00 +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
Norman Jäckel
b880217357 Merge pull request #2325 from tsiegleauq/issue2298 
create ballot papers with pdfmake (fixes #2298)
 2016-09-06 16:16:48 +02:00
sean
23b7d74890 create ballot papers with pdfmake (fixes #2298) 2016-09-06 16:08:25 +02:00