Emanuel Schütze
e5028f7ef2
Merge pull request #3127 from emanuelschuetze/issue3112
...
Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112 , #3038 )
2017-03-22 15:54:38 +01:00
Emanuel Schütze
2571d83195
Use a whitelist for getFormOrStateForCurrentSlide ( fixes #3112 , fixed #3038 ).
...
- Provided csv header fields as meta data while csv import (#3038 ).
- Consolidate (already translated) strings for motion poll.
- Fixed typos for MotionPoll model.
2017-03-22 15:37:08 +01:00
sean
bb5394eb36
fix pdf style parsing issue ( fixes #2811 )
2017-03-22 14:57:08 +01:00
Emanuel Schütze
70de0a6e4b
Hide change recommendation diff-box in diff version for normal users.
2017-03-21 20:47:58 +01:00
Norman Jäckel
a412ff9eb3
Merge pull request #3094 from FinnStutzenstein/Issue3092
...
Fixes #3092 , fixes #2453 and fixed motion projection bug
2017-03-21 17:20:49 +01:00
Norman Jäckel
bd8c7f61a0
Merge pull request #3085 from tsiegleauq/issue3025-duplicated-header
...
fix double PDF Head in Motions (fixes #3025 )
2017-03-21 17:19:36 +01:00
Emanuel Schütze
0036029709
Fixed double paragraphs in motion pdf which contains links ( Fixed #3095 ).
2017-03-21 16:08:39 +01:00
FinnStutzenstein
4f84a9f752
Fixes #3092 , fixes #2453 and fixed motion projection bug
2017-03-21 14:29:06 +01:00
Emanuel Schütze
b8742bcb8f
Merge pull request #3061 from FinnStutzenstein/Issue3036
...
Let users with comments management perms edit them (fixes #3036 )
2017-03-21 10:49:13 +01:00
FinnStutzenstein
a638b05538
Let users with comments management perms edit them ( fixes #3036 ), fixes #3090
2017-03-21 09:59:49 +01:00
FinnStutzenstein
542cb67d59
Fixing the sidebar, fixes #3068
2017-03-17 12:24:40 +01:00
Sean Engelhardt
259e338b17
fix double PDF Head in Motions ( fixes #3025 )
2017-03-16 23:17:25 +01:00
Emanuel Schütze
b53843c17e
Several template fixes
...
- Motions catalog pdf: Show categories of filtered motions only.
- Fixed permission for "reject all change recommendations" button
- Use color for yes/no/abstain for progress bars in assignment detail.
2017-03-10 22:46:01 +01:00
Norman Jäckel
82e20ee5a7
Merge pull request #3073 from emanuelschuetze/fixes
...
Minor template fixes
2017-03-08 23:00:26 +01:00
Emanuel Schütze
3717f63d12
Minor template fixes
...
- More column width in all-motions pdf.
Order categories by prefix.
- Fixed using translations in error messages.
Removed unused pdf-status template.
2017-03-08 22:46:45 +01:00
Sean Engelhardt
6dc52c6fe2
Add strike command to HTML PDF parser ( Fixes #3069 )
2017-03-08 15:47:40 +01:00
Norman Jäckel
14ec6c0f44
Improved autoupdate on permission change.
2017-03-06 17:42:27 +01:00
FinnStutzenstein
bcc85f9cad
Autoupdate on user permission change.
2017-03-06 15:08:23 +01:00
Norman Jäckel
688b247bcc
Added flag to use Geiss. Small changes for the new getgeiss command. Changed path of collected statics.
2017-03-06 14:39:55 +01:00
Oskar Hahn
e3cc592f70
Added the command getgeiss. Work on start script to use Geiss.
2017-03-06 14:39:26 +01:00
Norman Jäckel
8b710b0b13
Merge pull request #3056 from emanuelschuetze/cleanup
...
Removed unused ubuntu fonts (from old pdf generation).
2017-03-05 23:54:09 +01:00
Norman Jäckel
0c5746b349
Merge pull request #3055 from emanuelschuetze/fix
...
Fixed iframeoverlay and missing ErrorMessage.
2017-03-05 22:43:10 +01:00
Emanuel Schütze
1d6326fb1b
Removed unused ubuntu fonts (from old pdf generation).
2017-03-05 22:40:38 +01:00
Emanuel Schütze
d92328674a
Fixed iframeoverlay and missing ErrorMessage.
2017-03-05 22:27:14 +01:00
Emanuel Schütze
2d65ecbc3a
Updated all translations.
...
Added Russia as new language.
2017-03-05 22:25:48 +01:00
Norman Jäckel
4c2b13a142
Merge pull request #3052 from emanuelschuetze/mobile-theme
...
Responsive design improvements
2017-03-05 20:34:50 +01:00
Norman Jäckel
6525b79774
Merge pull request #3047 from emanuelschuetze/projector-control
...
Inscreased projector scroll distance.
2017-03-05 20:23:56 +01:00
Emanuel Schütze
f67afd1823
Responsive design improvements
...
- Reduce search bar on small devices.
- Use separate projector sidebar for small devices.
- motion detail toolbar: show line number mode and change recommendation
controls as dropdown (for small/extra small devices) or as
button group (for medium/large devices).
2017-03-05 00:30:00 +01:00
Emanuel Schütze
65d93d1b66
Inscreased projector scroll distance.
...
Allows faster scrolling for long slides.
2017-03-04 16:52:27 +01:00
Emanuel Schütze
a9144b6d5b
Improved go to line number tooltip/popup. ( #3028 )
2017-03-04 16:00:54 +01:00
Emanuel Schütze
91cb124918
Merge pull request #3018 from FinnStutzenstein/ErrorMessages
...
Error messages and global messaging service (closes #2949 )
2017-03-03 14:52:00 +01:00
FinnStutzenstein
9c89f4d59c
Error messages and global messaging service ( fixes #2949 , fixes #1774 )
2017-03-03 14:36:31 +01:00
Norman Jäckel
4744e1ca99
Merge pull request #3034 from FinnStutzenstein/TemplateFixes
...
Small template improvements
2017-03-03 14:23:05 +01:00
FinnStutzenstein
606c17ef43
Small template improvements
2017-03-03 11:53:33 +01:00
Norman Jäckel
5a821ecf49
Fixed use of PATCH and PUT. Fixed #1871 .
2017-02-27 17:20:57 +01:00
FinnStutzenstein
803f9dba96
Remove scrolling to a line on projector ( closes #2636 )
2017-02-24 10:31:48 +01:00
Emanuel Schütze
7f08a09497
Merge pull request #2992 from FinnStutzenstein/CleanUp
...
Collection name to CamelCase (fixes #2983 )
2017-02-22 19:44:49 +01:00
FinnStutzenstein
5374b2f398
Collection name to CamelCase ( fixes #2983 )
2017-02-22 19:12:38 +01:00
FinnStutzenstein
da89bf5a83
Usability improvements
2017-02-22 16:58:52 +01:00
Emanuel Schütze
acf996a720
CSS improvements for projector sidebar on small devices.
2017-02-20 19:46:44 +01:00
Emanuel Schütze
58f499283f
Fixed translation strings.
2017-02-17 23:21:50 +01:00
Emanuel Schütze
6bad8e8cc6
Merge pull request #2973 from FinnStutzenstein/Dialogs
...
Dialogs for some views
2017-02-17 22:20:59 +01:00
Norman Jäckel
935a2a7245
Merge pull request #2980 from emanuelschuetze/pdf-worker-fix
...
Fixed placeholder replacement in pdf worker.
2017-02-17 16:29:09 +01:00
Emanuel Schütze
a804362e16
Fixed placeholder replacement in pdf worker.
...
Make it more dynamic by searching recursively.
2017-02-17 15:11:28 +01:00
FinnStutzenstein
735dbcf109
Better dialog handling. Many fixes.
2017-02-17 14:58:35 +01:00
Emanuel Schütze
9a1e45682c
Merge pull request #2976 from FinnStutzenstein/templateFixes
...
Update mediafile form
2017-02-17 13:58:49 +01:00
Emanuel Schütze
0075c23225
Merge pull request #2977 from emanuelschuetze/issue2967
...
Fixed margin-top of motion change recommendation line tooltip.
2017-02-17 13:21:54 +01:00
Emanuel Schütze
09ae3c3425
Fixed margin-top of motion change recommendation tooltip ( Fixed #2967 ).
2017-02-17 13:17:24 +01:00
Norman Jäckel
28a5c9ecaf
Merge pull request #2974 from emanuelschuetze/pdf-layout
...
Motion PDF improvements
2017-02-17 13:11:15 +01:00
FinnStutzenstein
a765f5cb0e
Update mediafile form
2017-02-17 12:43:50 +01:00
Emanuel Schütze
46f6bbb907
Motion PDF improvements
...
* Use consistent lineheight (1.25) in PDF (also for lists).
* set default value of motions_line_length config to 90.
* Reduce footer height.
* Use identifier in filename only if available.
Added missing translation string.
2017-02-17 10:48:27 +01:00
Norman Jäckel
0319799aff
Merge pull request #2891 from normanjaeckel/CamelCase
...
Added support for CamelCase to RESTModelMixin. See #2480 .
2017-02-16 21:09:13 +01:00
Norman Jäckel
89192236fc
Added support for CamelCase to RESTModelMixin. See #2480 .
2017-02-16 13:31:57 +01:00
Emanuel Schütze
7a73b30189
More layout fixes for motion diff view slide.
...
- Fixed wrong text order.
- Improved change summary box.
2017-02-15 22:40:18 +01:00
Tobias Hößl
8029492d91
Bugfix: layout of diff view on the projector
2017-02-15 21:36:30 +01:00
Emanuel Schütze
41b30d70b6
Fixed outdated assignment phases variable in projetor.js.
...
Removed wrong translation string.
2017-02-10 23:26:38 +01:00
Emanuel Schütze
1230f4a29a
New full text search on client-side ( Fixed #2865 ).
...
Removed server-side search by whoosh.
2017-02-10 22:52:08 +01:00
Emanuel Schütze
311b134d81
Merge pull request #2939 from FinnStutzenstein/Encoding
...
Added UTF-8 byte order mark for csv export
2017-02-10 21:23:09 +01:00
FinnStutzenstein
30a3382bd1
Added UTF-8 byte order mark for csv export and global csv separator config
2017-02-10 20:47:57 +01:00
FinnStutzenstein
8f613177cb
check if startup promise is resolved
2017-02-10 10:23:46 +01:00
Norman Jäckel
160333beea
Merge pull request #2931 from FinnStutzenstein/Issue2669
...
Reorganize the current list of speakers. Fixes #2669 and find()-calls
2017-02-09 20:06:43 +01:00
FinnStutzenstein
3c36cd5757
Reorganize the current list of speakers. Fixes #2669 and find()-calls.
2017-02-07 12:24:54 +01:00
Emanuel Schütze
12b50a0d68
Merge pull request #2935 from emanuelschuetze/motion-pdf-subtitle
...
PDF Layout improvements
2017-02-06 14:44:06 +01:00
Emanuel Schütze
80b9ce138f
PDF Layout improvements
...
- Added parent motion into subtitle of motion pdf.
(for amendments only).
- Adapted page margin and footer.
- Use same line height also for outside line numbering.
- Add more margin-top for motion reason heading.
2017-02-06 14:22:13 +01:00
Emanuel Schütze
341916123c
Fix word-wrap for long motion identifier in Firefox.
2017-02-03 14:02:36 +01:00
Emanuel Schütze
3ca254c88e
Show/hide internal items in agenda sort view.
2017-02-03 12:50:57 +01:00
Emanuel Schütze
e7ee8fbc07
Fixed some minor template styles.
...
Use always css class 'btn-sm' for buttons and 'input-sm' for inputs in
list and detail templates for consistent appearance.
2017-02-03 12:50:57 +01:00
Emanuel Schütze
3d60238ce1
Fixed dynamic pdf header/footer and table border ( Fixed #2923 ).
...
Updated pdfmake to 0.1.25.
Fixed some pdf style issues.
Updated gulp watch task.
2017-02-03 11:33:46 +01:00
Norman Jäckel
b6db7d481b
Merge pull request #2895 from FinnStutzenstein/Issue2885
...
Possibility to send extra startup data (closes #2885 )
2017-02-01 11:45:21 +01:00
FinnStutzenstein
aed18205c4
showing config save status ( closes #2842 )
2017-01-31 18:54:02 +01:00
FinnStutzenstein
49e32d8e57
Possibility to send extra startup data ( closes #2885 )
2017-01-31 13:17:42 +01:00
Emanuel Schütze
c8cd1a7210
Merge pull request #2917 from FinnStutzenstein/Worker
...
Use workers for pdf generation
2017-01-31 12:02:43 +01:00
FinnStutzenstein
e1b4c1fc68
Used worker for pdf generation.
...
Moved pdfmake.createPdf() into a web worker thread to prevent
blocking UI and max_script_runtime error in browser.
Used gulp to manage separate worker files (pdf-worker and pdf-worker-lib).
2017-01-30 23:03:29 +01:00
FinnStutzenstein
d55d374211
Prevent XSS-attacks ( fixes #2871 )
2017-01-30 21:04:41 +01:00
Oskar Hahn
2daafa8db9
Created a function to convert anything possible to a user-collectoin-element or None
...
Changed user.has_perm(...) to has_perm(user, ...) at any place.
Removed old code
2017-01-26 18:57:10 +01:00
FinnStutzenstein
35903cbe97
Watch perms in client ( closes #1855 )
2017-01-25 20:19:25 +01:00
Oskar Hahn
fccde8de11
Changed the function has_perm to support an user id or None as the first argument.
...
Also fixt the case, where an anonymous user connects to the websocket connection.
Also added a function anonymous_is_enabled() to see, if the anyonmous user is enabled.
Added pip freeze to travis to see installed versions.
2017-01-24 15:16:29 +01:00
FinnStutzenstein
9247009f1c
Csv export for IE ( closes #2898 )
2017-01-23 16:24:25 +01:00
FinnStutzenstein
2b8a1168e0
Removing unnecessary resolvers ( closes #2869 , closes #2892 )
2017-01-20 11:52:27 +01:00
Emanuel Schütze
b2dfc9b44e
Fixed translation strings.
2017-01-19 10:42:26 +01:00
FinnStutzenstein
bd0073d2f7
StartUp improvements
2017-01-16 14:32:10 +01:00
Norman Jäckel
0546639934
Merge pull request #2866 from FinnStutzenstein/Issue2843
...
smoothly scroll projector
2017-01-15 13:34:51 +01:00
Emanuel Schütze
4a7ffe9da9
Moved CKEDITOR_BASEPATH into openslides-libs.js ( Fixed #2787 )
2017-01-15 13:04:31 +01:00
Emanuel Schütze
befff17969
Merge pull request #2873 from normanjaeckel/MotionCommentProtection
...
Fixed bug in relation for motion comment. Fixed #2568 .
2017-01-15 12:27:17 +01:00
Emanuel Schütze
0eb4f67a48
Use always '/' at the end of projector url.
...
e.g. '/projector/1/' or '/real-projetor/1/'
2017-01-15 12:13:46 +01:00
FinnStutzenstein
a3b7b92239
smoothly scroll projector
2017-01-15 10:56:26 +01:00
Norman Jäckel
f086d055b6
Fixed bug in relation for motion comment. Fixed #2568 .
2017-01-15 10:20:45 +01:00
Emanuel Schütze
624fcc663b
Merge pull request #2863 from FinnStutzenstein/StartUp
...
Start up
2017-01-14 21:46:16 +01:00
FinnStutzenstein
a6d1eeb9c3
Worked on startup process.
...
- fix group view on reload
2017-01-14 21:23:05 +01:00
Norman Jäckel
481a36501f
Refactored WhoAmI view and startup process.
2017-01-14 21:22:40 +01:00
Norman Jäckel
8bb0918372
Merge pull request #2825 from FinnStutzenstein/CsvImports
...
New csv import for users and topics
2017-01-14 20:52:09 +01:00
Oskar Hahn
ebf686ef34
Send all data to the client at startup
2017-01-14 20:42:38 +01:00
FinnStutzenstein
397d659f0b
New csv import for users and topics
2017-01-14 18:29:05 +01:00
FinnStutzenstein
794db79511
adding permission checks
2017-01-14 12:13:38 +01:00
Oskar Hahn
728576d514
Performance improvements
...
* Add caching support to users/group
* Add a function has_perm that works with the cache.
* Removed our session backend so other session backends (without the database) can be used
2017-01-13 13:37:18 +01:00
Emanuel Schütze
962c06c85f
Merge pull request #2820 from FinnStutzenstein/Issue2667
...
Change user import table
2017-01-10 21:22:39 +01:00
Emanuel Schütze
17b951058b
Merge pull request #2821 from emanuelschuetze/no-amendments
...
Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.
2017-01-09 14:33:57 +01:00
Emanuel Schütze
41124a53ca
Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.
...
Set settings value to False to disable new amendment button in motion detail
template. Default: True.
2017-01-09 14:25:28 +01:00
FinnStutzenstein
a9fbbb522e
Change user import table
2017-01-09 14:22:32 +01:00
Norman Jäckel
58d8f68cc5
Merge pull request #2814 from FinnStutzenstein/ConfigEditor
...
Use ckeditor in config
2017-01-09 14:19:32 +01:00
FinnStutzenstein
e8fa488d60
Project change recommendations
2017-01-07 14:48:11 +01:00
FinnStutzenstein
4530a5faed
Use ckeditor in config
2017-01-07 14:45:58 +01:00
Emanuel Schütze
11c0b0cc3f
Merge pull request #2816 from FinnStutzenstein/Issue2127
...
Use ckeditor to edit projector messages
2017-01-06 21:28:48 +01:00
FinnStutzenstein
c3fc7d0f1b
Do not project more than one message
2017-01-06 19:48:37 +01:00
FinnStutzenstein
6e7321d2a3
disable edit button if it is not possible to edit
2017-01-06 14:51:27 +01:00
FinnStutzenstein
f37ad0f6c3
Use ckeditor to edit projector messages
2017-01-06 12:45:30 +01:00
Maximilian Krambach
a31ffd1009
print correct number of ballots ( closes #2504 )
2017-01-06 11:39:55 +01:00
Emanuel Schütze
cc0c0bf0d4
Merge pull request #2783 from FinnStutzenstein/PapaParse
...
New csv import using PapaParse
2017-01-06 11:33:06 +01:00
FinnStutzenstein
f5fa3575df
New csv import using PapaParse
2017-01-06 10:50:03 +01:00
Emanuel Schütze
388e6353cc
Show qr codes in access data pdf only if config fields are set.
...
Disable footer with page numbers.
2017-01-04 22:43:17 +01:00
Norman Jäckel
286643ddd2
Merge pull request #2797 from FinnStutzenstein/Issue2653
...
projector language (closes #2653 )
2016-12-21 11:55:49 +01:00
FinnStutzenstein
f9f64b3e31
projector language ( closes #2653 )
2016-12-21 10:41:06 +01:00
FinnStutzenstein
6454853bf6
Consistent time handling and generic time converter code
2016-12-21 10:09:27 +01:00
Emanuel Schütze
ff444eaa5d
Merge pull request #2795 from CatoTH/Issue2777-pdf-problems
...
Bugfix for PDF-export - fixes #2777
2016-12-19 19:46:44 +01:00
Tobias Hößl
159720b983
Bugfix for PDF-export - fixes #2777
2016-12-19 16:17:36 +01:00
FinnStutzenstein
a24b4aed99
cookie handling on login
2016-12-19 14:14:46 +01:00
Emanuel Schütze
01ab52a637
Use Roboto Medium font for some more 'bold' classes.
2016-12-16 22:10:56 +01:00
Emanuel Schütze
82396a784d
Fixing some remarks for CKEditor PR#2770
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
4ebb8023e3
Merge pull request #2776 from CatoTH/Issue2770-pdfmake-bugfix
...
Bugfix for #2770
2016-12-16 20:32:54 +01:00
Emanuel Schütze
cd89f72a17
Merge pull request #2778 from emanuelschuetze/inject-improvement
...
Speed up autoupdates
2016-12-16 19:12:45 +01:00
Emanuel Schütze
4b9be816b3
Speed up autoupdates
...
Use 'bulk mode' for DS.inject by calling inject
only once per each collection.
2016-12-16 18:55:24 +01:00
Norman Jäckel
75f4c55181
Removed viewpoint for Django url patterns. Fixed #1453 .
2016-12-16 17:01:34 +01:00
Tobias Hößl
46cf26481e
Bugfix for #2770
2016-12-14 22:28:44 +01:00
Maximilian Krambach
0e6324b252
Change the language selector to the languages' own names
2016-12-14 15:25:38 +01:00
Emanuel Schütze
218b4bc7f4
Remove old countdowns and messages in core migrations.
2016-12-13 17:04:25 +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
Norman Jäckel
6a58174e25
Merge pull request #2765 from FinnStutzenstein/Issue2451
...
rename mediafiles private flag to hidden
2016-12-13 11:15:53 +01:00
Emanuel Schütze
a9cc8fcb37
Some template style and translation fixes.
2016-12-12 20:30:50 +01:00
FinnStutzenstein
6bbbf30d94
rename mediafiles private flag to hidden
2016-12-12 16:23:31 +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
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
Emanuel Schütze
116c3702f2
Updated German translations.
...
Added missing translation filter.
2016-12-11 13:37:26 +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
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
f7fcb69cc2
Some stylistic changes and new motion filter option
2016-12-09 14:58:15 +01:00
FinnStutzenstein
36c8477c7f
no nav underline glitch
2016-12-09 13:51:23 +01:00
sean
b1f4def743
add precise text decoration ( fixes #2576 )
2016-12-07 21:41:55 +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
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
926d04f610
Merge pull request #2723 from FinnStutzenstein/Clock
...
Fixing the clock
2016-12-02 14:46:43 +01:00
Norman Jäckel
dc0559ef38
Merge pull request #2722 from FinnStutzenstein/Issue2126
...
Show countdown above messageoverlay (closes #2126 )
2016-12-02 14:26:15 +01:00
Norman Jäckel
1ca0b7f291
Merge pull request #2719 from FinnStutzenstein/Issue2693
...
Translate legal notice
2016-12-02 14:25:51 +01:00
FinnStutzenstein
7e18061e53
Fixing the clock
2016-12-02 14:17:37 +01:00
FinnStutzenstein
cc8cf1ef7a
Show countdown above messageoverlay ( closes #2126 )
2016-12-02 12:31:10 +01:00
FinnStutzenstein
0f89205038
Translate legal notice
2016-12-02 08:10:06 +01:00
Norman Jäckel
526a5478f7
Added settings for client to basic JavaScript code on client startup. Closed #2697 .
2016-12-01 15:21:11 +01:00
Emanuel Schütze
9dd44edb9e
Merge pull request #2698 from FinnStutzenstein/Issue2531
...
Translate default projector (closes #2531 )
2016-12-01 11:02:02 +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
FinnStutzenstein
b0c94888ce
Translate default projector ( closes #2531 )
2016-12-01 07:48:26 +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
Emanuel Schütze
a30085f756
Merge pull request #2632 from CatoTH/explicitly-enter-change-recommendation-type
...
Allow to explicitly set the type of a change recommendation
2016-11-28 20:57:21 +01:00
Emanuel Schütze
ddfafd327b
Merge pull request #2655 from CatoTH/Issue2615-line-selection-improvements
...
A small tooltip after selecting the first line when creating a change recommendation
2016-11-28 20:45:07 +01:00
Emanuel Schütze
e865cfe105
Improved forms in ng-dialogs.
...
- users: use form field in grid layout and add more option
to reduce scrolling of long dialog.
- agenda/motions/assignment: show parent agenda item field for create
dialog only (to prevent corrupt agenda by action 'set my child item as my new
parent item')
- refactor ng dialog and formly code.
2016-11-27 22:57:56 +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
Norman Jäckel
36dc957f19
Changed tooltips.
2016-11-24 00:07:50 +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
Emanuel Schütze
829acce22d
Merge pull request #2648 from normanjaeckel/FixBroadcastOnDelete
...
Fixed projector broadcast if projector is deleted. Fixed #2646 .
2016-11-20 22:43:47 +01:00
Norman Jäckel
28059698c7
Fixed projector broadcast if projector is deleted. Fixed #2646 .
2016-11-19 13:04:24 +01:00
FinnStutzenstein
0cc8a81320
countdown and message models ( closes #2464 )
2016-11-19 12:37:33 +01:00
Tobias Hößl
771f087ade
Allow to explicitly set the type of a change recommendation
2016-11-19 11:57:54 +01:00
FinnStutzenstein
e0f78b16a0
New table design for users
2016-11-18 09:42:29 +01:00
Emanuel Schütze
f9f9934722
Fixed missplaced comma in pdf header ( Fixed #2639 )
2016-11-16 21:05:04 +01:00
Emanuel Schütze
f8958e36a6
Fixed missing translations ( Fixed #2616 , fixed #2625 )
2016-11-15 21:18:06 +01:00
Emanuel Schütze
b9a325ba5d
Merge pull request #2620 from FinnStutzenstein/Issue2590
...
Highlighting motions for multiprojector and move httpProvider (fixes …
2016-11-15 20:21:19 +01:00
FinnStutzenstein
4b8fc5fa19
Highlighting motions for multiprojector and move httpProvider ( fixes #2590 )
2016-11-15 13:09:56 +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
18accc58ae
Merge pull request #2610 from tsiegleauq/electionListPdfMake
...
ElectionList over PdfMake
2016-11-14 18:05:03 +01:00
Emanuel Schütze
ff359ea629
Improved assignments and motions pdf.
...
Load all users in pdfmake function - not in state resolver of
assignment list.
2016-11-14 17:55: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
FinnStutzenstein
af9755cb9a
changed all project functions
2016-11-11 09:37:37 +01:00
Emanuel Schütze
3b41f99a6f
Load angular-gettext language files from plugin ( Fixed #2339 )
...
Add new OpenSlidesPlugins provider where plugins can be registered.
2016-11-10 12:51:16 +01:00
Sean Engelhardt
7069326655
ElectionList over PdfMake
2016-11-09 20:23:01 +01:00
Norman Jäckel
4d80914b8a
Fixed zoom and scroll, fixed #2547 .
2016-11-08 21:29:26 +01:00
FinnStutzenstein
43d9733881
fixing current list of speakers
2016-11-08 13:00:50 +01:00
Emanuel Schütze
b297bab5b5
Fix merge conflict in core/base.js
2016-11-02 22:05:07 +01:00
Emanuel Schütze
ef36962221
Merge pull request #2580 from tsiegleauq/accessDataListPdfMake
...
Creates the access data list with PdfMake
2016-11-02 14:53:50 +01:00
Sean Engelhardt
34f74da58d
Creates the access data list with PdfMake
2016-11-02 14:19:57 +01:00
Emanuel Schütze
e315cbad89
Fix regression with projector loading.
...
Projector requires Editor provider in core/base.js instead of site.js
because MotionComments (in motions/base.js) uses now Editor factory.
2016-11-02 14:10:59 +01:00
Emanuel Schütze
caf52094a4
Allow to resize tinymce editor ( Fixes #2115 )
2016-11-02 10:35:18 +01:00
Norman Jäckel
50868d1432
Merge pull request #2567 from emanuelschuetze/fix-translation-strings
...
Fixed translation issues.
2016-11-01 23:58:43 +01:00
Emanuel Schütze
b08ca4be02
Merge pull request #2534 from tsiegleauq/electionsListPdfMake
...
Creates the Election documents using PdfMake
2016-11-01 23:40:42 +01:00
Emanuel Schütze
4b124a629b
Fixed translation issues.
2016-11-01 23:32:39 +01:00
Sean Engelhardt
14ca655aa2
Creates the Election documents using PdfMake
2016-11-01 23:18:19 +01:00
FinnStutzenstein
58dd2f2b30
change all isProjected functions ( closes #2462 )
2016-11-01 10:31:28 +01:00
Tobias Hößl
03ef217c4e
Colors / text-Decorations for insered / deleted text; hide line numbers in inserted text
2016-10-29 16:23:16 +02:00
Norman Jäckel
9ca15fd0b8
Fixed migrations by skipping autoupdate.
2016-10-24 10:42:34 +02:00
FinnStutzenstein
111b9e3fd7
use check icon and no post request on deselect ( fixes #2471 )
2016-10-21 09:39:04 +02:00
Emanuel Schütze
dc1c958e0f
Merge pull request #2514 from FinnStutzenstein/Issue2494
...
Round corners for projectorbuttons (fixes #2494 )
2016-10-18 13:01:49 +02:00
FinnStutzenstein
6ca3c07e1f
Round corners for projectorbuttons ( fixes #2494 )
2016-10-18 12:48:19 +02:00
Emanuel Schütze
68139ff5be
Merge pull request #2512 from FinnStutzenstein/Issue2470
...
key value switched in angular foreach (fixes #2470 )
2016-10-17 22:05:55 +02:00
Norman Jäckel
676e783039
Merge pull request #2516 from FinnStutzenstein/Issue2502
...
Remove chat history
2016-10-17 21:48:34 +02:00
Norman Jäckel
f2fa8de7be
Merge pull request #2495 from normanjaeckel/MotionBlock
...
Motion block
2016-10-17 21:29: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
Norman Jäckel
8d494ddef9
Merge pull request #2511 from FinnStutzenstein/Issue2465
...
Rename AdditionalId to arg (closes #2465 )
2016-10-17 20:45:23 +02:00
Tobias Hößl
228abf5cee
Change recommendations
2016-10-17 19:37:32 +02:00
Norman Jäckel
e944f6368b
Merge pull request #2509 from matakuka/majorities
...
Majorities (issue #2258 )
2016-10-17 17:15:15 +02:00
Norman Jäckel
45aa4146da
Refactored majority calculation. Added cache for MotionPollDetailCtrl.
2016-10-17 17:03:42 +02:00
Maximilian Krambach
e5e1e3e8ba
Majority test for motions
2016-10-17 17:03:31 +02:00
Norman Jäckel
639748bb3b
Added view to clear the chatbox.
2016-10-17 16:56:19 +02:00
FinnStutzenstein
7965fd3fce
Button for deleting chat history
2016-10-17 15:04:06 +02:00
Emanuel Schütze
208d94a91b
Support https as websocket protocol (wss).
2016-10-17 11:31:27 +02:00
FinnStutzenstein
5272a3c1bb
key value switched in angular foreach ( fixes #2470 )
2016-10-17 08:58:43 +02:00
FinnStutzenstein
7fcbed051c
Rename AdditionalId to arg ( closes #2465 )
2016-10-17 08:10:52 +02:00
André Böhlke
cced97d9fb
password change command
2016-10-14 16:01:46 +02:00
Norman Jäckel
447339ec33
Merge pull request #2508 from tsiegleauq/userListPdfMake
...
Create the user list over pdfmake
2016-10-14 11:50:31 +02:00
Sean Engelhardt
54fc500d04
Create the user list over pdfmake
2016-10-12 16:52:24 +02:00
Maximilian Krambach
88674da36a
list-of-speakers overlay ( fixes #2211 )
2016-10-12 15:45:21 +02:00
Emanuel Schütze
6f70fb630c
Merge pull request #2498 from tsiegleauq/agendaPDFmake
...
Generate agendas using pdfmake
2016-10-12 10:27:46 +02:00
Sean Engelhardt
345328357f
Generate agendas using pdfmake
2016-10-11 18:10:33 +02:00
Emanuel Schuetze
f7d10b417e
Template fixes
...
- motion list: show category and tags dropdown for manager only
- manage projector: fix submenu buttons and css classes
2016-10-07 11:42:33 +02:00
FinnStutzenstein
f1c58f98e8
Using a datetimepicker for agenda start time ( closes #2413 and fixes #2440 )
2016-10-06 22:12:51 +02:00
Sean Engelhardt
5040caba5c
moves pdfmake related code in own files ( fixes #2307 )
2016-10-05 11:27:22 +02:00
Oskar Hahn
e209dd6dfe
Support to send many objects through the autoupdate system
2016-10-04 18:10:04 +02:00
Emanuel Schuetze
d7a22c371e
Minor changes
...
- Show workflow field in motion form only if more than one workflows
exists.
- Reorder the fields category, tags and origin in motion detail.
- Fix translation string 'Line numbering'.
- Fix padding in motion list.
2016-10-04 15:06:50 +02:00
Emanuel Schuetze
4075c1aa3f
Fixed translations strings. Updated template-en.pot.
2016-10-04 12:04:55 +02:00
Emanuel Schütze
e64a1bf19c
Merge pull request #2478 from emanuelschuetze/ui-improvements
...
UI improvements
2016-10-04 10:59:21 +02:00
Emanuel Schuetze
bc72089973
UI improvements
...
- item list: reorder buttons
- motion list:
* move hover menu for edit/delete below submitters
* limit submitters to one
- motion detail:
* show ol flush left
* use 2 or 3 columns in meta box
* use small buttons for line numbering controls
* group line number controls in grey tool bar.
* Show motion comments div only if user is allowed.
- motion config:
* Deativate comments by default.
* Deactivate recommendations for motions by default.
- item detail: Show needed buttons only.
- assignment detail: Improve ballot tabs.
- general:
* move pdf button to right
* move 'back to overview' button to left
* update label vor countdown option
2016-10-04 10:51:19 +02:00
Norman Jäckel
2e7555e720
Fixed broadcast. Fixed #2467 .
2016-10-01 14:37:04 +02:00
Oskar Hahn
98bab9b358
Fix tests and remove old code.
2016-10-01 01:49:27 +02:00
Norman Jäckel
039795beb7
Refactored projector requirements system for autoupdate.
2016-10-01 01:49:17 +02:00
Oskar Hahn
ac9c9f4ec3
More tests, development instructions and small changes.
2016-10-01 01:48:30 +02:00
Norman Jäckel
7cd70a568c
Added docstrings. Small changes.
2016-10-01 01:48:18 +02:00
Oskar Hahn
368873e738
Adds a cache system to the CollectionElement and add
...
a Collection class that can be used to call a collection
used this for the list and receive rest api.
2016-09-30 21:37:52 +02:00
Emanuel Schuetze
720c7e76a5
Hot fix for broadcast (will improved later).
2016-09-30 21:20:30 +02:00
Emanuel Schuetze
6f2a509ebf
Fix mediafile control buttons for fullscreen and play.
2016-09-30 19:59:53 +02:00
Norman Jäckel
8427ffd816
Small changes for multiple projector feature.
2016-09-30 19:11:33 +02:00
Finn Stutzenstein
e6b9b21d41
Added support for multiple projectors.
2016-09-30 18:58:59 +02:00
Emanuel Schütze
447d475321
Merge pull request #2461 from FinnStutzenstein/minorFixes
...
some minor fixes
2016-09-30 17:37:27 +02:00
FinnStutzenstein
84cd3dbc77
little fixes
2016-09-28 19:27:40 +02:00
Norman Jäckel
f4c6c35584
Merge pull request #2449 from emanuelschuetze/fixTranslations
...
Minor fixes
2016-09-28 13:17:59 +02:00
Emanuel Schuetze
4732c64617
Minor fixes
...
- Fix translation strings.
- Fix dropdown style in motion table.
2016-09-27 15:21:52 +02:00
FinnStutzenstein
673ee1da18
hotfix
2016-09-27 11:47:57 +02:00
Norman Jäckel
8398e3abf0
Merge pull request #2436 from tsiegleauq/issue2433-PdfInvalidHTML
...
Repairs invalid HTML during PDF generation (fixes #2433 )
2016-09-26 20:51:04 +02:00
sean
d1addf4df6
Repairs invalid HTML during PDF generation ( fixes #2433 )
2016-09-26 18:53:59 +02:00
Emanuel Schütze
223b168441
Merge pull request #2434 from emanuelschuetze/update-translations
...
Updated German translations. Fixed some translation strings.
2016-09-26 15:46:38 +02:00
Emanuel Schuetze
148e7f6a9b
Updated German translations. Fixed some translation strings.
2016-09-26 15:33:40 +02:00
Sean Engelhardt
d4c4f944fe
Add motion catalog over pdfmake ( fixes #2299 )
2016-09-26 13:25:58 +02:00
Emanuel Schütze
50f5d0a33a
Merge pull request #2380 from FinnStutzenstein/Issue2348
...
New ui element for comments in config (closes #2348 )
2016-09-24 13:34:08 +02:00
Emanuel Schütze
5a70125922
Merge pull request #2423 from normanjaeckel/NeedFullUpdate
...
Implemented need_full_update check. Fixed #2396 .
2016-09-23 15:00:17 +02:00
Norman Jäckel
26f615fed4
Merge pull request #2426 from FinnStutzenstein/Issue2420
...
Fixing the projector sidebar on firefox (closes #2420 )
2016-09-23 14:45:25 +02:00
Finn Stutzenstein
d13e11beb1
New ui element for comments in config ( closes #2348 )
2016-09-23 14:37:13 +02:00
Norman Jäckel
dc404d21f6
Implemented need_full_update check. Fixed #2396 .
2016-09-23 14:36:26 +02:00
FinnStutzenstein
8a73ce1be5
Fixing the projector sidebar on firefox ( closes #2420 )
2016-09-23 14:34:31 +02:00
FinnStutzenstein
448756f17a
Docx export with docxtemplater
2016-09-23 14:20:07 +02:00
Norman Jäckel
53ac7c2348
Merge pull request #2117 from lesteenman/extendedMediaFileSupport
...
Initial attempt at support for image and video files.
2016-09-22 23:28:00 +02:00
Emanuel Schütze
2495d7dd7f
Merge pull request #2412 from FinnStutzenstein/Issue2109
...
Agenda duration and estimated time (closes #2109 )
2016-09-22 22:40:23 +02:00
Norman Jäckel
926516ac65
Small style changes.
2016-09-22 21:59:36 +02:00
FinnStutzenstein
970f42cacb
Agenda duration and estimated time ( closes #2109 )
2016-09-22 21:59:35 +02:00
Erik Steenman
514eea2105
Add support for image and video files.
2016-09-22 19:03:27 +02:00
FinnStutzenstein
457f8735d0
Allow to scale the projector in the projectorcontainer greater than 100%
2016-09-22 11:26:42 +02:00
Norman Jäckel
cab53f0434
Moved custom slides to own app topics for better app structure.
...
Renamed model to Topic. Added migrations file. Fixed #2402 .
2016-09-21 15:00:23 +02:00
Finn Stutzenstein
a06806c33b
Highlighting and jumping to lines in motions ( closes #2347 )
2016-09-21 13:58:39 +02:00
Norman Jäckel
2d15bd54a1
Merge pull request #2386 from FinnStutzenstein/sidebarScroll
...
First attempt to scroll the projector sidebar
2016-09-21 12:40:13 +02:00
Norman Jäckel
96b4fb9fd9
Merge pull request #2376 from tsiegleauq/issue2300-pdf-line-numbers
...
Add line numbers to pdf (fixes #2300 )
2016-09-20 21:15:25 +02:00
Emanuel Schuetze
875b7b2ddd
Reduced font-size of outline numbers.
2016-09-20 16:57:57 +02:00
Sean Engelhardt
cc5ff21005
Add line numbers to pdf ( fixes #2300 )
2016-09-20 11:34:19 +02:00
FinnStutzenstein
9347a78d56
Make the sidebar scroll and one typofix
2016-09-19 09:05:55 +02:00
Norman Jäckel
858f4a2b43
Merge pull request #2405 from emanuelschuetze/fixAlerts
...
Fixed syntax of all uib-alerts.
2016-09-18 22:54:29 +02:00
Emanuel Schuetze
2a825adde4
Disable projector auto reload after 5 minutes.
...
Auto reload no longer used because client gets all required data
after reconnection via websocket.
2016-09-18 22:34:54 +02:00
Emanuel Schuetze
a7f5d4dd3c
Fixed syntax of all uib-alerts.
...
Required after ui-bootstrap upgrade.
2016-09-18 21:09:37 +02:00
Norman Jäckel
00913a6333
Added management command to change config values. Fixed #2400 .
2016-09-18 13:17:21 +02:00
Norman Jäckel
76250c5851
Changed loading of JavaScript files.
2016-09-18 11:23:51 +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
d7936c53e3
Updated settings files. Fixed timezone support.
2016-09-16 21:17:00 +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
1cdcad7d47
Fixed bug in templateHook directive. Fixed #2362 .
2016-09-08 00:58:02 +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
Finn Stutzenstein
fd78ccdb01
Fixing resolving of Config for projector resolution ( fixes #2349 )
2016-09-06 12:09:50 +02:00
Norman Jäckel
0fddfdd25a
Merge pull request #2356 from emanuelschuetze/fix
...
Fixed missing translation and form errors.
2016-09-06 00:33:40 +02:00
Emanuel Schuetze
d7b092300d
Fixed missing translation and form errors.
2016-09-05 23:13:07 +02:00
Tobias Hößl
b701127f04
Fix a styling problem
2016-09-05 20:03:41 +02:00
Emanuel Schuetze
7abdc2e615
Increase the allowed characters for event name config to 100.
...
Same limit as event_description.
2016-09-01 15:32:59 +02:00
Norman Jäckel
c87111e81d
Merge pull request #2318 from FinnStutzenstein/projectorSize
...
Control the resolution of the projector
2016-09-01 14:59:53 +02:00
Finn Stutzenstein
a8dcc2abdc
Control the resolution of the projector
2016-08-31 14:18:29 +02:00
Norman Jäckel
31e47e0ac5
Merge pull request #2308 from FinnStutzenstein/Issue1213
...
Handle duplicates during user import (fixes #1213 )
2016-08-31 13:05:03 +02:00
Finn Stutzenstein
78ec30d6b2
Handle duplicates during user import
2016-08-31 12:23:38 +02:00
Emanuel Schuetze
24b95e5fbc
Scale image size also in detail and projector view.
2016-08-31 09:58:26 +02:00
sean
33f463599a
limit image scale in pdf documents ( fixes #2301 )
2016-08-30 12:54:55 +02:00
Emanuel Schütze
6efbe7b210
Merge pull request #2255 from matakuka/search_filter
...
Added search filtering by category (fixes #2019 , fixes #2239 )
2016-08-25 17:53:55 +02:00
Maximilian Krambach
e06b4db664
Added search filtering by category ( fixes #2019 , fixes #2239 )
2016-08-25 17:49:36 +02:00
Maximilian Krambach
3221ce18f6
new view for current list of speakers ( fixes #2212 )
2016-08-25 17:35:57 +02:00
Maximilian Krambach
126cfb9000
Parent items for Agenda items ( fixes #2213 )
2016-08-25 13:51:54 +02:00
Emanuel Schütze
73095948ca
Merge pull request #2260 from FinnStutzenstein/Feature435
...
New matrix interface for group editing (closes #435 )
2016-08-22 15:26:10 +02:00
Finn Stutzenstein
bf3a1ce714
New matrix interface for group editing ( closes #435 )
2016-08-22 15:05:06 +02:00
Tobias Hößl
d986d551e0
Line numbers and inline editing
2016-08-20 11:18:17 +02:00
Norman Jäckel
5ea9cbf4d1
Merge pull request #2289 from emanuelschuetze/motionpdf
...
Minor motion PDF improvements.
2016-08-19 22:42:56 +02:00
Emanuel Schuetze
8a329a81e6
Minor motion PDF improvements.
2016-08-19 22:13:12 +02:00
Norman Jäckel
70a732bce8
Merge pull request #2280 from normanjaeckel/TemplateHook
...
Added template hooks for plugins.
2016-08-19 21:13:55 +02:00
Norman Jäckel
c38cf562d5
Added template hooks for plugins.
2016-08-19 21:08:54 +02:00
Thomas Junk
92a541215f
pdfmake incl. fixes
2016-08-19 16:21:46 +02:00
Thomas Junk
546c4e65f6
PDFMake implemented
2016-08-19 14:10:30 +02:00
Finn Stutzenstein
ee95af9acc
Added a possibility to sort and renumber all motions in a category
2016-08-18 14:54:09 +02:00
Oskar Hahn
8d58368937
Added missing migrations for #2269
2016-08-15 19:15:05 +02:00
Oskar Hahn
fac9e71c29
Remove default permissions for session
...
fixes #2262
2016-08-13 07:37:27 +02:00
Emanuel Schütze
320de66783
Merge pull request #2261 from emanuelschuetze/config-translations
...
Fixed missing translations of config options (Fixes #2193 )
2016-08-09 20:18:49 +02:00
Emanuel Schuetze
282bc45790
Fixed missing translations of config options ( Fixes #2193 , fixes #2245 )
2016-08-09 17:06:24 +02:00
Finn Stutzenstein
b115691675
Messages now allow HTML tags ( Fixes #2127 )
2016-08-05 12:38:19 +02:00
Norman Jäckel
2627724c55
Merge pull request #2199 from matakuka/noBrowserLanguage
...
sets language to en if no browser language is set
2016-07-11 14:19:14 +02:00
Maximilian Krambach
31df629fc9
sets language to en if no browser language is set
2016-07-06 09:52:32 +02:00
Emanuel Schuetze
31657d0cf3
Fixed and update English translation strings.
2016-06-28 10:18:43 +02:00
Norman Jäckel
b45e0ea09f
Fixed coding style.
2016-06-16 10:28:14 +02:00
Maximilian Krambach
a5a00a7eda
Config translations moved to client side (Issue #2093 )
2016-06-12 11:46:46 +02:00
Joel Macht
b7d83e786f
Fix linebreak on tags, add spacing and remove commas ( Fixes #2147 )
2016-06-10 18:17:42 +02:00
Oskar Hahn
fe64941aab
Big Mode for OpenSlides
...
Uses django channels instead of tornado for the autoupdate. Therefore
tornado is nolonger a dependency of OpenSlides (but channels).
This uses websockets instead of SockJS.
Use the flag insecure in the start command to provide static files serving.
Use a new session backend that has a ForeignKey to User.
2016-06-09 11:14:39 +02:00
Maximilian Krambach
5061ea1770
typo fixing (issue #2181 )
2016-06-08 22:18:35 +02:00
Maximilian Krambach
649300cfb8
Add a back button to tag overview ( Fixed #2151 )
2016-06-08 16:41:27 +02:00
Norman Jäckel
8c5c5dc556
Fixed bug on config view.
2016-06-06 14:19:57 +02:00
Oskar Hahn
2221b23447
Redesign of the config variables.
...
Removed the config cache and created files for each app in which the
config variables are defined.
2016-06-03 13:47:54 +02:00
Erik Steenman
4b7ba02b7d
Change the z-index of .fullscreen
to 100.
...
Z-Index 199 places the fullscreen content just below the various
projector overlays, such as messages and timers.
2016-05-10 14:51:30 +02:00
Emanuel Schuetze
e151e7c84c
Fix z-index of chatbox and projector sidebar.
2016-04-17 22:18:16 +02:00
Emanuel Schuetze
06d333c067
Template fixes for better smartphone usage.
...
- Remove on-focus-me directive on every list view.
(Otherwise smartphones/tablets opens always the keyboard on each list view.)
- Make some columns 'optional' in list view to see only the most important columns
on small devices.
- Add z-index for projector sidebar. Show it in full width on small
devices.
- Remove padding on small devices.
2016-04-17 19:56:38 +02:00
Emanuel Schuetze
9481d037e8
Reduce sizes of used logos.
2016-04-13 11:06:50 +02:00
Emanuel Schuetze
cb605d619e
Mark missing translation string.
2016-04-03 11:53:40 +02:00
Emanuel Schuetze
0565d57789
Template fixes
...
- Fix config groups. Use group index instead of group names (with blanks).
- Use 100% width for all chosen fields.
2016-03-21 19:56:53 +01:00
Norman Jäckel
e2383dc770
Merge pull request #2051 from emanuelschuetze/templateFixes2
...
Template improvements
2016-03-20 21:21:52 +01:00
Emanuel Schuetze
3479a0636e
Allow to enter countdown time in seconds or 'mm:ss' format.
2016-03-20 21:07:20 +01:00
Emanuel Schuetze
2af38f75bb
Fix edit current slide button.
2016-03-20 21:07:16 +01:00
Norman Jäckel
5af25351fa
Merge pull request #2049 from emanuelschuetze/fix2028
...
Catch 404 errors in resolve promise if user has not all required permissions
2016-03-20 20:48:58 +01:00
Emanuel Schuetze
5e08e073f4
Fix translation strings in motions and users forms.
2016-03-19 13:06:36 +01:00
Emanuel Schuetze
0cd6bb272c
Projector template improvements
...
- Vertical centering event title (if no description available)
- Fix sorting of main agenda item list.
- Show countdowns side-by-side. Allow edit if countdown is running.
2016-03-19 07:30:18 +01:00
Emanuel Schuetze
03f08628c7
Catch 404 errors in resolve promise if user has not all required permissions.
...
- fix motion detail/list, agenda item detail, assignment list, mediafile list
- add fontpage permission check
- use agenda item title for motion title if available (to show item number)
- fix groupFilter reset in users list
- fix users permission string
Fixes #2028 . Fixes #2038 .
2016-03-18 21:41:16 +01:00
Emanuel Schuetze
140869ebd7
Fix translation strings.
2016-03-18 20:11:04 +01:00
Emanuel Schuetze
89446ce4f6
Use angular-chosen instead of ui-select for better performance.
...
The jQuery select field from angular-chosen is used for all ui-select
fields. See https://github.com/leocaseiro/angular-chosen/
Use input delay on users filter field with 'debounce'.
Fixed #2006 .
2016-03-18 14:37:03 +01:00
Emanuel Schuetze
a8d9581664
Allow html in event name and description.
2016-03-14 17:09:37 +01:00
Emanuel Schuetze
1b25d9c376
Added loading spinner icon.
...
Only for loading resolve object from server.
2016-03-14 17:09:37 +01:00
Emanuel Schuetze
85326d75f2
New configs for font color in header and h1 on projector ( Fixes #2020 )
2016-03-08 23:01:17 +01:00
Norman Jäckel
56936c86ab
Used bulk_create to create the initial projector during migration. Fixed #2035 .
2016-03-07 19:09:45 +01:00
Norman Jäckel
ce3576f306
Merge pull request #2034 from emanuelschuetze/fix2005
...
Fix main menu on small devices (Fixes #2005 )
2016-03-07 19:00:08 +01:00
Emanuel Schuetze
876d9408fe
Fix main menu on small devices ( Fixes #2005 )
...
Use bootstraps navbar-toggle button to bring up a
vertical responsive main menu.
Some additional responsive CSS impmprovements.
2016-03-06 20:14:52 +01:00
Norman Jäckel
132c6e81ec
Forwarding JSON instead of Django model instances to autoupdate loop.
...
- Used raw SQL for createing default projector during inital migration.
- Removed default_password and hidden agenda items from autoupdate data for some users.
- Removed old get_collection_and_id_from_url() function.
2016-03-06 14:24:53 +01:00
Norman Jäckel
4daa61888f
Massive refactoring for autoupdate optimization.
2016-03-06 14:22:40 +01:00
André Böhlke
3db2f2fc16
"durchstich" for autoupdate optimization
2016-03-06 14:22:40 +01:00
Emanuel Schuetze
b78c9bc7bd
Allow pdf scrolling on projector ( Fixes #1949 ).
2016-03-05 22:44:00 +01:00
Emanuel Schuetze
7029852043
Template fixes
...
- switch projector live view minimize/maximize buttons
- show agenda/item split buttons (project only main agenda items, project subitem)
only if subitems are available
2016-03-03 08:46:18 +01:00
Norman Jäckel
de871f3f9c
Squished migrations files.
2016-03-02 14:26:47 +01:00
Norman Jäckel
a2a6637c89
Rename and refactor some ProjectorElement methods. Fixed #1631 .
2016-02-27 20:56:03 +01:00
Norman Jäckel
9fbb12944c
Updated start script help text and custom commands. Fixed #1987 .
2016-02-25 23:17:04 +01:00
Emanuel Schuetze
a6be43809f
Agenda list slide improvements
...
- project summary of selected item
- show full tree OR main agenda items only
- show done items grey (without icon)
2016-02-25 13:37:59 +01:00
Emanuel Schuetze
16fd87cc93
Use a global variable for the limiting number of users in select fields. ( Fixed #1989 )
2016-02-23 22:24:41 +01:00
Emanuel Schuetze
0613304724
Use colorpicker for projector header color config.
2016-02-23 22:24:41 +01:00
Emanuel Schuetze
ba49781b39
Show orange countdown in last x seconds of speaking time (add new config)
2016-02-23 22:24:38 +01:00
Emanuel Schuetze
647e62fb0d
Set focus for chat input
2016-02-23 22:24:33 +01:00
Emanuel Schuetze
84ea0bf1f5
Several important fixes for beta4
...
- Fix socket error in autoupdate (Check if socket exists)
- Add missing translation string for core permission
- Fix KeyError in extract_default_password function in users/views.py
- Improve Pagination. Fix users list for users without can_see_extra_data permissions.
- Limit the number of users in ui-select field
- Fix csv header names in users import help text.
- Use config options (enable logo/title) on projector.
- Nicer font style for main and sub items on agenda slide.
- Fix JS error if this.groups is undefined for anonymous.
2016-02-17 17:49:44 +01:00
Norman Jäckel
75f4a2e62d
Work on JavaScript coding style.
2016-02-16 00:56:56 +01:00
Norman Jäckel
40a3d4534e
Merge pull request #1972 from emanuelschuetze/tinymce
...
Use tinymce instead of CKEditor.
2016-02-16 00:27:58 +01:00
Emanuel Schuetze
16f1ad5731
Use tinymce instead of CKEditor.
...
- better integration of tinymce in bower and gulp
- Improve support for html tags in reportlab's motion pdf.
- Now paste from word works without problems
(That was the main reason of switching to tinymce:
The data loss problem with MS Word is still unfixed in CKEditor,
see https://dev.ckeditor.com/ticket/13174 )
- The editor is now used for customslides (text), motions (text,
reason) and users (about).
- Use mediafile image list for tinymce.
- Use own repository for tinymce-i18n: OpenSlides/tinymce-i18n
2016-02-16 00:22:01 +01:00
Norman Jäckel
2d5f5c685c
Merge pull request #1964 from emanuelschuetze/assignmentpoll
...
Assignmentpoll slide
2016-02-15 23:50:43 +01:00
Emanuel Schuetze
503325220f
Show selected poll on assignment slide.
2016-02-15 23:47:31 +01:00
Emanuel Schuetze
aee8ed2f3b
Template fixes
...
- Show correct last speakers on list of speakers slide.
- Fixes config input type.
- Fixes config style for checkboxes.
- Improved line-height on projector for scaling.
2016-02-14 22:19:14 +01:00
Norman Jäckel
cc55aff8cc
Added possibility to hide config variables.
2016-02-14 21:38:26 +01:00
Emanuel Schuetze
b4cad89939
Use btn-group for projector controls. Added reset scaling.
2016-02-09 22:47:54 +01:00
Emanuel Schuetze
b1dc73ec4d
Use prune_elements for activate mediafile. ( Fixed #1910 )
...
Use page-fit to show pdf in full width.
Fix mediafile search result.
2016-02-09 22:38:07 +01:00
Norman Jäckel
25a7f59b70
Merge pull request #1950 from normanjaeckel/Worker.js
...
Simplified installing of JS and CSS libs. Fixed #1906 .
2016-02-08 22:35:28 +01:00
Norman Jäckel
3be21473a4
Merge pull request #1956 from emanuelschuetze/master
...
Several template fixes
2016-02-08 22:32:56 +01:00
Emanuel Schütze
6cd3e48e45
Merge pull request #1952 from normanjaeckel/ErrorMessages
...
Used 'detail' for all ValidationError messages. See #1946 .
2016-02-08 22:22:43 +01:00
Emanuel Schuetze
96b4784d52
Show motion poll results on projector.
2016-02-08 22:15:31 +01:00
Norman Jäckel
87a97edd69
Used 'detail' for all ValidationError messages. See #1946 .
2016-02-08 21:52:23 +01:00
Emanuel Schuetze
f89f3a9933
Improved motion state dropdown element.
2016-02-08 20:34:12 +01:00
Emanuel Schuetze
4bbb153c42
Use Roboto font in projector header/footer.
2016-02-08 20:27:59 +01:00
Norman Jäckel
0e784cde31
Fixed problem with some REST requests during autoupdate. Fixed #1935 .
2016-02-05 23:55:06 +01:00
Norman Jäckel
8cb74c5e7a
Simplified installing of JS and CSS libs. Fixed #1906 .
2016-02-05 23:27:15 +01:00
Oskar Hahn
eef82d7e72
Merge pull request #1936 from emanuelschuetze/pagination
...
Add Pagination and improve import.
2016-02-03 15:24:21 +01:00
Oskar Hahn
59294b1fcb
Merge pull request #1937 from emanuelschuetze/mediafileImprovements
...
Mediafile: Improvements for pdf presentaiton and list view.
2016-02-03 15:11:41 +01:00
Emanuel Schuetze
af023f30bc
Mediafile: Improvements for pdf presentaiton and list view.
2016-02-03 00:46:17 +01:00
Emanuel Schuetze
8ae3e1d468
Add Pagination and improve import.
...
- Use Pagination for users and item list and users import table.
- Improve agenda import: Allow to define agenda item stuff like
duration, comment, type.
2016-02-02 22:48:06 +01:00
Oskar Hahn
09cbe8c9e4
Fix the autoupdate
2016-02-01 23:21:50 +01:00
Oskar Hahn
7d6c202200
Merge pull request #1927 from emanuelschuetze/autoconnect
...
Refactor reconnect function of autoupdate.
2016-02-01 21:25:58 +01:00
Emanuel Schuetze
1216ea99d3
Refactor reconnect function of autoupdate.
2016-01-29 16:30:00 +01:00
Emanuel Schuetze
3cd49704fc
Use correct special html character for projector template title.
2016-01-29 09:14:26 +01:00
Norman Jäckel
da30be5184
Merge pull request #1919 from emanuelschuetze/fix1904
...
Fixed TypeError caused by #1904 .
2016-01-27 23:40:53 +01:00
Emanuel Schuetze
587f397171
Fixed TypeError caused by #1904 .
...
"Resource.relationList is undefinded" after activating a slide.
2016-01-27 23:35:24 +01:00
Norman Jäckel
1b1d41b9b8
Updated angular-gettext language file.
2016-01-27 22:33:05 +01:00
Norman Jäckel
70d32f1e47
Merge pull request #1914 from emanuelschuetze/fixGulp
...
Fixed gulp 'pot' task. Fixed typos in translation strings.
2016-01-27 22:23:29 +01:00
Norman Jäckel
fea0287a20
Updated translations.
2016-01-27 22:16:54 +01:00
Emanuel Schuetze
0ce0b9cd18
Fixed gulp 'pot' task. Fixed typos in translation strings.
2016-01-27 22:11:24 +01:00
Norman Jäckel
352e32334e
Merge pull request #1901 from emanuelschuetze/fix1895
...
Translate permission strings. (Fixes #1895 )
2016-01-27 20:42:07 +01:00
Norman Jäckel
e041656115
Merge pull request #1903 from emanuelschuetze/pdfMediafilePresentation
...
Mediafile pdf presentation with angular-pdf and pdf.js (Fixes #1664 ).
2016-01-27 20:40:23 +01:00
André Böhlke
d3ed15db29
Mediafile pdf presentation with angular-pdf and pdf.js ( Fixes #1664 ).
...
Thanks to André Böhlke for contribution core functionality!
Some additional template improvements by Emanuel.
2016-01-27 20:36:21 +01:00
Norman Jäckel
f12a1425c0
Merge pull request #1908 from emanuelschuetze/unconnectBar
...
Show red bar on top if server is offline (Fixes #1853 )
2016-01-27 20:25:33 +01:00
Emanuel Schuetze
deea222434
Translate permission strings. ( Fixes #1895 )
...
Remove unused gettextCatalog content provider.
2016-01-27 20:23:53 +01:00
Norman Jäckel
3ba93c2352
Merge pull request #1904 from ostcar/remove-ds-dependencies
...
Remove DS dependencies
2016-01-27 20:17:44 +01:00
Emanuel Schuetze
14e2fedd6b
Show red bar on top if server is offline ( Fixes #1853 )
2016-01-27 20:14:10 +01:00
Oskar Hahn
3b508303a1
Reconnect at once. Do not wait 5 seconds. Add a connected flag to the root scope
...
Fixes #1854
See also #1853
2016-01-27 17:55:28 +01:00
Oskar Hahn
bd4c8920e9
Remove DS dependencies
2016-01-27 17:28:41 +01:00
Emanuel Schuetze
23503eb4ba
Several template fixes and clean up
...
- Use ng-cloak for hide template parts while loading.
- Set html lang attribute dynamically (Fixes #1546 )
- Clean up: Rename 'dashboard' to 'home'.
- Show duration of speech in minutes. (Fixes #1882 )
- Save agenda specific stuff for customslides. (Fixes #1887 )
- Remove title from QuickEdit from.
- Checkbox for item.closed is now visible for manager only.
- Agenda list view: Show list of speakers link also for normal users.
- Improve slide templates: Show agenda item number and subtitle.
- Fixed agenda title for motions and assignments.
(Don't load motions and assignmetn in agenda app.)
- Added missing seach template.
2016-01-27 12:10:40 +01:00
Emanuel Schuetze
2a9e0b4b81
Implement full text search (client side) Fixes #1699
2016-01-27 00:16:30 +01:00
Norman Jäckel
87e3c536da
Deleted Django default permission of some apps. Fixed #1643 .
2016-01-25 14:48:54 +01:00
Oskar Hahn
0d1a8aa174
Merge pull request #1878 from emanuelschuetze/fix1783
...
Add checkbox 'show as agenda item'. (Fixes #1783 )
2016-01-24 22:16:43 +01:00
Emanuel Schuetze
9ddc558085
Add checkbox 'show as agenda item'. ( Fixes #1783 )
...
Used for customslide, motion and assignment forms.
Changed default value of agenda.type to HIDDEN_ITEM (=2) in model.py.
2016-01-23 20:22:56 +01:00
Emanuel Schuetze
4d6aade16a
Send option request for config page just once ( Fixes #1813 )
...
Add permission check in config template.
2016-01-23 01:02:05 +01:00
Emanuel Schuetze
94366f35ab
Use os-perms instead of os-perms-lite. Removed os-perms-lite. ( Fixes #1826 )
2016-01-21 22:26:11 +01:00
Emanuel Schuetze
646bf52ea7
Show countdown in red if negative (projector and control panel).
...
Show 00:00 instead of --:--
2016-01-21 21:43:02 +01:00
Emanuel Schuetze
b291473c61
Set guest_enabled in rootScope to use it in login form after reload. ( Fixes #1849 )
...
- Justified login form elements (same width).
2016-01-21 21:14:55 +01:00
Emanuel Schuetze
42f9cfdf45
List views: show number of filtered AND total rows.
...
Improve css animation for ng-enter/ng-leave.
2016-01-21 20:43:04 +01:00
Emanuel Schuetze
76dc29cddf
Use uib-alert instead of deprecated alert tag.
2016-01-18 21:09:28 +01:00
Emanuel Schuetze
851252dfe8
Format all JavaScript functions in same syntax.
...
Required for use minified js code in production mode.
2016-01-17 22:32:48 +01:00
Emanuel Schuetze
0e24d9b632
Modify motion/assignment/customslide in form dialog without updating list/detail view.
2016-01-17 21:19:32 +01:00
Oskar Hahn
440a38b387
Merge pull request #1843 from emanuelschuetze/motionsTemplate
...
Motion template fixes
2016-01-14 08:49:48 +01:00
Emanuel Schuetze
bc60b7e7ca
Several template improvements
...
- Move Languages services from site.js to base.js
Now the detected browser language is used as projector language.
- Use verboseName instead of agendaSupplement.
- Show submitters on projector (load Users on Controller).
- Improve list of speakers (slide and item detail).
2016-01-14 00:14:48 +01:00
Norman Jäckel
3fc82a596c
Fixed server error in config update view. Fixed #1828 .
2016-01-13 15:04:47 +01:00
Emanuel Schuetze
2f8c894104
Motion template fixes
...
- Fix missing workflows in Motion create form.
- redesign motion meta box
- use table format for motion voting results
2016-01-13 14:32:15 +01:00
Oskar Hahn
007a92a96b
Merge pull request #1841 from emanuelschuetze/ProjectorRedesign
...
Redesign projector template (Fixes #1787 )
2016-01-13 11:28:06 +01:00
Oskar Hahn
aa6a099840
Merge pull request #1809 from emanuelschuetze/CustomSlideAttachment
...
Custom slide attachment
2016-01-13 11:26:46 +01:00
Emanuel Schuetze
d0b9b2a492
Added reduced projector logo.
...
Added openslides blue color value to logo README.
2016-01-13 10:47:27 +01:00
Emanuel Schuetze
09b88fb4a6
Redesign projector template.
2016-01-13 10:28:49 +01:00
Emanuel Schuetze
93e2296bdc
A lot of template fixes
...
- Reset password from current (unsaved) value of default_password.
- MotionForm, AssignmentForm and UserForm factory for open ngDialog.
Fixes edit url redirect problem.
- Added back-to-detail-view-button to list of speakers view.
- Add translation context.
- Fixed (missing) translation strings.
- Fixed tags and category list views.
- motion detail: Use select box for changing state.
- motion slide updated
2016-01-13 10:22:24 +01:00
Emanuel Schuetze
f2375008d8
Added attachments for customslide views. ( Fixes #1681 )
2016-01-10 11:55:37 +01:00
Norman Jäckel
8a6ca904dc
Added attachments to custom slides.
2016-01-10 11:51:00 +01:00
Norman Jäckel
ca659351eb
Merge pull request #1825 from emanuelschuetze/fixTemplates
...
Fixed permissions in list views.
2016-01-10 01:07:51 +01:00
Oskar Hahn
87d647ac4d
Merge pull request #1824 from ostcar/fix_tornado
...
Fix tornado
2016-01-10 01:03:16 +01:00
Emanuel Schuetze
071b0a76be
Fixed permissions in list views.
2016-01-10 01:02:13 +01:00
Norman Jäckel
7005ab7f64
Disabled autocomplete for chat box.
2016-01-10 00:46:23 +01:00
Oskar Hahn
4bc0b1d19c
fix autoupdate and hide some groups in user edit form
2016-01-10 00:44:02 +01:00
Oskar Hahn
c30116f5c1
Merge pull request #1815 from emanuelschuetze/candidateElected
...
Mark candidate as elected. Updated assignment detail.
2016-01-09 22:37:39 +01:00
Emanuel Schuetze
2c46d3ae0a
Mark candidate as elected. Updated assignment detail.
2016-01-09 22:35:04 +01:00
Oskar Hahn
3ae6482863
Fix autoupdate of config
2016-01-09 22:13:55 +01:00
Oskar Hahn
2f8138f672
Merge pull request #1811 from normanjaeckel/SquishMigrations
...
Squished all migrations.
2016-01-09 21:04:54 +01:00
Norman Jäckel
8d1c351c9a
Squished all migrations.
2016-01-09 19:10:57 +01:00
Norman Jäckel
544efdb06e
Merge pull request #1806 from ostcar/fix_autoupdate_after_reload
...
Fix autoupdate after auth
2016-01-09 18:55:24 +01:00
Oskar Hahn
5069649e14
Fix autoupdate after auth
...
Remove data after logout
2016-01-09 18:25:18 +01:00
Norman Jäckel
193d318bc9
Merge pull request #1803 from ostcar/os_filter
...
Add osFilter that filters for an explicit text
2016-01-09 17:07:31 +01:00
Emanuel Schuetze
4a9f265b68
Used is_hidden instead of item.typ. Improve hidden filter.
...
Fixed JS error in users and assignments.
2016-01-09 16:55:21 +01:00
Oskar Hahn
e3b6fd8d6d
Add osFilter that filters for an explicit text
2016-01-09 16:45:47 +01:00
Norman Jäckel
68ec516e6f
Merge pull request #1799 from emanuelschuetze/loginText
...
Show info text in login form (Fixes #1754 )
2016-01-09 16:07:55 +01:00
Emanuel Schuetze
11470d3b57
Move welcome config values to general section.
...
Use textarea for welcome text.
2016-01-09 16:05:06 +01:00
Emanuel Schuetze
b035ee7d7c
Improved legal notice page ( Fixes #267 )
2016-01-09 14:44:49 +01:00
Oskar Hahn
c2041dca6f
Merge pull request #1796 from normanjaeckel/MoveTranslations
...
Remove model field verbose names. Move help texts.
2016-01-09 14:25:42 +01:00
Emanuel Schuetze
363c928517
Show info text in login form ( Fixes #1754 )
2016-01-09 14:22:32 +01:00
Norman Jäckel
e406b92745
Remove model field verbose names. Move help texts.
2016-01-09 14:17:51 +01:00