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

159 Commits

Author SHA1 Message Date
Emanuel Schütze
43cdfd3836 Merge pull request #2752 from FinnStutzenstein/MotionState 
Adding 'done' option in motion state filter
 2016-12-09 22:36:32 +01:00
Emanuel Schütze
8289306569 Merge pull request #2746 from emanuelschuetze/fonts 
Use Roboto font in all templates.
 2016-12-09 22:26:38 +01:00
FinnStutzenstein
efaa00483c Adding 'done' option in motion state filter 2016-12-09 15:18:35 +01:00
Norman Jäckel
c2edf134e2 Merge pull request #2751 from FinnStutzenstein/Issue2747 
Some stylistic changes and new motion filter option
 2016-12-09 15:16:50 +01:00
Emanuel Schütze
fb7b265826 Use Roboto font in all templates. 
- Only install needed font files for Roboto and Roboto Condensed
  which strongly reduced the directory size of 'static/font'.
- Make it easier to adjust custom font by using global css font definition
  in app.css and projector.css.
- Remove Open Sans font.
 2016-12-09 15:10:31 +01:00
FinnStutzenstein
acba95f8a4 changing user import (closes #2666) 2016-12-09 15:02:32 +01:00
FinnStutzenstein
f7fcb69cc2 Some stylistic changes and new motion filter option 2016-12-09 14:58:15 +01:00
FinnStutzenstein
eca93594d7 Moving csv exports in seperate files (closes #2728) 2016-12-09 08:08:38 +01:00
Emanuel Schütze
9009c9e2e9 Updated translations for EN/DE. Fix translation string. 2016-12-02 16:30:03 +01:00
Emanuel Schütze
486f0601eb Merge pull request #2721 from FinnStutzenstein/AgendaTable 
Agenda table
 2016-12-02 15:59:57 +01:00
FinnStutzenstein
ee5adb8fd2 New AgendaTable 2016-12-02 15:18:32 +01:00
Norman Jäckel
49dca65640 Added button to motion detail view to follow recommendation. Closed #2700. 2016-12-02 14:57:45 +01:00
Norman Jäckel
59599bfba0 Merge pull request #2712 from emanuelschuetze/fixes 
Minor fixes (Fixes #2710)
 2016-12-01 14:42:56 +01:00
Norman Jäckel
639978a5dc Refactor motion ans assignment percent and majority calculation. 2016-12-01 14:35:35 +01:00
Emanuel Schütze
670251fba9 Minor fixes (Fixes #2710) 
- motion form: show supporters field
- motion block slide: show motion identifiers in columns
- item list: show open link for motion blocks
- use right pdfmake-dist name in bower.json
 2016-12-01 14:29:31 +01:00
Emanuel Schütze
9440842e6a Merge pull request #2708 from emanuelschuetze/issue2626 
Improved wording for recommendation config (Fixes #2626)
 2016-12-01 11:29:29 +01:00
Emanuel Schütze
80f4cf8f2d Improved wording for recommendation config (Fixes #2626) 
- updated config label and helptext
- added recommendation also to motion slide
 2016-12-01 11:05:11 +01:00
Norman Jäckel
6aa3ea0d63 Merge pull request #2627 from CatoTH/change-recommendations-inline-diff 
Showing Diff inline
 2016-12-01 10:24:18 +01:00
Emanuel Schütze
17c464bafa Merge pull request #2688 from FinnStutzenstein/AssignmentsTable 
New assignment and mediafile tables and table generics
 2016-11-30 14:29:13 +01:00
FinnStutzenstein
4f717b6610 New assignment and mediafile tables and table generics 2016-11-29 16:29:29 +01:00
Emanuel Schütze
5312d44235 Merge pull request #2651 from CatoTH/editing-change-recommendations 
Editing change recommendations
 2016-11-28 21:31:22 +01:00
Tobias Hößl
2958a401ad Showing Diff inline 2016-11-26 16:50:32 +01:00
Tobias Hößl
f380f63851 A proposition so mitigate #2615 2016-11-26 12:34:26 +01:00
Emanuel Schütze
fb646df1fd Merge pull request #2680 from FinnStutzenstein/MultiprojectorThings 
Some improvements for Multiprojector
 2016-11-25 15:45:40 +01:00
Tobias Hößl
fd82ae348e Editing change recommendations 2016-11-23 23:42:24 +01:00
FinnStutzenstein
88537cf67e Some improvements for Multiprojector 2016-11-21 15:01:54 +01:00
Tobias Hößl
c888419527 Make line highlighting and 'Goto'-Feature available on all modes 2016-11-20 21:55:03 +01:00
Norman Jäckel
9375727f1f Merge pull request #2631 from CatoTH/change-change-recommendation-views 
Overhaul change recommendation statuses
 2016-11-18 10:49:38 +01:00
FinnStutzenstein
e0f78b16a0 New table design for users 2016-11-18 09:42:29 +01:00
Tobias Hößl
32d3d804b1 Overhaul change recommendation statuses 2016-11-16 22:42:22 +01:00
Emanuel Schütze
f8958e36a6 Fixed missing translations (Fixed #2616, fixed #2625) 2016-11-15 21:18:06 +01:00
Emanuel Schütze
4e1fdc6b22 Updated PDF layout 
- use default font for pdf from vfs_font.js
  remove base64 encoding function on server side
- use recommendation config value in motion detail template
 2016-11-14 18:52:50 +01:00
Emanuel Schütze
e49411250a Merge pull request #2558 from FinnStutzenstein/Issue2462 
change all isProjected functions (closes #2462)
 2016-11-11 15:57:56 +01:00
Norman Jäckel
67aa92a7ac Merge pull request #2619 from FinnStutzenstein/Issue2573 
No overrun of identifier col in motion table (closes #2573)
 2016-11-11 13:21:25 +01:00
FinnStutzenstein
133d0c3a0f fixing motion block list layout 2016-11-11 10:59:38 +01:00
FinnStutzenstein
fbeacd97f8 No overrun of identifier col in motion table (closes #2573) 2016-11-11 09:40:30 +01:00
Emanuel Schütze
92a9a36188 Template fixes. 
- Improved motion majority calculation form.
- Show special values without percentage.
- Fix JS errors.
 2016-11-08 12:14:24 +01:00
Emanuel Schütze
7ce479a511 Merge pull request #2535 from emanuelschuetze/state-recommendation-extra-fields 
Added new motion state flags to show an additional fields
 2016-11-02 00:19:32 +01:00
Emanuel Schütze
78765ae9ed Added new motion state flags to show an additional fields 
... to extend state name and recommendation label.
Hide forState and forRecommendation fields in motion form and detail
view (comment section).
 2016-11-01 23:37:39 +01:00
Emanuel Schütze
4b124a629b Fixed translation issues. 2016-11-01 23:32:39 +01:00
Emanuel Schütze
41a4e35592 Use tinymce editor for motion comment fields. 2016-11-01 17:37:32 +01:00
FinnStutzenstein
58dd2f2b30 change all isProjected functions (closes #2462) 2016-11-01 10:31:28 +01:00
Norman Jäckel
f5b37c1b84 Merge pull request #2530 from emanuelschuetze/pagination 
Fix pagination and indentation of lists in import views.
 2016-10-26 14:55:44 +02:00
Emanuel Schütze
435e333bbb Fix pagination and indentation of lists in import views. 2016-10-25 13:45:54 +02:00
FinnStutzenstein
fc21713bb4 Adding sortingoptions for creationdate and last modified (closes #2448) 2016-10-25 10:03:01 +02:00
Emanuel Schütze
8172984a4d Updated translation resource. Updated German translations. 
Fixed translation strings.
 2016-10-17 23:30:18 +02:00
Emanuel Schütze
29638cc702 Recreated migrations file for motionBlock. 
Minor template fixes for motionBlock.
 2016-10-17 21:18:31 +02:00
Norman Jäckel
20f8875dcd Added view to follow recommendations. 
for all motions of a motion block
 2016-10-17 21:02:50 +02:00
Emanuel Schuetze
0270c31b32 Template improvements for motion blocks. 
Fixed $stateProvider to allow camelCase in state name (Fixed #2479)
- Refactor generic templateUrl function.
- Rename MotionBlock templates.
- Rename MotionBlock controller.
 2016-10-17 20:58:10 +02:00
Norman Jäckel
700c86a24c New feature blocks for motions. 
- Added ListView, DetailView, UpdateForm and connection to
  agenda item for MotionBlock.
- Added slide and projection default.
- Added custom manager for motion blocks.
- Enabled current list of speakers slide and overlay for motion block.
 2016-10-17 20:54:26 +02:00