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

396 Commits

Author SHA1 Message Date
FinnStutzenstein
e8fa488d60 Project change recommendations 2017-01-07 14:48:11 +01:00
Maximilian Krambach
a31ffd1009 print correct number of ballots (closes #2504) 2017-01-06 11:39:55 +01:00
FinnStutzenstein
f5fa3575df New csv import using PapaParse 2017-01-06 10:50:03 +01:00
Emanuel Schütze
82396a784d Fixing some remarks for CKEditor PR#2770 2016-12-16 21:43:19 +01:00
Tobias Hößl
08cb6a3d1b Bugfix for line numbering with CKeditor 2016-12-16 21:43:19 +01:00
Maximilian Krambach
58b8066249 Going back from TinyMCE to CKEditor 
- Update CKEditor toolbar
- CKEditor: new formating options and stripping empty paragraphs from imports
- fix for other clipboard html cases not beginning with 'p' tag
- Added RemoveFormat button to ckditor toolbar.
- Reorder bower.json
- inline editor and working on line numbers and language setting
- line numbering in inline edit
- changed allowed content, line number display, editor toggling
- included "justify" in ckeditor
- reload original text after ckeditor is disabled
- Reorder and extend ckeditor toolbar.
- fixed save button trigger and inserted a revert button
- set language on editor load (works for inline case only)
 2016-12-16 21:43:19 +01:00
Norman Jäckel
cebfbf5b8d Merge pull request #2633 from normanjaeckel/SquishMigrations 
Prepare migrations for 2.1b1.
 2016-12-13 23:28:56 +01:00
Emanuel Schütze
78361308aa Updated EN+DE translations. 2016-12-13 12:20:14 +01:00
Norman Jäckel
3096958ba9 Prepare migrations for 2.1b1. 
Agenda, Assignments, Core, Mediafiles, Motions, Users.

Topics are already done.
 2016-12-13 11:58:36 +01:00
Norman Jäckel
c1d4927a9b Merge pull request #2764 from FinnStutzenstein/Issue2754 
More motion select mode options and layout changes for guests
 2016-12-13 11:57:51 +01:00
FinnStutzenstein
dbdaa9748c More motion select mode options and layout changes for guests 2016-12-13 11:27:44 +01:00
Emanuel Schütze
a9cc8fcb37 Some template style and translation fixes. 2016-12-12 20:30:50 +01:00
Norman Jäckel
99db9b71b7 Merge pull request #2760 from normanjaeckel/MotionTextIntro 
Added global config for motion preamble.
 2016-12-12 16:23:18 +01:00
Emanuel Schütze
32b7ddedce Template fixes for motion preamble (#2760). 2016-12-12 16:14:32 +01:00
Emanuel Schütze
2bf1b3d827 Merge pull request #2755 from normanjaeckel/StatePermission 
Fixed state flag required permission to see.
 2016-12-12 13:49:07 +01:00
Emanuel Schütze
8780c47fc1 Minor fixes (Fixes #2750) 
- Use <ul> instead of <ol> for candidate lists.
- Fix sorting by assignment_related_users.length in list view (Fixes #2750).
- Apply category and motion block for new amendments.
 2016-12-12 12:58:58 +01:00
Norman Jäckel
7772f60bd4 Added global config for motion preamble. 2016-12-12 12:51:27 +01:00
Norman Jäckel
6dc598800d Fixed state flag required permission to see. 2016-12-11 22:02:16 +01:00
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
Emanuel Schütze
0bef3d751e Merge pull request #2742 from emanuelschuetze/missing-translations 
Mark missing translation strings in table headers.
 2016-12-09 15:22:03 +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
f6d01c1d17 Mark missing translation strings in table headers. 2016-12-09 15:13:35 +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
Norman Jäckel
4e5adb74e3 Merge pull request #2739 from CatoTH/Issue2561-pdf-line-numbering-in-lists 
Attempt to mitigate the list / line number problem
 2016-12-07 11:34:50 +01:00
Norman Jäckel
b27a975075 Merge pull request #2737 from FinnStutzenstein/Issue2730 
Use session cookies and store filter settings in sessionStorage
 2016-12-07 11:25:06 +01:00
FinnStutzenstein
acb5a6dcf9 Use session cookies and store filter settings in sessionStorage 2016-12-07 08:01:33 +01:00
Tobias Hößl
2cb1429c8d First attempt to mitigate the list / line number problem 2016-12-06 22:12:29 +01:00
FinnStutzenstein
29ae600194 Dynamic webpage title 2016-12-05 18:00:52 +01:00
Emanuel Schütze
405fb1b9d1 Merge pull request #2733 from normanjaeckel/CategorySort 
Category sort
 2016-12-05 13:24:45 +01:00
Emanuel Schütze
3888632e14 Merge pull request #2735 from normanjaeckel/FixStatus 
Fixed typo.
 2016-12-05 13:09:25 +01:00
Norman Jäckel
e180b1df29 Fixed sorting of motions in a category. Changed identifiers of amendments during sorting. Fixed #2701. 2016-12-05 12:59:46 +01:00
Norman Jäckel
8b6844675e Merge pull request #2732 from CatoTH/bugfix-typo-in-variable-name 
Typo in variable name
 2016-12-05 12:58:56 +01:00
Norman Jäckel
d8c7eda587 Fixed typo. 2016-12-05 12:40:28 +01:00
Norman Jäckel
d0ed0cea23 Improved speed of motion numbering. 2016-12-03 20:57:00 +01:00
Tobias Hößl
940fb14ad6 Typo in variable name 2016-12-03 14:50:39 +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
Emanuel Schütze
a1e33b99d4 Merge pull request #2718 from normanjaeckel/ApplyMotionText 
Changed config to apply motion text for new amendmend. Closed #2714.
 2016-12-02 08:51:46 +01:00
Norman Jäckel
81a01156c1 Changed config to apply motion text for new amendmend. Closed #2714. 2016-12-02 00:12:37 +01:00
Emanuel Schütze
52b9c651bb Fixed motion pdf layout 
for voting result and summary change recommendations
 2016-12-01 22:56:42 +01:00
Norman Jäckel
cdc37b4dd5 Merge pull request #2703 from normanjaeckel/LeadingZero 
Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696.
 2016-12-01 14:46:15 +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
ad651300d9 Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696. 2016-12-01 14:41:12 +01:00