Emanuel Schütze
e4bd44082d
Fixed placement of 'back' button in motion block view ( Fixed #2963 ).
2017-02-17 22:32:17 +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
e35e65b7d4
Merge pull request #2985 from normanjaeckel/AgendaSortCheck
...
Added check for hierarchical loops in agenda sort view. See #2972 .
2017-02-17 22:08:23 +01:00
Emanuel Schütze
9ae1d7e59a
Show allert in sort template if agenda sort request failed.
2017-02-17 21:59:13 +01:00
Norman Jäckel
582915a019
Merge pull request #2981 from emanuelschuetze/fix-motion-block-projector
...
Send also motion.state.workflow to motion block slide.
2017-02-17 21:44:56 +01:00
Emanuel Schütze
06e9ffc819
Send also motion.state.workflow to motion block slide.
...
to show recommendation names in slide template
2017-02-17 21:10:46 +01:00
Norman Jäckel
aa14ac99b3
Added check for hierarchical loops in agenda sort view. See #2972 .
2017-02-17 17:20:30 +01:00
Norman Jäckel
56420aa0f5
Merge pull request #2982 from emanuelschuetze/recommendation-config
...
Added new config for default change recommendation view.
2017-02-17 16:33:36 +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
Norman Jäckel
ee66ee3d72
Merge pull request #2979 from FinnStutzenstein/Issue2951
...
fixing #2951
2017-02-17 16:28:26 +01:00
Norman Jäckel
8adbb1218f
Merge pull request #2978 from FinnStutzenstein/MotionBlockAutoupdate
...
Fixing MotionBlock autoupdate and added projector button (fixes #2958 )
2017-02-17 16:27:22 +01:00
Emanuel Schütze
768ee9236a
Added new config for default change recommendation view.
...
Use this default view for motion catalog pdf and motion detail view.
2017-02-17 16:03:00 +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
FinnStutzenstein
a5398a491c
fixing #2951
2017-02-17 14:54:32 +01:00
Emanuel Schütze
9a1e45682c
Merge pull request #2976 from FinnStutzenstein/templateFixes
...
Update mediafile form
2017-02-17 13:58:49 +01:00
FinnStutzenstein
0e401e7223
Fixing MotionBlock autoupdate and added projector button ( fixes #2958 )
2017-02-17 13:49:55 +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
75949cb01c
Fixed IntegrityError while creating groups with postgres ( Fixed #2960 ).
...
Use ng-submit for group form template.
2017-02-17 12:06:07 +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
Emanuel Schütze
d595e28d09
Merge pull request #2969 from CatoTH/Issue2961-bugfix
...
Solving two bugs in the diff - for #2961
2017-02-16 14:59:51 +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
0da7765dc0
Merge pull request #2968 from normanjaeckel/StaticDir
...
Fixed write settings command for Windows portable version. Fixed #2947 .
2017-02-15 22:57:05 +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
Tobias Hößl
afff1f35f8
Solving two bugs in the diff
2017-02-15 20:23:29 +01:00
Emanuel Schütze
be342f752f
Merge pull request #2966 from emanuelschuetze/issue2956
...
Send only data to client which user is allowed to see (Fixed #2956 ).
2017-02-15 20:18:45 +01:00
Emanuel Schütze
ae6496852e
Merge pull request #2959 from emanuelschuetze/issue2954
...
Added missing topic text to agenda csv export (Fixed #2954 ).
2017-02-15 20:18:01 +01:00
Norman Jäckel
1a53c7c3cc
Fixed write settings command for Windows portable version. Fixed #2947 .
2017-02-15 17:07:59 +01:00
Emanuel Schütze
3e92799838
Send only data to client which user is allowed to see ( Fixed #2956 ).
...
Fixed get_restricted_data functions for motion and mediafiles.
2017-02-15 16:51:44 +01:00
Emanuel Schütze
aa0791fc34
Added missing topic text to agenda csv export ( Fixed #2954 ).
2017-02-15 14:46:25 +01:00
Sean Engelhardt
4eefde839b
pdf w.o linen numbers and change rec. ( fixes #2962 )
2017-02-15 14:23:28 +01:00
Oskar Hahn
26b7f2879c
Let CollectionElement fail early
...
Fixes #2835
Fixes #2904
2017-02-12 14:15:58 +01:00
Emanuel Schütze
1c79e2c8ee
Update version to 2.1b4-dev
2017-02-10 23:40:18 +01:00
Emanuel Schütze
2aae6d43eb
Release 2.1b3
2017-02-10 23:39:52 +01:00
Emanuel Schütze
75fa1fdb7b
Merge pull request #2945 from emanuelschuetze/assignment-projector-fix
...
Fixed outdated assignment phases variable in projetor.js.
2017-02-10 23:36:15 +01:00
Emanuel Schütze
67b5b4ca32
Updated German translations.
2017-02-10 23:28:38 +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
Norman Jäckel
97de8cf785
Merge pull request #2942 from FinnStutzenstein/Issue2864
...
check if startup promise is resolved
2017-02-10 14:25:19 +01:00
FinnStutzenstein
8f613177cb
check if startup promise is resolved
2017-02-10 10:23:46 +01:00
FinnStutzenstein
b73c50a4f9
Fixed missing <p> tags for motion import and some improvements.
2017-02-10 09:11:45 +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
eb0d34d212
Merge pull request #2937 from FinnStutzenstein/Issue2560
...
Inline edit the ballot description (closes #2560 )
2017-02-07 12:00:56 +01:00
FinnStutzenstein
38279f4895
Inline edit the ballot description ( closes #2560 )
2017-02-07 11:53:09 +01:00
Emanuel Schütze
b4eff0ea1a
Updated German translations.
2017-02-07 09:16:12 +01:00
Emanuel Schütze
f66e551eaa
Merge pull request #2936 from FinnStutzenstein/MotionReason
...
Set resaon on save with CKEditor (fixes #2934 )
2017-02-06 17:29:09 +01:00
FinnStutzenstein
bacadd6931
Set resaon on save with CKEditor ( fixes #2934 )
2017-02-06 14:50:51 +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
Norman Jäckel
2e410599bb
Merge pull request #2932 from emanuelschuetze/fix-category-numbering
...
Fixed motion numbering in category sort view.
2017-02-06 14:29:19 +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
f238125a23
Fixed motion numbering in category sort view.
...
Removed blanks if MOTION_IDENTIFIER_WITHOUT_BLANK is True.
2017-02-06 12:11:50 +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
bbd8782c4c
Fix 'follow recommendation for all motions' function.
...
in motion block detail view
2017-02-03 12:50:52 +01:00
Norman Jäckel
6f05fc09ce
Merge pull request #2929 from FinnStutzenstein/Issue2927
...
Fixing merge conflicts (fixes #2927 )
2017-02-03 11:54:21 +01:00
Norman Jäckel
aade91cead
Merge pull request #2926 from emanuelschuetze/issue-2923
...
Fixed dynamic pdf header and footer for worker (Fixed #2923 ).
2017-02-03 11:53:34 +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
FinnStutzenstein
4bc9a26c4c
Fixing merge conflicts ( fixes #2927 )
2017-02-03 08:40:48 +01:00
Norman Jäckel
8c53b53a9d
Added server side sort view for agenda items. See #2452 .
2017-02-01 14:23:59 +01:00
Emanuel Schütze
bcff33330c
Merge pull request #2922 from normanjaeckel/Console
...
Removed console.log call.
2017-02-01 13:36:00 +01:00
Norman Jäckel
9ff9ac92be
Removed console.log call.
2017-02-01 12:55:26 +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
Emanuel Schütze
f5fab05388
Merge pull request #2920 from emanuelschuetze/fixAssignmentVoteOrder
...
Fixed wrong order of assignment votes caused by redis cache.
2017-01-30 22:57:45 +01:00
Emanuel Schütze
83e16b0b09
Fixed wrong order of assignment votes caused by redis cache.
2017-01-30 21:33:41 +01:00
Emanuel Schütze
39037af662
Merge pull request #2896 from FinnStutzenstein/Issue2871
...
Prevent XSS-attacks (fixes #2871 )
2017-01-30 21:11:46 +01:00
FinnStutzenstein
d55d374211
Prevent XSS-attacks ( fixes #2871 )
2017-01-30 21:04:41 +01:00
Oskar Hahn
6b5c329605
Fix the migration of the groups.
...
Fixes #2915
2017-01-27 11:59:31 +01:00
Emanuel Schütze
1d969838f2
Update version to 2.1b3-dev
2017-01-26 21:47:11 +01:00
Emanuel Schütze
e2fb1a60a1
Release 2.1b2
2017-01-26 21:46:21 +01:00
Emanuel Schütze
f10a3ffcb3
Merge pull request #2913 from emanuelschuetze/translations
...
Updated translations (CS, ES, PT, FR).
2017-01-26 21:42:57 +01:00
Emanuel Schütze
8234340a0c
Merge pull request #2909 from ostcar/rework_auth
...
Created a function to convert anything possible to a user-collection-element or None
2017-01-26 21:42:40 +01:00
Emanuel Schütze
b3800ad873
Updated translations (CS, ES, PT, FR).
2017-01-26 21:37:29 +01:00
Norman Jäckel
ad937aecb3
Typos and small changes.
2017-01-26 21:35:26 +01:00
Emanuel Schütze
c36835a40e
Merge pull request #2910 from emanuelschuetze/redis-prefix
...
Use custom redis prefix for asgi and cache entries.
2017-01-26 21:24:05 +01:00
Oskar Hahn
5dcfc69ff8
Update settings.py.tpl
...
Also the last line of a dict should end with a ',' or with the closing }
2017-01-26 21:17:36 +01:00
Emanuel Schütze
98e6f703e1
Use custom redis prefix for asgi and cache entries.
...
Note: These prefix have to be unique for each OpenSlides instance!
2017-01-26 21:17:32 +01:00
Norman Jäckel
2872cd437c
Fixed bug in motion set_identifier method. Fixed #2911 .
2017-01-26 21:03:10 +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
Emanuel Schütze
8897e22df0
Merge pull request #2907 from emanuelschuetze/pagination
...
Used better pagination for agenda, motions and users.
2017-01-25 21:23:45 +01:00
FinnStutzenstein
35903cbe97
Watch perms in client ( closes #1855 )
2017-01-25 20:19:25 +01:00
Emanuel Schütze
df3e691734
Used better pagination for agenda, motions and users.
...
to increase the browser performance while switching between apps.
2017-01-25 19:51:51 +01:00
Norman Jäckel
df60700612
Merge pull request #2882 from normanjaeckel/ChannelSendWait
...
Let channels' send method wait and retry if channel layer is full.
2017-01-25 16:40:43 +01:00
Emanuel Schütze
0d30c72270
Added trim function for get_full_name/get_short_name.
...
Required by submitter comparison for motion import.
2017-01-25 14:38:51 +01:00
Norman Jäckel
e0d5f6d92f
Merge pull request #2881 from ostcar/has_perm_with_id
...
Changed the function has_perm to support an user id or None as the fi…
2017-01-24 22:17:12 +01:00
Oskar Hahn
44474049c3
Added docstrings
2017-01-24 15:16:29 +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
40c2cdbe50
Fixing missing ballot resolver
2017-01-24 12:40:44 +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
Norman Jäckel
a724898ba3
Merge pull request #2875 from matakuka/removespeakers
...
delete list of speaker error messages (closes #2237 )
2017-01-19 13:22:28 +01:00
Emanuel Schütze
8daaebbcd0
Updated translation resource and German translation file.
2017-01-19 10:43:04 +01:00
Emanuel Schütze
b2dfc9b44e
Fixed translation strings.
2017-01-19 10:42:26 +01:00
Emanuel Schütze
52602d8330
Merge pull request #2884 from FinnStutzenstein/MotionProject
...
Reorder projection of motions (fixes #2883 )
2017-01-18 19:07:01 +01:00
Norman Jäckel
f271d8bb47
Fixed error when running manage.py collectstatic. Fixed #2861 .
2017-01-18 15:33:45 +01:00
Maximilian Krambach
929a7e5e89
delete list of speaker error messages ( closes #2237 )
2017-01-16 18:37:59 +01:00
FinnStutzenstein
2ac7df2ee6
Reorder projection of motions ( fixes #2883 )
2017-01-16 15:15:29 +01:00
FinnStutzenstein
bd0073d2f7
StartUp improvements
2017-01-16 14:32:10 +01:00
Norman Jäckel
bb8748a506
Let channels' send method wait and retry if channel layer is full. Fixed #2353 .
2017-01-15 22:01:09 +01:00
Emanuel Schütze
e9e0280a13
Merge pull request #2878 from FinnStutzenstein/MotionProjectFix
...
Hotfix for motion projection
2017-01-15 13:42:06 +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
1672c2de66
Merge pull request #2872 from normanjaeckel/AgendaComment
...
Fixed security issue #2850 : Comments were shown for unprivileged users.
2017-01-15 12:23:22 +01:00
Norman Jäckel
9250055e35
Merge pull request #2876 from emanuelschuetze/issue2763
...
Adapted motion DOCX template.
2017-01-15 12:21:27 +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
b419818b20
Hotfix for motion projection
2017-01-15 12:04:16 +01:00
Emanuel Schütze
986e8cc4f6
Adapted motion DOCX template ( Fixed #2763 ).
2017-01-15 10:59:09 +01:00
FinnStutzenstein
a3b7b92239
smoothly scroll projector
2017-01-15 10:56:26 +01:00
Norman Jäckel
c6b1df9e24
Fixed security issue #2850 : Comments were shown for unprivileged users.
2017-01-15 10:26:37 +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
Norman Jäckel
4b03a7ad5b
Merge pull request #2831 from normanjaeckel/UserLoginTimestamp
...
Skipped autoupdate for user during login. See #2804 .
2017-01-14 17:48:32 +01:00
Norman Jäckel
acab868c79
Quickfix for #2865 . The problem is not completely solved.
2017-01-14 17:15:30 +01:00
Norman Jäckel
aefd5073a7
Skipped autoupdate for user during login. See #2804 .
2017-01-14 16:45:14 +01:00
Norman Jäckel
560b820b57
Merge pull request #2855 from emanuelschuetze/issue2623
...
Validates open posts field of assignment form (Fixes #2623 )
2017-01-14 16:16:35 +01:00
Emanuel Schütze
4faf580239
Validates open posts field of assignment form ( Fixes #2623 )
2017-01-14 15:30:02 +01:00
Norman Jäckel
286119108c
Merge pull request #2860 from FinnStutzenstein/Issue2852
...
adding permission checks
2017-01-14 15:12:19 +01:00
Norman Jäckel
3600dd58f0
Merge pull request #2858 from emanuelschuetze/issue2142
...
Assignment list: Used number of candidates, removed number of needed …
2017-01-14 15:11:21 +01:00
Emanuel Schütze
527f949968
Assignment list: Used number of candidates, removed number of needed candidates ( Fixes #2142 )
2017-01-14 12:55:51 +01:00
Emanuel Schütze
d76162e3b0
Increased the cache option MAX_ENTRIES from 1000 to 10000 ( Fixes #2828 ).
2017-01-14 12:46:23 +01:00
FinnStutzenstein
794db79511
adding permission checks
2017-01-14 12:13:38 +01:00
Emanuel Schütze
458a7cf7c4
Merge pull request #2846 from normanjaeckel/MotionBlockSecu
...
Fixed motion create view. Fixed #2506 .
2017-01-14 12:10:51 +01:00
Emanuel Schütze
8c4b38f018
Merge pull request #2847 from FinnStutzenstein/Issue2844
...
Group order and hide internal items filter
2017-01-14 11:39:51 +01:00
Emanuel Schütze
8c9bde27fb
Merge pull request #2853 from normanjaeckel/ManagePy
...
Added error message for unknown args. Fixed #2200 .
2017-01-14 11:39:17 +01:00
Norman Jäckel
a918361ec5
Fixed motion create view. Fixed #2506 .
2017-01-14 11:38:20 +01:00
FinnStutzenstein
f092d6670d
Group order, hide internal items filter, hide comment in agenda list view
2017-01-14 10:51:07 +01:00
Norman Jäckel
aa47ecbf8a
Added error message for unknown args. Fixed #2200 .
2017-01-14 10:48:41 +01:00
Emanuel Schütze
99a771ac6c
Merge pull request #2845 from FinnStutzenstein/Issue2833
...
Fixing user list view with restricted permissions (closes #2833 )
2017-01-14 10:47:12 +01:00
Norman Jäckel
663feff806
Merge pull request #2848 from emanuelschuetze/issue2421
...
Added text to empty assignment poll result slide (Fixed #2421 )
2017-01-14 10:41:24 +01:00
Emanuel Schütze
35a5d4fe3b
Merge pull request #2839 from FinnStutzenstein/Issue2838
...
Fixing #2838
2017-01-14 10:40:57 +01:00
Emanuel Schütze
113aac59b3
Added text to empty assignment poll result slide ( Fixed #2421 )
2017-01-14 10:21:19 +01:00
FinnStutzenstein
76e6bac422
Fixing #2838
2017-01-14 10:21:14 +01:00
FinnStutzenstein
c0f092d811
Fixing user list view with restricted permissions ( closes #2833 )
2017-01-14 09:57:45 +01:00
Norman Jäckel
d22dff2743
Merge pull request #2841 from flanagan/remove-summary
...
Removed recommendation motion summary on slide.
2017-01-13 21:32:50 +01:00
Meinert Leinigen
d133199a73
Removed Recommendation motion summary
2017-01-13 21:28:03 +01:00
Oskar Hahn
1dc671430a
Fix channels
2017-01-13 20:53:06 +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
FinnStutzenstein
b44b58393d
Motion comments inline editing
2017-01-11 20:59:50 +01:00
Emanuel Schütze
a6807d77bf
Added groups_id to management command 'createopenslidesuser'.
2017-01-11 13:46:56 +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
Norman Jäckel
8e385199d5
Merge pull request #2826 from FinnStutzenstein/Issue2805
...
Do not enable inline editing for non privileged users
2017-01-10 21:13:52 +01:00
Oskar Hahn
97b21427aa
Change the way that missing cache ids are found.
...
This is probalby faster but in any way it maks debugging a lot easier. To go though
a big list in a for-loop is no fun at all.
2017-01-10 20:50:44 +01:00
FinnStutzenstein
cf7033e033
Do not enable inline editing for non privileged users
2017-01-09 16:03:09 +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
Emanuel Schütze
6502f36a90
Merge pull request #2796 from FinnStutzenstein/Issue2548
...
Project change recommendations
2017-01-09 09:27:46 +01:00
Norman Jäckel
1a88f0985a
Merge pull request #2818 from emanuelschuetze/motion-identifier-without-blanks
...
Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS.
2017-01-08 13:43:20 +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
f4d468a6f6
Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS.
...
Allow to remove all whitespaces from motion identifier if settings
value is True. Default: False.
Example: "B 1 - Ä 1" -> "B1-Ä1"
2017-01-06 21:38:08 +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
Norman Jäckel
c12d985ab6
Merge pull request #2810 from tsiegleauq/issue2665-qr-code-pdf
...
Add QR code in user access list pdf (fixes #2665 )
2017-01-06 11:08:22 +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
Sean Engelhardt
9abf9d5d57
Add QR codes to access data list ( fixes #2665 )
2017-01-04 15:50:20 +01:00
Maximilian Krambach
912dc1af8f
Bind mediafile to projector scope ( fixes #2706 )
2016-12-29 11:37:56 +01:00
Norman Jäckel
900ddaabb3
Merge pull request #2803 from emanuelschuetze/participant-number2
...
Added "No." for participant number in get_full_name().
2016-12-21 12:33:12 +01:00
Emanuel Schütze
c79e779934
Added "No." for participant number in get_full_name().
2016-12-21 12:08:37 +01:00
Norman Jäckel
7b0dca84d2
Merge pull request #2801 from FinnStutzenstein/Issue2754
...
More select mode options for users
2016-12-21 11:57:20 +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
Norman Jäckel
bfa0b4b3fe
Merge pull request #2800 from FinnStutzenstein/Issue2748
...
Consistent time handling and generic time converter code
2016-12-21 11:52:47 +01:00
FinnStutzenstein
365c122edd
More select mode options for users
2016-12-21 10:42:34 +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
be66a26353
Move participant number to the end of get_full_name().
2016-12-21 08:59:50 +01:00
Emanuel Schütze
16ff9200a9
Merge pull request #2782 from FinnStutzenstein/AssignmentSort
...
Sort candidates in assignments
2016-12-19 19:47:38 +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
3b1ab265eb
Sort candidates in assignments
2016-12-19 16:03:45 +01:00
FinnStutzenstein
a24b4aed99
cookie handling on login
2016-12-19 14:14:46 +01:00
Norman Jäckel
655a1b8f71
Update version to 2.1b2-dev
2016-12-16 23:54:23 +01:00
Norman Jäckel
789a3c308b
Release 2.1b1
2016-12-16 23:54:23 +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
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
4ebb8023e3
Merge pull request #2776 from CatoTH/Issue2770-pdfmake-bugfix
...
Bugfix for #2770
2016-12-16 20:32:54 +01:00
Emanuel Schütze
abe6c0f589
Merge pull request #2786 from normanjaeckel/PatchInMediafile
...
Changed PATCH to PUT for mediafile update. See #1871 .
2016-12-16 19:15:25 +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
Norman Jäckel
11e39e4ed8
Changed PATCH to PUT for mediafile update. See #1871 .
2016-12-16 16:58:31 +01:00
Tobias Hößl
46cf26481e
Bugfix for #2770
2016-12-14 22:28:44 +01:00
Norman Jäckel
1221ef4f02
Rearrange client mediafile app.
2016-12-14 17:16:42 +01:00
Norman Jäckel
deb5c5f4b3
Merge pull request #2774 from matakuka/language
...
Change the language selector to the languages' own names
2016-12-14 16:38:24 +01:00
Maximilian Krambach
0e6324b252
Change the language selector to the languages' own names
2016-12-14 15:25:38 +01:00
Sean Engelhardt
41ceb4ef9d
add special voting values for missed options ( fixes #2709 )
2016-12-14 14:05:03 +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
218b4bc7f4
Remove old countdowns and messages in core migrations.
2016-12-13 17:04:25 +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
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
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
116c3702f2
Updated German translations.
...
Added missing translation filter.
2016-12-11 13:37:26 +01:00
Emanuel Schütze
cd08f02949
Updated EN translation file.
2016-12-10 11:14:08 +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
358fd59d3c
Merge pull request #2749 from FinnStutzenstein/Issue2666
...
changing user import (closes #2666 )
2016-12-09 15:14:42 +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
36c8477c7f
no nav underline glitch
2016-12-09 13:51:23 +01:00
FinnStutzenstein
eca93594d7
Moving csv exports in seperate files ( closes #2728 )
2016-12-09 08:08:38 +01:00
Norman Jäckel
787805efa6
Merge pull request #2744 from tsiegleauq/issue2576-parsing-does-not-end
...
add precise text decoration (fixes #2576 )
2016-12-07 22:14:49 +01:00
sean
b1f4def743
add precise text decoration ( fixes #2576 )
2016-12-07 21:41:55 +01:00
Emanuel Schütze
c363fff3ba
Remove sidebox from assignment slide
...
Feedback from serveral users: open posts and state are not very
useful on slide and should be removed.
2016-12-07 21:00:13 +01:00
Emanuel Schütze
8bd03bafdb
Rename first/last name to given name/surname ( Fixes #2564 ).
2016-12-07 19:49:25 +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
a716910b63
Merge pull request #2734 from emanuelschuetze/issue2727
...
Hot fix for cache update while user import (Fixes #2727 ).
2016-12-05 13:25:11 +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
b36560bffb
Hot fix for cache update while user import ( Fixes #2727 ).
2016-12-05 13:17:35 +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
Emanuel Schütze
0698327427
Fix minor remarks for #2271 .
2016-12-02 15:49:21 +01:00
Emanuel Schütze
4c37fd8e62
Merge pull request #2726 from normanjaeckel/FollowRecommendationButton
...
Added button to motion detail view to follow recommendation. Closed #…
2016-12-02 15:40:33 +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
4d288ec9b2
Merge pull request #2724 from emanuelschuetze/posts
...
Rename 'posts' to 'persons' in assigment templates.
2016-12-02 14:47:11 +01:00
Norman Jäckel
926d04f610
Merge pull request #2723 from FinnStutzenstein/Clock
...
Fixing the clock
2016-12-02 14:46:43 +01:00
Emanuel Schütze
65337ae2d2
Rename 'posts' to 'persons' in assigment templates.
2016-12-02 14:41:34 +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
Emanuel Schütze
7fa5d3b9bb
Merge pull request #2713 from normanjaeckel/SettingsForClient
...
Added settings for client to basic JavaScript code on client startup.…
2016-12-02 10:38:18 +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
FinnStutzenstein
0f89205038
Translate legal notice
2016-12-02 08:10:06 +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
526a5478f7
Added settings for client to basic JavaScript code on client startup. Closed #2697 .
2016-12-01 15:21:11 +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
Norman Jäckel
639978a5dc
Refactor motion ans assignment percent and majority calculation.
2016-12-01 14:35:35 +01:00
Maximilian Krambach
32aaaf5b9e
Majority calculation for assignments.
...
Majorities when config YN(A) and simple voting method.
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
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
510d60ef0f
Merge pull request #2702 from tsiegleauq/assignmentImprove2559
...
improves the assignments (fixes #2559 )
2016-12-01 10:25:57 +01:00
Norman Jäckel
de00e35064
Merge pull request #2704 from tsiegleauq/motionDiffBox
...
Adds the diff-summary box for motions
2016-12-01 10:25:05 +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
bc312efbb9
Fix JS error after project pdf file.
2016-11-30 22:26:11 +01:00
Emanuel Schütze
5ab8b3172b
Merge pull request #2699 from normanjaeckel/TrivialChange
...
Fixed trivial change (disable versioning) checkboxes.
2016-11-30 21:39:50 +01:00
Emanuel Schütze
c466af760c
Motion PDF: Fix line numbers and style in summary box.
2016-11-30 21:13:12 +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
Sean Engelhardt
8f0c419c3e
Adds the diff-summary box for motions
2016-11-30 14:29:09 +01:00
Sean Engelhardt
2bb440b2aa
improves the assignments ( fixes #2559 )
2016-11-30 10:57:51 +01:00
Norman Jäckel
e601ee8e24
Fixed trivial change (disable versioning) checkboxes.
2016-11-29 16:39:54 +01:00
FinnStutzenstein
4f717b6610
New assignment and mediafile tables and table generics
2016-11-29 16:29:29 +01:00
Norman Jäckel
0605395da2
Merge pull request #2687 from FinnStutzenstein/Issue2341
...
Use plugin verbose name in permission matrix (fixes #2341 )
2016-11-29 12:52:30 +01:00
FinnStutzenstein
0446855920
Use pugin verbose name in permission matrix ( fixes #2341 )
2016-11-29 11:17:50 +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
b11463fc60
Merge pull request #2690 from CatoTH/bugfix-incorrectly-merging-words
...
Bugfix for merging change recommendations
2016-11-28 21:28:38 +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
b971c8db54
Merge pull request #2691 from emanuelschuetze/dialog-improvements
...
Improved forms in ng-dialogs.
2016-11-28 20:41:20 +01:00
Norman Jäckel
7e45e8a9a5
Merge pull request #2689 from FinnStutzenstein/lineNumberFix
...
Missing changes from PR 2678
2016-11-28 20:37:05 +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
bce74cac2f
Bugfix for merging change recommendations
2016-11-26 21:48: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
Emanuel Schütze
fb646df1fd
Merge pull request #2680 from FinnStutzenstein/MultiprojectorThings
...
Some improvements for Multiprojector
2016-11-25 15:45:40 +01:00
FinnStutzenstein
51cab5a8c9
Missing changes from PR 2678
2016-11-25 13:23:07 +01:00
Norman Jäckel
d068765db9
Merge pull request #2678 from CatoTH/goto-line-numbers-always-available
...
Make line highlighting and 'Goto'-Feature available on all modes
2016-11-24 00:09:22 +01:00
Norman Jäckel
36dc957f19
Changed tooltips.
2016-11-24 00:07:50 +01:00
Norman Jäckel
d9236c1920
Merge pull request #2681 from FinnStutzenstein/Issue2671
...
fixing duration in topic import (fixes #2671 )
2016-11-24 00:03:52 +01:00
Tobias Hößl
fd82ae348e
Editing change recommendations
2016-11-23 23:42:24 +01:00
Emanuel Schütze
14d00cc404
Merge pull request #2649 from CatoTH/bugfix-disabling-inline-editing
...
Bugfix disabling inline editing
2016-11-23 22:03:31 +01:00
FinnStutzenstein
219204087a
fixing duration in topic import ( fixes #2671 )
2016-11-21 15:24:11 +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
Tobias Hößl
c888419527
Make line highlighting and 'Goto'-Feature available on all modes
2016-11-20 21:55:03 +01:00
Tobias Hößl
ec635d97ee
Bugfix: Affected lines were selectable right after creating a change recommendation
2016-11-19 13:33:06 +01:00
Tobias Hößl
f9325069cf
Bugfix: Calling editing dialog during inline editing
2016-11-19 13:19:08 +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
Emanuel Schütze
707029c1c3
Updated translation files
...
- EN resources for django and angular-gettext
- DE translations
- PT translations
2016-11-18 11:24:09 +01:00
Norman Jäckel
a6ec032590
Merge pull request #2642 from emanuelschuetze/cleanup-pdf
...
Remove unused serverside pdf file from users app.
2016-11-18 11:03:23 +01:00
Emanuel Schütze
9c58efbdae
Remove unused serverside pdf file from users app.
2016-11-18 10:50:56 +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
Norman Jäckel
9b6fe6e3a2
Merge pull request #2641 from FinnStutzenstein/Issue2609
...
check if pdf is encrypted (closes #2609 )
2016-11-18 10:33:46 +01:00
FinnStutzenstein
e0f78b16a0
New table design for users
2016-11-18 09:42:29 +01:00
FinnStutzenstein
975a76daf4
check if pdf is encrypted
2016-11-18 09:40:36 +01:00
Tobias Hößl
32d3d804b1
Overhaul change recommendation statuses
2016-11-16 22:42:22 +01:00
Emanuel Schütze
f9f9934722
Fixed missplaced comma in pdf header ( Fixed #2639 )
2016-11-16 21:05:04 +01:00
Norman Jäckel
e8bf67b185
Merge pull request #2637 from emanuelschuetze/fix-translations
...
Fixed missing translations (Fixed #2616 , fixed #2625 )
2016-11-15 23:27:02 +01:00
Norman Jäckel
35e54eecbd
Merge pull request #2629 from CatoTH/Issue2617-switch-back-to-original-view
...
Switch back to original view after deleting last change recommendation (Closes #2617 )
2016-11-15 23:14:03 +01:00
Norman Jäckel
5899c41840
Merge pull request #2628 from CatoTH/bugfix-wrong-caching-of-extracted-lines
...
Bugfix: Caching of extracted line numbers was invalid…
2016-11-15 23:13:13 +01:00
Emanuel Schütze
f8958e36a6
Fixed missing translations ( Fixed #2616 , fixed #2625 )
2016-11-15 21:18:06 +01:00
Emanuel Schütze
2399a8121a
Merge pull request #2634 from normanjaeckel/FixMotionComment
...
Fixed motion projector if comment field is None. Fixed #2614 .
2016-11-15 21:01:24 +01:00
Emanuel Schütze
bbdb273a01
Merge pull request #2630 from CatoTH/translation-bugfix
...
Translation Bugfix - Missing line number in german translation
2016-11-15 20:35:20 +01:00
Emanuel Schütze
4d54a2b575
Merge pull request #2622 from FinnStutzenstein/Issue2566
...
Hotfix for Issue #2566
2016-11-15 20:24:47 +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
FinnStutzenstein
1ca390876b
Hotfix for Issue #2566
2016-11-15 11:40:59 +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
Norman Jäckel
5a78f1c510
Fixed motion projector if comment field is None. Fixed #2614 .
2016-11-14 13:16:34 +01:00
Tobias Hößl
2fe1940802
Translation Bugfix
2016-11-13 11:51:27 +01:00
Tobias Hößl
fca2605a2b
Switch back to original view after deleting last change recommendation
2016-11-13 11:45:22 +01:00
Tobias Hößl
4ac7f48bec
Bugfix: Caching of extracted line numbers was invalid when a fragment was passed as an argument
2016-11-13 10:20:00 +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
FinnStutzenstein
af9755cb9a
changed all project functions
2016-11-11 09:37:37 +01:00
Emanuel Schütze
22ab7a15a3
Merge pull request #2608 from emanuelschuetze/issue-2339
...
Load angular-gettext language files from plugin (Fixed #2339 )
2016-11-10 13:00:53 +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
Norman Jäckel
9a51bbe663
Update createopenslidesuser.py
2016-11-10 11:11:27 +01:00
André Böhlke
01e27c5713
add command for creating an openslides user
2016-11-10 09:15:21 +01:00
Sean Engelhardt
7069326655
ElectionList over PdfMake
2016-11-09 20:23:01 +01:00
Norman Jäckel
bc321bd714
Merge pull request #2605 from ostcar/fix_permission
...
Fixes user permissions
2016-11-08 23:50:39 +01:00
Oskar Hahn
a47e30c8f1
Fixes user permissions
...
Fix #2597
2016-11-08 23:13:15 +01:00
Emanuel Schütze
fbc4344ab9
Merge pull request #2604 from normanjaeckel/FixGroupUpdate
...
Fixed group update method. Fixed #2541 .
2016-11-08 22:45:38 +01:00
Norman Jäckel
7aa110aca6
Merge pull request #2599 from FinnStutzenstein/Issue2118
...
check for cookies (closes #2118 )
2016-11-08 22:39:40 +01:00
Norman Jäckel
2fae952edd
Fixed group update method. Fixed #2541 .
2016-11-08 22:36:57 +01:00
Norman Jäckel
4d80914b8a
Fixed zoom and scroll, fixed #2547 .
2016-11-08 21:29:26 +01:00
Norman Jäckel
db38e5e075
Merge pull request #2476 from ostcar/remove_serverside_pdf
...
Removed old code needed be the server to serve pdf
2016-11-08 15:12:45 +01:00
Norman Jäckel
8f099114bb
Merge pull request #2587 from FinnStutzenstein/Issue2544
...
Block deleting of the last group with user manage permissions
2016-11-08 15:04:24 +01:00
Norman Jäckel
30fd55409b
Merge pull request #2598 from emanuelschuetze/template-fixes
...
Template fixes.
2016-11-08 14:45:28 +01:00
Emanuel Schütze
4eecd59e52
Updated German translations.
2016-11-08 14:37:12 +01:00
FinnStutzenstein
43d9733881
fixing current list of speakers
2016-11-08 13:00:50 +01:00
FinnStutzenstein
410ac00a44
check for cookies ( closes #2118 )
2016-11-08 12:46:19 +01:00
FinnStutzenstein
8d4742ed29
Style fix in current list of speakers template
2016-11-08 12:21:53 +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
55a8c4e33a
Removed unused python user functions ( Fixed #2594 ).
...
Now get_short_name() and get_full_name() are used on client side only.
2016-11-07 15:58:20 +01:00
Oskar Hahn
7281aa57b8
Removed old code needed be the server to serve pdf
2016-11-07 15:54:29 +01:00
Emanuel Schütze
2824a6b3d2
Merge pull request #2591 from emanuelschuetze/users-import
...
Improve importing and sorting of users
2016-11-07 15:17:30 +01:00
Emanuel Schütze
5b544ceed2
Improve importing and sorting of users
...
* Add is_present field for csv import of users.
* Refactor JS functions get_full_name and get_short_name (Fixes #2136 ).
- Show participant number in get_full_name() output.
- Sort users by first or last name.
- Extend config option to sort users.
- Mark unused Python methods get_short_name and get_full_name.
2016-11-07 15:04:30 +01:00
Emanuel Schütze
8c07884746
Merge pull request #2586 from FinnStutzenstein/Issue2543
...
Just protect default group (fixes #2543 )
2016-11-04 15:51:40 +01:00
Emanuel Schütze
3225cdd1a9
Merge pull request #2589 from normanjaeckel/ConfigLabelHelpText
...
Changed label and help text of assignment config for 100-%-base.
2016-11-04 15:45:19 +01:00
Norman Jäckel
19a76f5d3d
Changed label and help text of assignment config for 100-%-base.
2016-11-04 12:02:16 +01:00
FinnStutzenstein
4a1df35a50
Block deleting of the last group with user manage permissions ( closes #2544 )
2016-11-04 10:04:21 +01:00
FinnStutzenstein
67f3a1294d
Just protect default group ( fixes #2543 )
2016-11-04 08:30:58 +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
Norman Jäckel
8c4a69dfb2
Merge pull request #2570 from emanuelschuetze/fix-inmemory-cache
...
Fix updating of motion comments for inmemory cache.
2016-11-02 14:24:30 +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
2c09b409d7
Fix updating of motion comments for inmemory cache.
...
get_restricted_data() has to use deepcopy(full_data) instead of
full_data.copy().
2016-11-02 14:07:24 +01:00
Norman Jäckel
8ec6681e81
Merge pull request #2578 from emanuelschuetze/fix-2115
...
Allow to resize tinymce editor (Fixes #2115 )
2016-11-02 13:30:49 +01:00
Emanuel Schütze
caf52094a4
Allow to resize tinymce editor ( Fixes #2115 )
2016-11-02 10:35:18 +01:00
Emanuel Schütze
c5ffa13436
Updated German translations.
2016-11-02 09:06:55 +01:00
Emanuel Schütze
259189c280
Updated template-en.po resource.
2016-11-02 00:22:13 +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
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
befb8083bf
Merge pull request #2537 from CatoTH/line-number-and-diff-caching
...
Caching results of insertLineNumbers and extractRangeByLineNumbers
2016-11-01 23:41:29 +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
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
Tobias Hößl
36e519a798
Caching results of insertLineNumbers and extractRangeByLineNumbers
2016-11-01 23:29:32 +01:00
Sean Engelhardt
14ca655aa2
Creates the Election documents using PdfMake
2016-11-01 23:18:19 +01:00
Norman Jäckel
b0ff8375a8
Merge pull request #2539 from CatoTH/bugfix-open-motions-in-original-view
...
Bugfix: Always open motions in original view
2016-11-01 22:56:33 +01:00
Norman Jäckel
3c48df1245
Merge pull request #2540 from CatoTH/diff-formattings-in-pdf
...
Colors / text-Decorations for insered / deleted text
2016-11-01 22:55:25 +01:00
Norman Jäckel
378fb46fb2
Merge pull request #2562 from emanuelschuetze/comments-editor
...
Use tinymce editor for motion comment fields.
2016-11-01 22:54:58 +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
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
Tobias Hößl
efe90c4e4d
Always open motions in original view
2016-10-29 14:30:25 +02:00
Emanuel Schütze
2a36a0e84e
Use version 2.1-dev.
2016-10-27 14:10:20 +02:00
Norman Jäckel
632fd68564
Fixed error in README and help texts of start script. Fixed #2532 .
2016-10-26 14:58:46 +02:00
Norman Jäckel
ee235309ed
Merge pull request #2523 from FinnStutzenstein/Issue2517
...
change dropdown for project agenda (closes #2517 )
2016-10-26 14:56:18 +02: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
4646cebe55
Merge pull request #2526 from FinnStutzenstein/Issue2448
...
Adding sortingoptions for creation date and last modified (closes #2448 )
2016-10-25 14:53:58 +02:00
Emanuel Schütze
147e4ab219
Merge pull request #2527 from FinnStutzenstein/Issue2522
...
fixing topics import (closes #2522 )
2016-10-25 14:46:12 +02:00
Emanuel Schütze
435e333bbb
Fix pagination and indentation of lists in import views.
2016-10-25 13:45:54 +02:00
Emanuel Schütze
21e6903368
Fix to show election results without ng-init.
...
ng-init does not watch for autoupdates.
2016-10-25 10:44:17 +02:00
FinnStutzenstein
fc21713bb4
Adding sortingoptions for creationdate and last modified ( closes #2448 )
2016-10-25 10:03:01 +02:00
FinnStutzenstein
e267784173
fixing topics import ( closes #2522 )
2016-10-24 16:38:43 +02:00
Norman Jäckel
9ca15fd0b8
Fixed migrations by skipping autoupdate.
2016-10-24 10:42:34 +02:00
FinnStutzenstein
2f03777d56
change dropdown for project agenda ( closes #2517 )
2016-10-21 13:11:25 +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
8172984a4d
Updated translation resource. Updated German translations.
...
Fixed translation strings.
2016-10-17 23:30:18 +02:00
Emanuel Schütze
35a69254af
Updated EN translation resources.
2016-10-17 22:07:25 +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
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
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
Emanuel Schütze
7ada65a628
Optimized template and translation for majority feature.
2016-10-17 17:03:42 +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
Norman Jäckel
1a54d1f4c6
Merge pull request #2505 from emanuelschuetze/fix-autoupdate-for-polls
...
Fixed autoupdate for motion and assigment polls.
2016-10-12 11:34:09 +02:00
Emanuel Schuetze
d2acbdda70
Fixed autoupdate for motion and assigment polls.
...
Send autoupdate once only after all votes are saved. Disable
autoupdate for saving incompleted vote results.
2016-10-12 11:23:53 +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
Norman Jäckel
1b218843ef
Merge pull request #2491 from emanuelschuetze/template-fixes
...
Template fixes
2016-10-07 20:07:11 +02:00
Emanuel Schuetze
af10c5aa3d
Fixed typo in projector autoupdate ( Fixes #2492 )
2016-10-07 17:02:55 +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
Emanuel Schuetze
0a2759c3ce
Updated missing German translations.
2016-10-06 21:12:31 +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
2b206a9e72
Updated German tranlsations.
2016-10-04 13:22:39 +02:00
Emanuel Schuetze
4075c1aa3f
Fixed translations strings. Updated template-en.pot.
2016-10-04 12:04:55 +02:00
Emanuel Schuetze
72651f5bbc
Updated translation resource files.
2016-10-04 11:16:03 +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
Oskar Hahn
c4f6477a4d
Merge pull request #2475 from normanjaeckel/FixBroadcast
...
Fixed broadcast. Fixed #2467 .
2016-10-01 15:49:07 +02:00
Norman Jäckel
2e7555e720
Fixed broadcast. Fixed #2467 .
2016-10-01 14:37:04 +02:00
Oskar Hahn
962deca506
Send full_data through the channel.
...
Saves db queries.
2016-10-01 13:57:53 +02:00
Oskar Hahn
97bd526dd7
Fix config cache key
2016-10-01 12:37:43 +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
Norman Jäckel
188f605973
Merge pull request #2446 from tsiegleauq/issue2441-LineNumberBlankText
...
PDF line numbers for new linenumbering.js (fixes #2441 )
2016-09-30 17:35:53 +02:00
Emanuel Schuetze
8f24039493
Remark for PR#2446: Check if 'highlight' is undefined.
2016-09-29 14:46:32 +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
sean
7ea1a7e481
PDF line numbers for new linenumbering.js ( fixes #2441 )
2016-09-27 12:59:21 +02:00
Emanuel Schütze
4a5aea0b81
Merge pull request #2444 from FinnStutzenstein/Issue2442
...
Hotfix for issue #2442
2016-09-27 12:03:32 +02:00
FinnStutzenstein
673ee1da18
hotfix
2016-09-27 11:47:57 +02:00
FinnStutzenstein
54989601a1
renamed contains to includes
2016-09-27 11:39:13 +02:00
Norman Jäckel
a02a39e7ae
Merge pull request #2438 from emanuelschuetze/fixAssignmentPollSlide
...
Fix to show invalid/valid/casted votes on assignment slide.
2016-09-26 20:51:47 +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
Emanuel Schuetze
841ec00b22
Fix to show invalid/valid/casted votes on assignment slide.
2016-09-26 20:41:42 +02:00
Emanuel Schuetze
31361f9f54
Fixed AttributeError in MotionAccessPermissions ( Fixed #2435 )
2016-09-26 20:26:59 +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
Emanuel Schütze
f305d19856
Merge pull request #2430 from tsiegleauq/issue2299-motion-katalog
...
Add motion catalog over pdfmake (fixes #2299 )
2016-09-26 14:20:46 +02:00
Sean Engelhardt
d4c4f944fe
Add motion catalog over pdfmake ( fixes #2299 )
2016-09-26 13:25:58 +02:00
Emanuel Schuetze
05326cf706
Updated translation resources.
...
Fixed some translation strings.
2016-09-26 12:44:23 +02:00
Emanuel Schütze
fb2593b5a7
Merge pull request #2429 from normanjaeckel/CheckAssignmentPollSlide
...
Updated server logic for assignment detail and poll slide. Fixed #2422 .
2016-09-24 13:40:59 +02:00
Emanuel Schütze
4363c3498a
Merge pull request #2428 from FinnStutzenstein/Issue2425
...
Removing PDF paragraph numbering (fixes #2425 )
2016-09-24 13:39:06 +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
Norman Jäckel
495ddb7d2d
Updated server logic for assignment detail and poll slide. Fixed #2422 .
2016-09-23 22:09:38 +02:00
Norman Jäckel
e340d83777
Merge pull request #2319 from matakuka/assignment_withoutabstains
...
Calculate assignment without abstains (if one candidate) (issue #2182 )
2016-09-23 16:01:04 +02:00
Norman Jäckel
117489c57e
Merge pull request #2427 from FinnStutzenstein/Issue2424
...
Adding TypeError(fixes #2424 )
2016-09-23 15:55:56 +02:00
Norman Jäckel
256a8d9203
Small style changes.
2016-09-23 15:53:04 +02:00
FinnStutzenstein
0966ad82e1
Removing PDF paragraph numbering ( fixes #2425 )
2016-09-23 15:06:47 +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
FinnStutzenstein
956cd05119
Adding TypeError( fixes #2424 )
2016-09-23 14:50:21 +02:00
Maximilian Krambach
e8fa0eca5a
New calculate percentage options (fixes issue #2182 )
2016-09-23 14:45:49 +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
Norman Jäckel
7ee80074c8
Merge pull request #2128 from lesteenman/privateMediafiles
...
Add a 'private' flag to mediafiles.
2016-09-22 23:16:50 +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
17ddef67f7
Merge pull request #2410 from FinnStutzenstein/projectorScale
...
Allow to scale the projector in the projectorcontainer greater than 100%
2016-09-22 22:01:28 +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
ceb9e70f6e
Updating lodash ( fixes #2293 )
2016-09-22 12:34:53 +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
Norman Jäckel
53c4932171
Merge pull request #2360 from FinnStutzenstein/Issue2347
...
Highlighting and jumping to lines
2016-09-21 14:58:08 +02:00
FinnStutzenstein
c3e511628f
Confirm multiple deletions ( fixes #2399 )
2016-09-21 14:43:46 +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
Erik Steenman
b48a99f21b
Add a 'private' flag to mediafiles.
...
Only users with the 'mediafiles.can_see_private' permission can create
and view these private mediafiles.
2016-09-18 15:45:54 +02:00
Norman Jäckel
00913a6333
Added management command to change config values. Fixed #2400 .
2016-09-18 13:17:21 +02:00
Emanuel Schütze
3bfa055aed
Merge pull request #2385 from FinnStutzenstein/Issue2384
...
Confirm multiple deletions (fixes #2384 )
2016-09-18 12:26:45 +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
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
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
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
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
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
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
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
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
f2c17f1787
Added password hasher settings. Fixed #2354 .
2016-09-08 00:13:01 +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
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
sean
23b7d74890
create ballot papers with pdfmake ( fixes #2298 )
2016-09-06 16:08:25 +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
a341071e91
Line-Breaking Bugfix: break before an inline element if the first word of the element exceeds the current line
2016-09-05 20:31:43 +02:00
Tobias Hößl
b701127f04
Fix a styling problem
2016-09-05 20:03:41 +02:00
Norman Jäckel
b4d4026316
Refactored user serializers for different client permissions. See #1871 .
2016-09-05 13:48:06 +02:00
Norman Jäckel
29f9203377
Merge pull request #2314 from FinnStutzenstein/Issue2137
...
new change password view (fixes #2137 )
2016-09-05 13:46:15 +02:00
Maximilian Krambach
8ec5cd3ccd
new fullscreen icon ( fixes #2316 )
2016-09-05 09:25:39 +02:00
Finn Stutzenstein
9d3b06c0a6
new change password view ( fixes #2137 )
2016-09-05 07:56:28 +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
Norman Jäckel
08c6fa11b4
Merge pull request #2291 from normanjaeckel/MotionAmendment
...
Reimplemented amendments for motions.
2016-08-31 12:39:48 +02:00
Finn Stutzenstein
78ec30d6b2
Handle duplicates during user import
2016-08-31 12:23:38 +02:00
Emanuel Schuetze
e87eb930df
Use neutral (untranslated) prefix for amendments.
...
Reason: Server cannot use the on client-side translated prefix string.
2016-08-31 12:05:33 +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
Norman Jäckel
09aa2dea72
Review.
2016-08-29 17:15:44 +02:00
Norman Jäckel
6fba75c78b
Reimplemented amendments for motions.
2016-08-29 17:14:40 +02:00
Norman Jäckel
ac6d78b0ee
Fixed groups metadata view. Upgraded to djangorestframework 3.4.x. Fixed #2275 .
2016-08-29 17:06:33 +02:00
Norman Jäckel
9fdc050048
Merge pull request #2330 from normanjaeckel/FixAutoupdate
...
Fixed autoupdate for deleted instances. Fixed #2329 .
2016-08-29 16:59:28 +02:00
Norman Jäckel
70dfe8f525
Merge pull request #2331 from emanuelschuetze/issue2182b
...
Motion config: 'calculate % without abstains' (Fixes #2182 )
2016-08-29 16:59:12 +02:00
Emanuel Schuetze
65b0772556
Some clean up and styling work for motion config 'without abstains'.
...
Manage all config strings in site.js of each app.
2016-08-29 16:40:27 +02:00
Norman Jäckel
3ea46e9dc7
Fixed autoupdate for deleted instances. Fixed #2329 .
2016-08-29 16:37:53 +02:00
Emanuel Schuetze
344d9329f9
Added template hook for each poll in assignment detail.
2016-08-29 16:26:13 +02:00
Maximilian Krambach
fc1ce3d90d
added option to calculate % based on Yes/No (for motions) ( fixes #2182 )
2016-08-29 13:07:57 +02:00
Emanuel Schuetze
f0ca4a0d98
Added template hook for assignment poll form.
2016-08-26 06:33:27 +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
Emanuel Schütze
acf24a26ee
Merge pull request #2313 from emanuelschuetze/update-translations
...
Updated translations for DE, ES, PT (used by JS, Django).
2016-08-25 17:29:43 +02:00
Maximilian Krambach
126cfb9000
Parent items for Agenda items ( fixes #2213 )
2016-08-25 13:51:54 +02:00
Emanuel Schuetze
cfdb90f6a7
Updated translations for DE, ES, PT (used by JS, Django).
2016-08-25 09:34:58 +02:00
Emanuel Schuetze
1d0dacbc2d
Fixed and updated EN translations.
2016-08-24 16:55:56 +02:00
Emanuel Schuetze
841feaba92
Updated EN translations
2016-08-24 16:04:01 +02:00
Norman Jäckel
e9c5194a17
Merge pull request #2303 from emanuelschuetze/template-hook
...
Added new template hook for motion detail template.
2016-08-24 09:35:27 +02:00
Emanuel Schütze
5a092710c9
Merge pull request #2286 from FinnStutzenstein/Issue2075
...
Fixing motion CSV import (fixes #2075 , fixes #2165 )
2016-08-23 23:17:32 +02:00
Emanuel Schuetze
984282deac
Added new template hook for motion detail template.
2016-08-23 23:08:17 +02:00
Finn Stutzenstein
0c5726b5d4
Fixing CSV import ( fixes #2075 , fixes #2165 )
2016-08-22 16:01:57 +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
cd1a2735dc
fixes an important typo in category sort
2016-08-19 09:17:28 +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
Emanuel Schütze
71c3aa5d5e
Merge pull request #2273 from normanjaeckel/NumberingCategories
...
Added possibility to sort motions in category numbering view.
2016-08-17 08:55:19 +02:00
Oskar Hahn
ff658a59c1
The start command uses only one worker ( #2271 )
...
Fixes #2198 after https://github.com/andrewgodwin/channels/pull/298 is
part of the next channels release
2016-08-17 07:48:59 +02:00
Norman Jäckel
b0070d13b9
Added possibility to sort motions in category numbering view.
2016-08-16 23:51:12 +02:00
Norman Jäckel
91ebfbac61
Merge pull request #2272 from ostcar/missing_migrations
...
Added missing migrations for #2269 .
2016-08-16 00:22:47 +02:00
Norman Jäckel
aea602acb9
Merge pull request #2256 from ostcar/fix_2248
...
Only do an autoupdate after an ongoing transaction.
2016-08-16 00:14:15 +02:00
Oskar Hahn
8d58368937
Added missing migrations for #2269
2016-08-15 19:15:05 +02:00
Emanuel Schütze
243ef7ae5d
Merge pull request #2257 from FinnStutzenstein/Issue2249
...
No crash without a browser (fixes #2249 )
2016-08-15 09:47:17 +02:00
Oskar Hahn
ee2f6b500b
Only do an autoupdate after an ongoing transaction.
...
This needs at least django 1.9
Fixes : #2248
2016-08-13 10:08:10 +02:00
Oskar Hahn
fac9e71c29
Remove default permissions for session
...
fixes #2262
2016-08-13 07:37:27 +02:00
Emanuel Schütze
d2c5646ce4
Merge pull request #2254 from matakuka/mini_issues
...
Repairs assignment ballots for candidates with structure_level
2016-08-09 20:43:33 +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
Norman Jäckel
9813edf490
Merge pull request #2252 from ThomasJunk/mediafix
...
Added static media handling (Fixes 2223)
2016-08-09 16:03:22 +02:00
Thomas Junk
dec7cb9002
Added static media handling ( Fixes #2223 )
...
Now DEBUG compatible
Commit fe64941aab
2016-08-09 14:56:18 +02:00
Finn Stutzenstein
12af0256dd
No crash without a browser ( fixes #2249 )
2016-08-09 08:22:04 +02:00
Emanuel Schütze
54ee068057
Merge pull request #2243 from FinnStutzenstein/master
...
Fixing issue #2127
2016-08-05 16:13:19 +02:00
Finn Stutzenstein
b115691675
Messages now allow HTML tags ( Fixes #2127 )
2016-08-05 12:38:19 +02:00
Maximilian Krambach
350a60722c
repairs ballots for candidates with structure_level
2016-08-05 09:53:10 +02:00
Norman Jäckel
81bcb19847
Merge pull request #2221 from matakuka/issue2214
...
Added user field "number" (fixes #2214 )
2016-08-04 10:21:17 +02:00
Emanuel Schütze
6cec9e9f87
Merge pull request #2251 from normanjaeckel/WooshAsync
...
Used whoosh.writing.AsyncWriter. See #2198 .
2016-08-03 21:42:58 +02:00
Maximilian Krambach
371945e36e
adding user field "number" ( fixes #2214 )
2016-08-03 16:55:03 +02:00
Norman Jäckel
7f1b894db4
Used whoosh.writing.AsyncWriter. See #2198 .
2016-08-03 16:46:52 +02:00
Norman Jäckel
f191956dd9
Fixed error in autoupdate. See #2248 .
2016-08-03 16:12:52 +02:00
Norman Jäckel
e688a345c0
Merge pull request #2230 from emanuelschuetze/remove-assignment-config
...
Remove unused assignment config to publish winner results only.
2016-08-03 15:58:35 +02:00
joelmacht
19592f1eea
Add tags for assingments
2016-08-03 14:48:12 +02:00
Maximilian Krambach
f2f7ddf072
translations issue #2197
2016-08-01 16:23:20 +02:00
Norman Jäckel
d3cd2d72dc
Merge pull request #2225 from normanjaeckel/NumberCategories
...
Added viewpoint to number all motions in a category.
2016-07-29 12:30:09 +02:00
Emanuel Schuetze
8d52d4a1c6
Remove unused assignment config to publish winner results only. ( Fixes #2145 )
2016-07-29 12:29:53 +02:00
Norman Jäckel
646540ee17
Merge pull request #2233 from emanuelschuetze/motionOrigin
...
Use origin field in motion detail and list view (Fixes #2227 )
2016-07-29 12:16:19 +02:00
Norman Jäckel
7e6dc50b39
Added viewpoint to number all motions in a category.
2016-07-29 11:56:12 +02:00
Emanuel Schuetze
88715646ba
Show user fields is_committee and is_active in list view. ( Fixes #2217 )
...
New icon for is_committee and is_active.
Check is_committee field for csv import.
2016-07-29 11:37:51 +02:00
Norman Jäckel
4b9767b09e
Added new user field is_committee and new default group Committees.
2016-07-29 11:37:51 +02:00
Emanuel Schütze
aca01c466c
Merge pull request #2222 from matakuka/issue2210
...
add "delete all speakers" button (feature, issue #2210 )
2016-07-28 11:11:31 +02:00
Maximilian Krambach
589137ece7
add "delete all speakers" button ( fixes #2210 )
2016-07-28 10:51:33 +02:00
Emanuel Schuetze
af16733b36
Use origin field in motion detail and list view ( Fixes #2227 )
2016-07-27 16:16:22 +02:00
Emanuel Schütze
45321b6139
Merge pull request #2226 from normanjaeckel/MotionOrigin
...
Added motion origin field.
2016-07-27 16:14:31 +02:00
Emanuel Schuetze
8208f44108
Updated German translations.
2016-07-27 14:10:04 +02:00
Norman Jäckel
0b9a64f968
Added motion origin field.
2016-07-13 14:45:40 +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
Norman Jäckel
207db4de89
Merge pull request #2186 from tsiegleauq/issue2164
...
Add translatable entries for QuickEdit (Fixes #2164 )
2016-07-10 23:24:36 +02:00
Maximilian Krambach
31df629fc9
sets language to en if no browser language is set
2016-07-06 09:52:32 +02:00
Sean Engelhardt
520f8362fa
Add translatable entries for QuickEdit ( Fixes #2164 )
2016-06-28 14:06:46 +02:00
Emanuel Schuetze
31657d0cf3
Fixed and update English translation strings.
2016-06-28 10:18:43 +02:00
Emanuel Schuetze
31c509f288
Updated EN source translation files.
2016-06-20 21:03: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
Emanuel Schütze
7a94b6511b
Merge pull request #2189 from matakuka/YesNoVotes
...
adding option "yes/no for each candidate"
2016-06-12 11:11:10 +02:00
Joel Macht
b7d83e786f
Fix linebreak on tags, add spacing and remove commas ( Fixes #2147 )
2016-06-10 18:17:42 +02:00
Maximilian Krambach
3157ac59f2
adding option "yes/no for each candidate"
2016-06-10 14:13:01 +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
a8595ab234
Merge pull request #2185 from tsiegleauq/issue2156
...
Fix pagination when agenda got >100 entrys (Fixes #2156 )
2016-06-08 10:45:07 +02:00
Norman Jäckel
13e7e1b1e1
Merge pull request #2176 from tsiegleauq/issue2133
...
Limit selection of files to csv and txt (Fixed #2133 )
2016-06-08 10:41:52 +02:00
Sean Engelhardt
235eed1172
Fix pagination when agenda got >100 entrys ( Fixes #2156 )
2016-06-07 14:17:36 +02:00
Sean Engelhardt
62310c83ae
Limit selection of files to csv and txt ( Fixed #2133 )
...
agenda, motions, users csv import
2016-06-07 11:34:02 +02:00
Norman Jäckel
294fb7ebc5
Fixed motion PDF if motions have no identifier. Fixed #2158 .
2016-06-06 14:26:16 +02:00
Norman Jäckel
8c5c5dc556
Fixed bug on config view.
2016-06-06 14:19:57 +02:00
Oskar Hahn
f2570551a1
Merge pull request #2175 from ostcar/config
...
Redesign of the config variables.
2016-06-04 01:12:50 +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
Sean Engelhardt
d0c9450d02
Updated German translations ( Fixes #2132 )
2016-05-31 15:00:38 +02:00
Oskar Hahn
416c2646fe
Order speaker on projector
...
fixes #2138
2016-05-28 19:22:49 +02:00
Emanuel Schütze
61976f47f0
Merge pull request #2144 from normanjaeckel/SettingsFix
...
Fixed example text in settings.
2016-05-28 15:42:17 +02:00
Emanuel Schuetze
80b6dcc971
Updated Spanish translation.
...
Thanks to johnfelipe!
Fixed: Define missing Spanish translation in django settings file.
2016-05-25 09:58:55 +02:00
Norman Jäckel
253d615755
Fixed example text in settings.
2016-05-17 14:16:44 +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
Norman Jäckel
e968c88cc1
Update version to 2.0.1-dev
2016-04-17 22:49:17 +02:00
Norman Jäckel
347cf478f8
Release 2.0
2016-04-17 22:49:17 +02:00
Emanuel Schuetze
e0b73ff68a
Use group_id instead of group in User form views
2016-04-17 22:42:56 +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
7ebedb1fdd
Use always user.groups_id ( Fixes #2081 )
...
- Fix rest api: send always groups_id (instead of groups).
- Fix JS-Data-Store: Add hasMany relations for user.groups.
- Fix templates: use field 'groups_id' instead of 'groups'.
2016-04-14 22:13:28 +02:00
Emanuel Schuetze
9481d037e8
Reduce sizes of used logos.
2016-04-13 11:06:50 +02:00
Norman Jäckel
8d5e983d29
Merge pull request #2077 from emanuelschuetze/translations
...
Translations
2016-04-12 23:47:38 +02:00
Emanuel Schuetze
b8194a0b54
Updated all translations (angular-gettext).
2016-04-12 22:58:40 +02:00
Emanuel Schuetze
7229c8dc3a
Fix translation strings.
2016-04-12 22:47:46 +02:00
Emanuel Schuetze
7e5ea61b34
Hide candidate list if assignment phase is finished (2).
2016-04-12 22:41:15 +02:00
Emanuel Schuetze
f5125d0d23
Add content object (motion/election) in agenda sort view.
2016-04-12 22:33:53 +02:00
Emanuel Schuetze
07d95fd10a
Allow to show vote value '0' in motion poll result view.
2016-04-12 22:26:13 +02:00
Norman Jäckel
27c8d511f0
Used exit method from sys library. Fixed #2065 .
2016-04-07 00:43:53 +02:00
Emanuel Schuetze
cb605d619e
Mark missing translation string.
2016-04-03 11:53:40 +02:00
Norman Jäckel
331da7f300
Update version to 2.0-dev.
2016-03-21 21:13:52 +01:00
Norman Jäckel
5842ad86f4
Release 2.0b5
2016-03-21 21:13:28 +01:00
Norman Jäckel
d51652ff72
Merge pull request #2061 from emanuelschuetze/template-Fixes
...
Template fixes
2016-03-21 20:03:43 +01:00
Emanuel Schuetze
4b06fa225f
Updated all translations. ( Fixes #2043 )
...
Thanks to all translators of FR, PT, CS, ES and DE!
2016-03-21 19:57:45 +01: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
Emanuel Schuetze
815f03145c
Use specific host and port for 'openslides start'. ( Fixes #1987 )
2016-03-21 00:06:15 +01:00
Emanuel Schuetze
fb0fd3fe8c
Updated EN translation resource files.
2016-03-20 23:31:13 +01:00
Norman Jäckel
6d62516499
Merge pull request #2056 from ostcar/master
...
Fix #2050
2016-03-20 21:22:11 +01:00
Norman Jäckel
e2383dc770
Merge pull request #2051 from emanuelschuetze/templateFixes2
...
Template improvements
2016-03-20 21:21:52 +01:00
Oskar Hahn
46ba039cd5
Fix #2050
2016-03-20 21:08:57 +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
7cba7c42a4
Merge pull request #2055 from emanuelschuetze/fix2048
...
Catch JS error "this.getVersion(...) is undefined" (Fixes #2048 )
2016-03-20 21:06:39 +01:00
Emanuel Schuetze
85ffe4d8fa
Catch JS error "this.getVersion(...) is undefined" ( Fixes #2048 )
2016-03-20 20:52:34 +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
9ab182184f
Updated EN translation JS resource.
2016-03-18 20:11:56 +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
794fa9faf1
Updated EN translation JS resource file.
2016-03-17 12:48:06 +01:00
Emanuel Schuetze
ace335f7cc
Fix missing translation string.
2016-03-17 12:47:44 +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
Norman Jäckel
15119ab28b
Merge pull request #2041 from emanuelschuetze/fix2020
...
New configs for font color in header and h1 on projector (Fixes #2020 )
2016-03-08 23:16:28 +01:00
Emanuel Schuetze
b9fed84732
Updated EN language files.
2016-03-08 23:01:20 +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
Emanuel Schuetze
f47055c13a
Fix 'stop' speech button in Safari ( Fixes #2029 )
...
Use '{}' instead of empty 'JSON.stringify()'.
2016-03-08 20:23:12 +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 Schütze
2097121e45
Merge pull request #2030 from normanjaeckel/FixAgendaGetQueryset
...
Fixed get_queryset method of ItemViewSet. Fixed #2027 .
2016-03-06 22:48:50 +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
78565ffd25
Updated migrations.
2016-03-06 14:36:50 +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
Norman Jäckel
e598b308f0
Merge pull request #2033 from emanuelschuetze/fix1949
...
Allow pdf scrolling on projector (Fixes #1949 ).
2016-03-06 14:19:06 +01:00
Emanuel Schuetze
b78c9bc7bd
Allow pdf scrolling on projector ( Fixes #1949 ).
2016-03-05 22:44:00 +01:00
Emanuel Schuetze
921ec3ab72
Remove 'can_see_extra_data' permission from registered and anonymous groups.
...
Now, only staff users has this permission by default. (Fixed #2004.)
Some more work on users/groups template:
- Added description to permission string to show that only 'present' and
'comment' fields are affected by this permission.
- Allowed to create groups without permissions.
- Fixed showing group names in users lists view for staff and normal users.
2016-03-05 22:12:29 +01:00
Norman Jäckel
bc93b61a02
Fixed get_queryset method of ItemViewSet. Fixed #2027 .
2016-03-04 11:48:20 +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
7da48efd4c
Fixed TypeError in agenda views. Fixed #2023 .
2016-03-03 00:23:41 +01:00
Norman Jäckel
3c6d4d5e30
Fixed gulp jshint task.
2016-03-02 16:51:40 +01:00
Norman Jäckel
de871f3f9c
Squished migrations files.
2016-03-02 14:26:47 +01:00
Norman Jäckel
ca3cfae8b3
Changed name of '--development' option and name of the respective directory. Fixed #2001
2016-03-01 17:38:14 +01:00
Emanuel Schütze
8d1de6923b
Merge pull request #2017 from normanjaeckel/FixMotionPoll
...
Fixed error in motion poll serializer. Fixed #2014 .
2016-02-28 00:21:04 +01:00
Norman Jäckel
bc49f00c66
Fixed error in motion poll serializer. Fixed #2014 .
2016-02-27 21:34:26 +01:00
Norman Jäckel
872d73b5cf
Merge pull request #2016 from normanjaeckel/GetContext
...
Rename and refactor some ProjectorElement methods. Fixed #1631 .
2016-02-27 21:24:18 +01:00
Norman Jäckel
a2a6637c89
Rename and refactor some ProjectorElement methods. Fixed #1631 .
2016-02-27 20:56:03 +01:00
Emanuel Schuetze
1d314db487
Show special vote values for motion polls on projector.
2016-02-27 20:10:24 +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 Schütze
2b239f2214
Merge pull request #2003 from emanuelschuetze/fix1820
...
Reload after login and logout (Fixes #1820 )
2016-02-25 13:51:44 +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
d3d73a019d
Fix translations in group detail template.
2016-02-25 13:37:55 +01:00
Emanuel Schuetze
06f7515ca4
Reload after login and logout ( Fixes #1820 )
...
Not very nice solution but with DS.clear() we have to do a lot of more
work with high effort. Can improved later.
2016-02-25 10:22:05 +01:00
Emanuel Schütze
88b2e8a73e
Merge pull request #2000 from normanjaeckel/VotesQuery
...
Optimized number of queries for motion serializing. Fixed #1655 .
2016-02-24 11:10:11 +01:00
Norman Jäckel
758180e7cc
Optimized number of queries for motion serializing. Fixed #1655 .
2016-02-24 10:30:52 +01:00
Norman Jäckel
544b28cacf
Fixed coding style in some JS files. Fixed #1979 .
2016-02-24 09:56:27 +01:00
Norman Jäckel
e57a83f45b
Merge pull request #1997 from emanuelschuetze/fix1817
...
Get success message in user edit form when default password is resetted
2016-02-24 00:45:05 +01:00
Emanuel Schütze
0cbb3fba01
Merge pull request #1996 from normanjaeckel/LanguageHeader
...
Added language header to internal server requests. Fixed #1981 .
2016-02-23 23:54:44 +01:00
Emanuel Schuetze
bed96f66b0
Get success message in user edit form when default password is resetted ( Fixes #1817 ).
2016-02-23 23:51:42 +01:00
Norman Jäckel
73cc1a5dfb
Merge pull request #1995 from emanuelschuetze/fix1991
...
Add/Remove a group to selected users (Fixes #1991 )
2016-02-23 23:37:57 +01:00
Norman Jäckel
3ea4c507cf
Added language header to internal server requests. Fixed #1981 .
2016-02-23 23:19:38 +01:00
Emanuel Schuetze
e284b79c8e
Add/Remove a group to selected users ( Fixes #1991 )
2016-02-23 23:16:13 +01:00
Emanuel Schütze
ca5f707f74
Merge pull request #1994 from normanjaeckel/FileNotFound
...
Fixed error if a PDF file was deleted from the server. Fixed #1988 .
2016-02-23 22:44:35 +01:00
Norman Jäckel
9a94dfc735
Merge pull request #1993 from emanuelschuetze/fix1710
...
Added motion poll pdf (Fixes #1710 ).
2016-02-23 22:38:28 +01:00
Norman Jäckel
e8402f6ffa
Fixed error if a PDF file was deleted from the server. Fixed #1988 .
2016-02-23 22:35:04 +01:00
Emanuel Schuetze
eebb621a98
Added motion poll pdf ( Fixes #1710 ).
2016-02-23 22:27:03 +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
150744e607
Fixed showing users filters.
2016-02-20 11:35:51 +01:00
Emanuel Schuetze
b0b858a808
Mediafile PDF controls: set 'page-fit' (100%) by default, disabled previous/next buttons
2016-02-20 11:29:38 +01:00
Emanuel Schuetze
de276d951c
Update version to 2.0b5-dev
2016-02-17 21:24:14 +01:00
Emanuel Schuetze
51358aba51
Release 2.0b4
2016-02-17 21:24:14 +01:00
Emanuel Schuetze
0e40735931
Fix motions and users csv import.
2016-02-17 21:19:26 +01:00
Emanuel Schütze
ecb29a1403
Merge pull request #1980 from normanjaeckel/PluginAPI
...
Updated API for plugins.
2016-02-17 20:40:40 +01:00
Emanuel Schuetze
8c4d1e24df
Updated all lanuages (JS only)
2016-02-17 20:18:45 +01:00
Emanuel Schuetze
2473a6ef69
Updated angular-gettext EN source.
2016-02-17 17:58:04 +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
dcc325c716
Fixed test plugin.
2016-02-16 23:04:26 +01:00
Norman Jäckel
d181eedeb9
Updated API for plugins.
2016-02-16 22:33:41 +01:00
Emanuel Schütze
956bba9a13
Merge pull request #1978 from normanjaeckel/ChangeProfileFix
...
Fixed groups attribute of user in the client. Fixed #1974 .
2016-02-16 21:02:53 +01:00
Norman Jäckel
df06abe70e
Fixed groups attribute of user in the client. Fixed #1974 .
2016-02-16 14:18:20 +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
Oskar Hahn
481822219a
Fix autoupdate of motion title
...
fix #1954
2016-02-13 07:15:47 +01:00
Norman Jäckel
198f09801c
Fixed error in poll default_votes_validator. Fixed #1967 .
2016-02-11 18:02:57 +01:00
Emanuel Schuetze
322957eb7e
Fixed motion edit url.
2016-02-09 23:05:36 +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
Emanuel Schütze
9fda27dfd6
Merge pull request #1965 from normanjaeckel/BadVoteValues
...
Fixed validation of default votes in assignment and motion poll. Fixe…
2016-02-09 21:43:11 +01:00
Norman Jäckel
60b6a7efe1
Fixed validation of default votes in assignment and motion poll. Fixed #1959 .
2016-02-09 21:14:01 +01:00
Emanuel Schuetze
c383147f7b
Updated German translations for django.po
2016-02-09 16:54:08 +01:00
Emanuel Schuetze
0dd3c3158f
Updated angular-gettext en source file.
2016-02-09 16:49:55 +01:00
Emanuel Schuetze
eae50b46de
Fixed closing tag for correct translation string
2016-02-09 16:49:32 +01:00
Norman Jäckel
0fe2b9cd8a
Merge pull request #1962 from emanuelschuetze/templateFixes3
...
Motion state translation strings are still used by motion pdf.
2016-02-09 09:32:21 +01:00
Emanuel Schuetze
7248673b47
Motion state translation strings are still used by motion pdf.
...
Reverted partly the changes in motion/signmals.py by a8544f016d
2016-02-09 00:11:48 +01:00
Emanuel Schuetze
31102bd9d7
Refactored MotionPoll.
...
Use new getVotes function for vote value and percent value.
Remove 'to_representation' function in motion serializer.py to get
special values in numbers (-1,-2) instead of translated strings.
2016-02-08 23:56:44 +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
0a4cdb3717
Used copy of motionpoll for MotionPollUpdate dialog.
2016-02-08 21:41:01 +01:00
Emanuel Schuetze
82f2c4f003
Fixed quickEdit mode in agenda, motion, assignment.
...
Refresh motion object after cancel.
2016-02-08 21:37:20 +01:00
Emanuel Schuetze
6ba47a64d3
Agenda list view: allow to delete also motion and assignment items.
...
Fixes #1943
2016-02-08 21:07:35 +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
Norman Jäckel
2ba675c1b6
Fixed assignment PDF. Fixed #1940 .
2016-02-05 21:22:47 +01:00
Emanuel Schuetze
494c9aee94
Refactored AssignmentPoll ( Fixed #1848 )
...
Add percents and progressbars.
Template fixes and improvements for polls.
2016-02-05 00:32:18 +01:00
Emanuel Schuetze
d92e7e0ecf
Update version to 2.0b4-dev
2016-02-03 21:18:59 +01:00
Emanuel Schuetze
7a785b3092
Release 2.0b3
2016-02-03 21:18:45 +01:00
Emanuel Schuetze
f944efaf76
Show html text in motion and users detail view correctly.
...
Remove white-space-pre-line css class.
2016-02-03 21:04:46 +01:00
Emanuel Schuetze
6997e49851
Updated languages DE, PT, FR, CS, ES (angular-gettext only)
2016-02-03 20:27:56 +01:00
Emanuel Schuetze
142ceaaffc
Updated EN source file for angular-gettext.
2016-02-03 15:32:35 +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
Norman Jäckel
8b72f6d821
Merge pull request #1933 from emanuelschuetze/agendaTree
...
Optimize agenda tree save method on client side.
2016-02-01 23:56:20 +01:00
Oskar Hahn
09cbe8c9e4
Fix the autoupdate
2016-02-01 23:21:50 +01:00
Emanuel Schuetze
f30d62a11f
Optimize agenda tree save method on client side.
...
with ui-tree
Fixes #1660
2016-02-01 23:06:13 +01:00
Oskar Hahn
a2d8b41d55
Merge pull request #1931 from normanjaeckel/LocalHostVar
...
Refactored logic in autoupdate.py concerning wsgi network connection …
2016-02-01 21:27:13 +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
Norman Jäckel
6541d49c99
Merge pull request #1928 from emanuelschuetze/updateTranslations
...
Show missing translations. Updated de and pt.
2016-01-31 10:19:18 +01:00
Emanuel Schuetze
2e0d57d310
Updated EN translation source files.
2016-01-30 11:34:47 +01:00
Norman Jäckel
af0f8fcac6
Refactored logic in autoupdate.py concerning wsgi network connection variables. Fixed #1929."
2016-01-30 10:18:15 +01:00
Norman Jäckel
01aad229fe
Fixed login modal info text. Fixed #1924 .
2016-01-30 10:04:20 +01:00
Norman Jäckel
15bb62b39a
Merge pull request #1926 from ostcar/fix_autoreload_in_django_1.9
...
Fix the start command not to reload if debug is False
2016-01-30 09:58:13 +01:00
Emanuel Schuetze
fb41d0a219
Show missing translations. Updated de and pt.
2016-01-30 09:20:53 +01:00
Norman Jäckel
144037ff57
Merge pull request #1922 from ostcar/fix_tornado_on_windows
...
fix tornado on windows
2016-01-29 23:30:04 +01:00
Emanuel Schuetze
1216ea99d3
Refactor reconnect function of autoupdate.
2016-01-29 16:30:00 +01:00
Oskar Hahn
fbf8b0aa62
Fix the start command not to reload if debug is False
2016-01-29 09:51:12 +01:00
Emanuel Schuetze
3cd49704fc
Use correct special html character for projector template title.
2016-01-29 09:14:26 +01:00
Oskar Hahn
9292558db7
fix tornado on windows
2016-01-28 16:19:14 +01:00
Norman Jäckel
2aa31bffbf
Updated version to 2.0-dev
2016-01-27 23:41:16 +01:00
Norman Jäckel
95ac91893c
Release 2.0b2
2016-01-27 23:41:16 +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
c4281c6bc7
Merge pull request #1912 from emanuelschuetze/fixAgenda
...
Check if user is allowed to see detail view link in agenda list.
2016-01-27 22:25:56 +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
3c7d03547c
Set default of item.weigth to 10000.
...
So new items are placed at the end of agenda.
After sorting weight is updated.
2016-01-27 22:16:46 +01:00
Emanuel Schuetze
0ce0b9cd18
Fixed gulp 'pot' task. Fixed typos in translation strings.
2016-01-27 22:11:24 +01:00
Emanuel Schuetze
fc22711a9c
Check if user is allowed to see detail view link in agenda list.
...
Fixes #1886
2016-01-27 21:19:32 +01:00
Norman Jäckel
4aaa474761
Updated language files.
2016-01-27 20:55:27 +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
Norman Jäckel
b133ef2556
Merge pull request #1909 from emanuelschuetze/remarks1898
...
Fixed remarks from #1898 .
2016-01-27 20:09:01 +01:00
Emanuel Schuetze
09b397f3b1
Fixed remarks from #1898 .
2016-01-27 20:03:53 +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
Oskar Hahn
6970235f23
Revert "Add upload feature to mediafiles module"
2016-01-27 15:28:59 +01:00
André Böhlke
3c691b9937
work on pdf presenter support
2016-01-27 19:33:30 +07: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
Norman Jäckel
741cae028c
Merge pull request #1896 from normanjaeckel/AgendaNumbering
...
Fixed agenda numbering. Fixed #1892 .
2016-01-27 10:39:12 +01:00
Emanuel Schuetze
2a9e0b4b81
Implement full text search (client side) Fixes #1699
2016-01-27 00:16:30 +01:00
Norman Jäckel
fdd62cb342
Fixed agenda numbering. Fixed #1892 .
2016-01-26 16:13:33 +01:00
Oskar Hahn
23ad11d232
Merge pull request #1897 from normanjaeckel/PermDisplayName
...
Changed display name of permissions in GroupViewSet. Fixed #1895 .
2016-01-26 10:02:48 +01:00
Norman Jäckel
61a8c31ff5
Changed display name of permissions in GroupViewSet. Fixed #1895 .
2016-01-25 22:35:23 +01:00
Norman Jäckel
87ba8fe4a5
Merge pull request #1894 from ostcar/fix_search
...
Fix Search on server side
2016-01-25 22:10:52 +01:00
Oskar Hahn
339b3891da
Fix Search on server side
2016-01-25 21:12:34 +01:00
Norman Jäckel
87e3c536da
Deleted Django default permission of some apps. Fixed #1643 .
2016-01-25 14:48:54 +01:00
Emanuel Schuetze
f4e4166e24
Refactoring mediafile templates. ( Fixes #1839 , #1818 , #1833 )
...
- uploader not visible/loaded after reload list view
- use same list view style as in other apps
- use dialog for create/edit form
- show error message in form
- edit form: remove file upload form element, add uploader form element
- create form: add uploader form element (only if user has manager permissions)
- Refactor mediafile upload method
- show not-implemented message for project pdf
- use pdf filter in list view
2016-01-25 10:11:16 +01:00
Norman Jäckel
fecaad844b
Fixed mediaifle app.
2016-01-24 22:58:45 +01:00
Norman Jäckel
673a761f6d
Merge pull request #1877 from emanuelschuetze/translationFix
...
Add Translation strings and updated po files
2016-01-24 22:17:56 +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
4616f38fd5
Updated EN translation files.
2016-01-24 00:37:58 +01:00
Emanuel Schuetze
a8544f016d
Mark all motion state names as translatable in JS. ( Fixes #1864 )
...
Updated README for how to update translations.
2016-01-24 00:37:54 +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
7bc1851a09
Use osFilter for motions, assignments and mediafiles. ( Fixes #1784 )
2016-01-21 23:20:14 +01:00
Emanuel Schuetze
b4482afa38
Show username in UserUpdateForm ( Fixes #1781 )
2016-01-21 22:34:18 +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
23e7b3aaf5
Fixed translation string.
2016-01-21 19:58:50 +01:00
Emanuel Schuetze
4125efbfe6
Added agendaSupplement for agenda item title.
...
Added padding-left for child item cells.
2016-01-18 21:40:50 +01:00
Emanuel Schuetze
76dc29cddf
Use uib-alert instead of deprecated alert tag.
2016-01-18 21:09:28 +01:00
Emanuel Schuetze
c4468f93ac
Format timestamp in mediafile list view.
2016-01-18 21:02:37 +01:00
Emanuel Schuetze
620d0121c8
Do not show group "Registered" in users list/detail view.
2016-01-18 20:51:44 +01:00
Emanuel Schuetze
6986db5e69
Set default of use is_present/is_active to true.
2016-01-18 16:29:15 +01:00
Emanuel Schuetze
8ac3254d04
Show title in participant names.
2016-01-18 16:28:48 +01:00
Emanuel Schuetze
d083309a30
Show candidates on assignments slide.
2016-01-18 16:27:50 +01:00
Emanuel Schuetze
59a7a02cfe
Added version history ( Fixes #1676 )
2016-01-18 00:15:28 +01:00
Emanuel Schuetze
7967da0b4e
Allow 'trivial changes' in motion update ( Fixes #1863 )
2016-01-17 22:32:52 +01:00
Emanuel Schuetze
8bf82a0306
Added meta box in assignment detail view ( Fixes #1866 )
2016-01-17 22:32:52 +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
3ed5b2bb1b
Merge pull request #1862 from emanuelschuetze/injectUser
...
Modify user in form dialog without updating list/detail view.
2016-01-15 16:02:53 +01:00
Emanuel Schuetze
e6cf28cbeb
Modify user in form dialog without updating list/detail view.
...
Create deep copy of user object before modify user in form dialog.
So list/detail view is not updated while editing.
Before saving inject the changed user (copy) object back into DS
store. Refresh user from DB is save request fails.
2016-01-15 13:50:05 +01:00
Emanuel Schuetze
d8aee16fec
Added missing motionpoll-form template. Fix remark in motion-detail.
2016-01-15 09:46:55 +01:00
Oskar Hahn
ffe80e8da3
Merge pull request #1852 from normanjaeckel/AssignmentFixes
...
Fixed several things in assignment app. See #1838 .
2016-01-15 09:37:18 +01:00
Oskar Hahn
bac4e2c21f
Merge pull request #1865 from normanjaeckel/MediafileFix
...
Added possibility for non staff users to upload new files. See #1856 .
2016-01-15 09:33:06 +01:00
Oskar Hahn
4ffbd8be29
Merge pull request #1868 from normanjaeckel/TrivialChanges
...
Enabled the option to disabled version for motion update requests.
2016-01-15 09:31:30 +01:00
Oskar Hahn
00610d9a63
Merge pull request #1870 from normanjaeckel/DelegateMotionEdit
...
Add quick fix to motion update view.
2016-01-15 09:26:05 +01:00
Emanuel Schuetze
694ed6f1cc
Motion template fixes
...
- Add has_votes to motion serializer and add poll.has_votes check in motion detail view.
- Fix motion meta box 3 column layout.
- Added missing intents
- Show motionPoll edit form in dialog. Moved into new template.
- Clean up assignmentpoll form (like motionPoll)
2016-01-15 00:03:29 +01:00
Norman Jäckel
1eeed1fde9
Add quick fix to motion update view.
2016-01-15 00:03:17 +01:00
Norman Jäckel
01ee197eb6
Enabled the option to disabled version for motion update requests.
2016-01-14 23:23:15 +01:00
Norman Jäckel
ae6875aa93
Added possibility for non staff users to upload new files. See #1856 .
2016-01-14 22:55:43 +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
441c297986
Fixed several things in assignment app. See #1838 .
...
Fixed "Add Me" and "Remove Me" button.
Show poll results for normal users.
Reverse ballot tab order.
2016-01-13 16:11:01 +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
cffed7aa3e
Updated German translations.
2016-01-13 14:47:45 +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
Emanuel Schuetze
a2721f9589
Updated translation pot files
2016-01-13 11:44:53 +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
Oskar Hahn
4a3cefadb1
Merge pull request #1834 from normanjaeckel/Assignment
...
Assignment
2016-01-12 14:58:07 +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
e2145f9777
Fixed candidate button.
2016-01-10 11:27:17 +01:00
Norman Jäckel
8bdbdd0b07
Merge pull request #1832 from ostcar/fix_agenda_title
...
Always use item.getTitle() instead of item.title
2016-01-10 11:26:44 +01:00
Oskar Hahn
dd120bbf91
Merge pull request #1831 from emanuelschuetze/templateFixes2
...
Several fixes for 2.0b2
2016-01-10 11:26:37 +01:00
Emanuel Schuetze
f9f3af245e
Template fixes.
...
- Use PATCH request for user profile update.
2016-01-10 11:18:13 +01:00
Oskar Hahn
b6f4c3cc15
Always use item.getTitle() instead of item.title
2016-01-10 11:10:14 +01:00
Oskar Hahn
fd6190b7a7
Change the speaker management buttons in the speaker page
2016-01-10 10:26:20 +01:00
Norman Jäckel
896ac28c30
Added number of candidates to assignment list view.
2016-01-10 10:23:55 +01:00
Oskar Hahn
dc80efeee9
Fix syntaxerror in python
2016-01-10 09:47:08 +01:00
Oskar Hahn
78640a27f1
Remove item id from error message "{user} is already on the list of speakers."
2016-01-10 09:32:06 +01:00
Norman Jäckel
7dd9edec8b
Merge pull request #1819 from normanjaeckel/Attachment
...
Fixed mediafile model. Fixed #1808 .
2016-01-10 01:08:24 +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
Norman Jäckel
2cfa7517a8
Fixed mediafile model. Fixed #1808 .
2016-01-10 01:05:57 +01:00
Oskar Hahn
87d647ac4d
Merge pull request #1824 from ostcar/fix_tornado
...
Fix tornado
2016-01-10 01:03:16 +01:00
Oskar Hahn
ccf88ec4d5
Switch host and port
2016-01-10 01:02:18 +01:00
Emanuel Schuetze
071b0a76be
Fixed permissions in list views.
2016-01-10 01:02:13 +01:00
Oskar Hahn
4ee2b85b76
Merge pull request #1821 from normanjaeckel/LoginView
...
Fixed alerts on login form.
2016-01-10 00:59:03 +01:00
Oskar Hahn
f4e91caeaf
Merge pull request #1822 from normanjaeckel/ChatBox
...
Disabled autocomplete for chat box.
2016-01-10 00:58:45 +01:00
Oskar Hahn
ffa60e8d06
show user about me as html
2016-01-10 00:57:09 +01:00
Norman Jäckel
83ac20a704
Fixed strange empty field for sorting list of speakers.
2016-01-10 00:56:04 +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
Norman Jäckel
5a1317eb19
Fixed alerts on login form.
2016-01-10 00:38:59 +01:00
Oskar Hahn
b968a92630
fix autoupdate when openslides runs on a other port then 8000
2016-01-10 00:17:00 +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
2e104d07b7
Removed possibility to block candidates. Fixes #1708 .
2016-01-09 18:05:41 +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
Norman Jäckel
ae315d388b
Merge pull request #1804 from ostcar/remove_old_search
...
Remove old haystack files
2016-01-09 17:01:42 +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
b7d63afc91
Remove old haystack files
2016-01-09 16:50:39 +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
Emanuel Schuetze
54b1c8e350
Show agenda titles with correct numbering
2016-01-09 14:01:30 +01:00
Oskar Hahn
622dadd4ef
Merge pull request #1795 from normanjaeckel/StaticImpressumPage
...
Added config field for legal notes.
2016-01-09 13:22:54 +01:00
Norman Jäckel
d7e39be708
Added config field for legal notes.
2016-01-09 13:01:18 +01:00
Oskar Hahn
4b69c57c78
Merge pull request #1789 from ostcar/update_requirements
...
Update requirements
2016-01-09 12:22:41 +01:00
Oskar Hahn
552998b067
Update requirements, fixt a lot of warnings
...
Set python 3.4 as minimal supported python version
2016-01-09 12:19:46 +01:00
Oskar Hahn
cad252cd2b
Merge pull request #1794 from normanjaeckel/LockoutProtextion
...
Added lockout protection, see #1452 .
2016-01-09 12:19:28 +01:00
Norman Jäckel
cb22071886
Added lockout protection, see #1452 .
2016-01-09 12:07:31 +01:00
Oskar Hahn
96328f033b
Merge pull request #1793 from emanuelschuetze/fixAssignmentPhasesRequest
...
Send assignments OPTION request for phases once only.
2016-01-09 12:05:57 +01:00
Oskar Hahn
db22d1f7dc
Merge pull request #1777 from emanuelschuetze/fix1662
...
Sort list of speakers (Fixes#1662)
2016-01-09 12:04:38 +01:00
Oskar Hahn
091c08dabd
Merge pull request #1788 from emanuelschuetze/fixSlides
...
Fix slide templates
2016-01-09 12:01:11 +01:00
Emanuel Schuetze
4faf3dd2c0
Send assignments OPTION request for phases once only.
2016-01-09 11:45:25 +01:00
Oskar Hahn
308f55bb3f
Merge pull request #1782 from ostcar/search
...
Added a search on the server side.
2016-01-09 11:44:08 +01:00
Oskar Hahn
75dcbab5d1
Add search on the server side.
2016-01-09 11:35:57 +01:00
Emanuel Schuetze
74110453c8
Rename ItemDetailSlide to ListOfSpeakersSlide ( Fixes #1576 )
2016-01-09 10:55:12 +01:00
Emanuel Schuetze
5cab3bf3dc
Added indentation of subitems on agenda slide ( Fixes #1716 )
2016-01-09 10:34:34 +01:00
Norman Jäckel
6c33c60600
Merge pull request #1786 from normanjaeckel/LoginInfoView
...
Added login info text in config and view.
2016-01-09 10:24:56 +01:00
Norman Jäckel
ecf561e305
Added login info text in config and view.
2016-01-09 10:01:17 +01:00
Emanuel Schuetze
3304cf48c5
Sort list of speakers ( Fixes #1662 )
2016-01-09 09:44:01 +01:00
Norman Jäckel
7843cc2ec0
Merge pull request #1785 from emanuelschuetze/fix-template-bugs
...
Fix template bugs
2016-01-09 01:12:51 +01:00
Norman Jäckel
241d3dbc20
Sorted list of speakers.
2016-01-08 23:32:29 +01:00
Emanuel Schuetze
de77cfc38c
Fixed zooming/scrolling on slides.
2016-01-08 21:31:58 +01:00
Emanuel Schuetze
9b78b5992b
Fix typo
2015-12-30 23:19:53 +01:00
Emanuel Schuetze
98cd4301a6
Generate example csv import files ( Fixes #1761 )
...
- agenda csv file
- motions csv file
- users csv file
2015-12-30 23:02:20 +01:00
Oskar Hahn
c63bd31db0
Merge pull request #1778 from emanuelschuetze/fix1718
...
Fix publish assignment poll function. (Fixes#1718)
2015-12-22 00:02:44 +01:00
Oskar Hahn
701d3ce228
Merge pull request #1776 from emanuelschuetze/fix1717
...
Upgrade angular-ui-tree
2015-12-22 00:01:50 +01:00
Emanuel Schuetze
b863c7ae13
Upgrade to angular-ui-tree 2.5.0
...
With >=2.10.0 there is an error "context is null" if start dragging.
With >=2.6.0 there is a missing angular 1.4 dependency.
2015-12-19 12:46:53 +01:00
Emanuel Schuetze
6b8aa56e87
Fix publish assignment poll function.
...
Set 'votes' to required=False in AssignmentAllPollSerializer.
2015-12-19 12:38:07 +01:00
Norman Jäckel
d3e8c68a51
Merge pull request #1775 from emanuelschuetze/templateStuff
...
Fixed some template bugs (#1727 )
2015-12-19 11:53:53 +01:00
Oskar Hahn
99b4e8c494
Merge pull request #1771 from emanuelschuetze/fix1729
...
Added whitespace before triple dots in template (Fixes #1729 )
2015-12-12 11:05:58 +01:00
Oskar Hahn
63d4351c9a
Merge pull request #1773 from emanuelschuetze/csv-import
...
Improved agenda and users csv import (Fixes #1748 )
2015-12-12 11:05:03 +01:00
Emanuel Schuetze
f5efca1d1e
Added whitespace before triple dots in template ( Fixes #1729 )
2015-12-12 10:16:44 +01:00
Emanuel Schuetze
31c320f9ef
Improved csv import for agenda and users.
...
- Fix users list.
2015-12-12 10:12:22 +01:00
Oskar Hahn
66e0fe272b
Merge pull request #1764 from normanjaeckel/DefaultPermissions
...
Deleted Django's default permissions.
2015-12-12 09:32:40 +01:00
Oskar Hahn
9402d25f4f
Merge pull request #1767 from normanjaeckel/ItemDetailSlide
...
Removed item detail slide on server and client side.
2015-12-12 09:31:36 +01:00
Oskar Hahn
fae3747da6
Merge pull request #1769 from normanjaeckel/LoginLogout
...
Fixed login and logout view.
2015-12-12 09:30:00 +01:00
Oskar Hahn
fd90b15a0e
Merge pull request #1770 from emanuelschuetze/fix1728
...
Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728 )
2015-12-12 09:28:20 +01:00
Emanuel Schuetze
c275b08178
Fixed some template bugs ( #1727 )
...
- Fixed z-index of messages and countdowns.
- Sidebar: Live view open by default. Improve section style.
- Set default value for open_posts in assignments create form.
- Redefine default values in motions create form.
2015-12-12 00:30:05 +01:00
Norman Jäckel
e0e74d6c3c
Fixed login, logout and password change view.
2015-12-11 23:58:59 +01:00
Emanuel Schuetze
041b01afe5
Login dialog behavior if guest mode enabled/disabled ( Fixes #1750 )
2015-12-11 21:18:45 +01:00
Emanuel Schuetze
ca94a4e720
Rename template variable 'isFilter' to 'isFilterOpen' ( Fixes #1728 )
2015-12-11 19:50:50 +01:00
Norman Jäckel
0701838bc8
Merge pull request #1765 from emanuelschuetze/WhoAmI
...
Login form
2015-12-11 15:44:02 +01:00
Norman Jäckel
da37f3a441
Removed item detail slide on server and client side.
...
There is now only a list of speakers slide.
2015-12-11 15:37:13 +01:00
Norman Jäckel
c73671805e
Merge pull request #1753 from emanuelschuetze/fix1704
...
Project related object (Fixes #1704 )
2015-12-11 15:25:56 +01:00
Emanuel Schuetze
5d29af5f52
Improved login form.
...
- Add redirect after aborting login. (Fixes #1762 )
- Use new state paramater 'guest_enabled' for login form.
2015-12-11 13:45:53 +01:00
Norman Jäckel
24cb58dc12
Added guest enabled info to WhoAmI view.
2015-12-11 13:44:58 +01:00
Emanuel Schuetze
9001456d19
Fix user.id in password reset request ( Fixes #1752 )
2015-12-10 15:03:18 +01:00
Norman Jäckel
114a38e4ee
Deleted Django's default permissions.
2015-12-10 00:31:27 +01:00
Emanuel Schuetze
f050e04f0a
Redirect to login dialog if user is not logged in ( Fixes #1750 )
2015-12-09 20:45:52 +01:00
Emanuel Schuetze
7bffeba93e
Project related object ( Fixes #1704 )
...
- Override generic project and isProjected function in agenda.
- Fix project and isProjected function for list of speakers and move
to jsDataModel of Agenda.
2015-12-09 20:02:08 +01:00
Norman Jäckel
1f63f84fde
Update version to 2.0b2-dev
2015-12-07 21:55:56 +01:00
Norman Jäckel
c5e3a14a82
Release 2.0b1
2015-12-07 21:55:17 +01:00
Norman Jäckel
2f4b7c192c
Updated French translation.
2015-12-07 20:11:46 +01:00
Norman Jäckel
00dd0b419a
Updated German translation.
2015-12-07 20:06:05 +01:00
Norman Jäckel
075c00ac4f
Updated English language file.
2015-12-07 15:43:45 +01:00
Emanuel Schuetze
3c5f49a127
Updated English translation strings.
2015-12-07 15:15:12 +01:00
Norman Jäckel
1b1e8f8ba2
Used our own repository for Open Sans font.
2015-12-06 23:55:30 +01:00
Emanuel Schuetze
5c6977c46d
Template fixes
2015-12-06 17:26:10 +01:00
Emanuel Schuetze
232ce522fe
Updated translation strings and pot file.
2015-12-06 07:25:07 +01:00
Oskar Hahn
37cd431aa9
Merge pull request #1737 from emanuelschuetze/motion-csv-import
...
Add motion csv import (Fixes #1675 )
2015-12-05 23:53:08 +01:00
Emanuel Schuetze
d987a1138d
Added motion csv import ( Fixes #1675 )
...
using pre-import checks and preview table.
2015-12-05 21:44:19 +01:00
Emanuel Schuetze
f5452082f0
Use transparent favicon.
...
- Added favicon to projector template.
2015-12-02 14:20:59 +01:00
Norman Jäckel
696bfb0883
Fixed comment.
2015-12-01 15:45:35 +01:00
Emanuel Schuetze
b81704a88f
Fixed translations in agendaSupplement.
2015-12-01 13:45:54 +01:00
Emanuel Schuetze
e23121ed0f
Updated language menu.
...
- improved header menu style
- define new Languages factory
- make it easier to define new languages
2015-12-01 12:06:15 +01:00
Emanuel Schuetze
bf940b177c
Fixed gettext strings in JavaScript.
...
- Added browser lanugage detection.
- Use gettextCatalog.getString(..) instead of gettext(..) in JS code.
- updated pot file
2015-11-30 23:52:42 +01:00
Norman Jäckel
139a5173b8
Added German translation.
2015-11-30 21:30:37 +01:00
Norman Jäckel
f84b8f29ac
Template and translation changes. Updated English language files.
2015-11-30 21:06:31 +01:00
Emanuel Schuetze
5cf2134e95
Fix translation tags.
2015-11-30 20:52:02 +01:00
Emanuel Schuetze
fa267b68c2
New template design
...
- Great thanks to Jörn Bensch (from triagonale.de) for new base
template!
- A lot of adaptations in all templates for new design.
2015-11-30 20:36:33 +01:00
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
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
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
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
9a7dea26e0
Angular: Eject assignment related users before a assignment is updated
2015-11-27 22:26:30 +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
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
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
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
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
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
Norman Jäckel
c5f5fbf203
Remove translations for projector exception messages.
2015-11-21 00:01:48 +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
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
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
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
Emanuel Schuetze
ed72a90306
Reworked all motions templates.
...
motion detail:
- added progres bar for motionpoll
- added support/unsupport function
- show log
motion list:
- added state filter
- added css animations for enter/leave
motion form:
- use angular-formly (instead of old ng-fab-forms with no angular 1.4.x support)
general:
- Workflow states use new field 'css_class' (instead of unused
'icon'). Added migration file.
- added 'allowed_actions' to rest api for each motion (by Norman)
- updated all JavaScript dependencies (bower.json)
2015-11-11 10:50:49 +01:00
Oskar Hahn
c379544e97
Fixed motion states, handled workflow field.
2015-11-11 10:50:49 +01:00
Emanuel Schuetze
5b37a21c87
Motion detail updated for polls.
...
bower.json: updated ui-select
New QuickEdit feature in motion list.
2015-11-11 10:50:49 +01:00
Oskar Hahn
2495ba609b
create MotionPoll in JS
2015-11-11 10:50:49 +01:00
Emanuel Schuetze
798126551b
Motions template improvements.
...
- Added quickedit form for motion list.
2015-11-11 10:50:49 +01:00
Norman Jäckel
8154b0324b
Added possibility to reset password. Work on user app in general.
2015-11-08 22:10:24 +01:00
Oskar Hahn
08c31a6b09
Merge pull request #1666 from normanjaeckel/Mediafile
...
Fixed serializer and template. Fixed #1650 .
2015-11-07 07:14:39 +01:00
Norman Jäckel
03fcf950ff
Updated logo help text.
2015-11-06 17:25:25 +01:00
Norman Jäckel
cc21b3d015
Fixed mediafile serializer and template. Fixed #1650 .
2015-11-06 17:17:27 +01:00
Oskar Hahn
12a08b9732
New Agenda Item
...
Changed agenda item, so it can not be manualy created, but is always created
when a custom slide, motion or assignment is created.
2015-10-29 15:44:43 +01:00
Norman Jäckel
32b23df763
Split and cleaned up JS files. Added test.
2015-10-22 00:28:01 +02:00
Oskar Hahn
0e3688fc33
Merge pull request #1653 from normanjaeckel/FixMotionPoll
...
Fixed changes in motion poll serializer.
2015-10-21 23:15:28 +02:00
Norman Jäckel
f8cf279d82
Added JSHint to Gulp. Split up JS-Code in users app.
2015-10-21 22:44:07 +02:00
Norman Jäckel
0fc915ec35
Fixed changes in motion poll serializer.
2015-10-21 22:24:11 +02:00
Oskar Hahn
17973bae3d
Merge pull request #1652 from ostcar/make_os-perms-lite_and_ng-show_compatible
...
Fix os-perms-lite to make it compatible to ng-show and ng-hide
2015-10-21 21:25:29 +02:00
Oskar Hahn
bf3e125786
Merge pull request #1651 from normanjaeckel/MotionPoll
...
Changed Motion Poll REST fields.
2015-10-21 21:25:06 +02:00
Oskar Hahn
1f0ab173d3
Fix os-perms-lite to make it compatible to ng-show and ng-hide
2015-10-21 21:21:48 +02:00
Norman Jäckel
817e15b01a
Changed Motion Poll REST fields.
2015-10-21 21:20:38 +02:00
Emanuel Schuetze
fac45fbf2a
Added multiselection delete mode for users list view.
...
Fix users import: Allows multiple groups.
2015-10-15 21:09:49 +02:00
Oskar Hahn
69268f0cc7
Merge pull request #1634 from emanuelschuetze/countdown-controls
...
Projector elements controls
2015-10-08 22:27:35 +02:00
Emanuel Schuetze
dda16af532
Added controls for projector elements
...
countdowns, messages, scale/scroll/edit current slide
Use global serverOffset.
Fixed #1645 (wrong time of projector clock).
Show countdown description on projector slide.
2015-10-08 19:21:25 +02:00
Emanuel Schuetze
4559ffb882
Fix agenda slide and agendaIsProjected function.
2015-09-24 21:43:37 +02:00
Norman Jäckel
30e390dcfb
Added API view for server time.
2015-09-24 21:28:30 +02:00
Norman Jäckel
1e08e9411a
Cleaned up users app.
2015-09-21 16:23:47 +02:00
Norman Jäckel
e646cce91e
Added scale and scroll, up, down and reset. Fixed #1633 .
2015-09-18 10:31:22 +02:00
Norman Jäckel
4ad99f2bc9
Cleaned up mediafiles app. Fixed #1629 .
2015-09-17 22:58:24 +02:00
Norman Jäckel
4600fd9b02
Merge pull request #1625 from boehlke/master
...
Add upload feature to mediafiles module.
2015-09-17 12:41:10 +02:00
André Böhlke
10b8a1d838
Add upload feature to mediafiles module
2015-09-17 12:35:40 +02:00
Oskar Hahn
264895b773
Configure js-data for projector elements to "replace" on inject.
...
fixes #1632
2015-09-17 12:04:45 +02:00
Norman Jäckel
187cb0c42f
Fixed blue line for active projector elements.
2015-09-16 23:59:20 +02:00
Norman Jäckel
2a23150b78
Fixed agenda tree, fixed #1635 .
2015-09-14 22:18:55 +02:00
Norman Jäckel
c8dfb9437b
Removed imports from openslides.users in other apps: Cleaned up agenda, assignments and motions.
2015-09-14 21:13:56 +02:00
Emanuel Schuetze
7f9c8b6a38
Agenda item list: new multiselect delete mode
...
Remove action column.
2015-09-14 20:35:24 +02:00
Norman Jäckel
8c48d67df0
Fixed projector.
2015-09-14 20:30:37 +02:00
Norman Jäckel
6d76454925
Added model, serializer and viewset for chat messages.
2015-09-07 17:13:42 +02:00
Oskar Hahn
f0803f1c03
Merge pull request #1624 from ostcar/agendaTree
...
Calculate agenda tree on the client side.
2015-09-06 15:04:38 +02:00
Oskar Hahn
85be9f23cc
Merge pull request #1623 from normanjaeckel/ProjektorElementsOutput
...
Updated Projector config field and control views.
2015-09-06 15:04:26 +02:00
Oskar Hahn
e22b9984e3
Calculate agenda tree on the client side.
...
Update changed agenda tree via autoupdate.
2015-09-06 15:01:41 +02:00
Norman Jäckel
5c4c0367a1
Updated Projector config field and control views.
2015-09-06 14:59:33 +02:00
Norman Jäckel
5fc215c359
Fix docstrings.
2015-09-06 11:48:37 +02:00
Oskar Hahn
1fc7a361eb
Merge pull request #1621 from normanjaeckel/User
...
Added possibility to update your own user object.
2015-09-06 11:37:52 +02:00
Norman Jäckel
c8bf754646
Added possibility to update your own user object. Hide default password for non admins.
2015-09-06 11:26:48 +02:00
Oskar Hahn
2c64a161ac
fix projector
2015-09-06 10:24:15 +02:00
Norman Jäckel
973d3fa653
Merge pull request #1618 from normanjaeckel/Projector
...
Added UUID to projector elements. Added update view.
2015-09-05 21:23:00 +02:00
Norman Jäckel
47a151c71e
Added UUID to projector elements. Added update view.
2015-09-05 21:19:53 +02:00
Oskar Hahn
bd51c6a52c
Added osPermLite as alternative to osPerm
2015-09-05 19:17:41 +02:00
Oskar Hahn
d8e9ef5575
Merge pull request #1616 from ostcar/main_menu
...
Autogenerate the main menu.
2015-09-05 18:19:59 +02:00
Oskar Hahn
c54b00c5f4
Merge pull request #1613 from emanuelschuetze/user-profile
...
User settings profile view
2015-09-05 18:19:17 +02:00
Oskar Hahn
2da2177c49
Autogenerate the main menu.
2015-09-05 17:23:47 +02:00
Emanuel Schuetze
60002d9111
Added user profile view.
2015-09-05 17:22:37 +02:00
Oskar Hahn
f802fde7de
Merge pull request #1614 from normanjaeckel/BundleCountDown
...
Bundle countdown with list of speakers. Fixed #1541 .
2015-09-05 17:12:22 +02:00
André Böhlke
8691608c5d
Fix javascript syntax
2015-09-05 16:15:25 +02:00
Norman Jäckel
719b5ffedd
Bundle countdown with list of speakers. Fixed #1541 .
2015-09-05 15:07:03 +02:00
Oskar Hahn
948e776d33
Merge pull request #1612 from ostcar/motion_tag_save
...
Reload config after login
2015-09-05 11:32:52 +02:00
Oskar Hahn
fbc57cc23a
Reload config after login
...
Fix errors by saving tags to motions
2015-09-05 11:26:41 +02:00
Emanuel Schuetze
77d027c1cc
Agenda templates
...
- Added manage controls for list of speakers of agenda items.
- New slide for list of speakers.
- Fixed typo (speach -> speech)
2015-09-05 11:23:32 +02:00
Emanuel Schuetze
0e124dbbae
Use tags in agenda. Fix motions.js.
2015-09-05 10:07:53 +02:00
Oskar Hahn
026f4d45cb
Merge pull request #1607 from normanjaeckel/PollNumber
...
Removed poll_number field in MotionPoll model.
2015-09-05 09:58:57 +02:00
Norman Jäckel
80efae4980
Start browser at 'localhost:8000' in start script. Fixed #1534 .
2015-09-05 09:32:56 +02:00
Norman Jäckel
5e5ab61612
Removed poll_number field in MotionPoll model.
2015-09-05 09:29:06 +02:00
Oskar Hahn
6674ea85b7
Updated js-data to 2.0
...
Added js-data relation for the motion and agenda app
Added improved load function
2015-09-04 21:05:49 +02:00
Norman Jäckel
a1f1cfed1f
Added views to create, update and delete MotionPoll objects.
2015-09-04 19:55:47 +02:00
Norman Jäckel
965206e1fc
Set permissions for OPTIONS requests. Fixed js-data dependency. Fixed blank in some motion model fields. Fixed error handling in agenda and core views.
2015-09-04 15:44:28 +02:00
Norman Jäckel
aaadfbf78e
Merge pull request #1600 from normanjaeckel/Plugins
...
Updated plugin utils. Enabled plugins to override urlpatterns.
2015-07-25 22:29:45 +02:00
Norman Jäckel
1cf8a1f222
Updated plugin utils. Enabled plugins to override urlpatterns.
2015-07-25 21:37:03 +02:00
Oskar Hahn
89a6d5b451
Appended an _id suffix to all related field names in the rest api
...
Fixes #1597
2015-07-25 19:17:33 +02:00
Norman Jäckel
7e404946e4
Refactored view permissions.
...
Refactored permission check for REST API viewsets.
Removed old PermissionMixin.
Cleaned up several views.py files.
2015-07-05 22:17:58 +02:00
Oskar Hahn
f31925387f
Updated python requirements.
...
This included django 1.8
2015-07-02 14:51:08 +02:00
Oskar Hahn
291f60ee9f
Added a way to load angular apps dynamical
2015-07-01 20:10:40 +02:00
Oskar Hahn
1dbe07c041
Fix osPerms to use groups registered and anonymous
...
Fixes #1586
2015-07-01 00:32:37 +02:00
Emanuel Schuetze
c6800bc8f5
Update version to 2.0b1-dev
2015-06-29 21:58:58 +02:00
Emanuel Schuetze
d50d771014
Release 2.0a1
2015-06-29 21:58:58 +02:00
Emanuel Schuetze
bc74a2983c
Fixed typo. Removed unused config.js.
2015-06-29 20:23:10 +02:00
Norman Jäckel
87cce491a0
Merge pull request #1583 from emanuelschuetze/agenda-slides
...
Use item-detail and item-list slides for agenda app.
2015-06-29 18:05:45 +02:00
Emanuel Schuetze
6f985ef483
Use item-detail and item-list slides for agenda app.
2015-06-29 16:45:46 +02:00
Oskar Hahn
3dead745c6
Let the config app accept values that can be converted to the right type.
...
Fixed config app
2015-06-29 15:41:36 +02:00
Oskar Hahn
ec1d676ed9
Added initial migrations for all apps
2015-06-29 15:38:15 +02:00
Oskar Hahn
16fa6bfffc
Removed the projector App
2015-06-29 15:20:28 +02:00
Oskar Hahn
e042c668d5
Moved config app into the core app
2015-06-29 15:15:33 +02:00
Norman Jäckel
bcfe72fa8c
Merge pull request #1578 from ostcar/remove_mptt_again
...
Realy removed mptt
2015-06-28 20:18:09 +02:00
Norman Jäckel
025c9c0b2a
Merge pull request #1577 from ostcar/fix_mediafile_download_link
...
Fixed link to download a file from the mediafileapp.
2015-06-28 20:17:30 +02:00
Oskar Hahn
4dac4d1ca8
Realy removed mptt
2015-06-28 19:55:48 +02:00
Oskar Hahn
60e890a04e
Fixed link to download a file from the mediafileapp
...
Fixes #1575
2015-06-28 19:44:25 +02:00
Norman Jäckel
06ead753dc
Added and updated several projector elements (slides).
...
Added list slides for motions and assignments.
Added detail slide for presentable files.
Updated list and detail slides for agenda items including slides for list of speakers.
2015-06-28 19:22:57 +02:00
Oskar Hahn
8aab8388b3
Moved agenda tree code to the Item-Manager and used it at the AgendaPDFView.
...
fixed #1561
2015-06-28 18:26:05 +02:00
Oskar Hahn
c22791d6c9
Merge pull request #1573 from emanuelschuetze/slides
...
Agenda item slide template. Some template improvements.
2015-06-27 09:48:02 +02:00
Emanuel Schuetze
f75516c7bb
Agenda slide templates. Some template improvements.
...
- User import
- show linebreaks for long text
- some style work
- item detail and agenda list slide
2015-06-25 14:19:43 +02:00
Emanuel Schuetze
6ea14cd2c6
Angular template for config app.
...
Added directive for config fields
2015-06-25 10:52:28 +02:00
Oskar Hahn
f5654837e1
Merge pull request #1569 from normanjaeckel/Slides
...
Added agenda slides.
2015-06-25 08:12:47 +02:00
Emanuel Schuetze
c2920407bb
Template improvements
...
- Activate slides for users, customslides, motions, assignments.
- Add delete confirm message.
- Fixed required form fields.
- Added version template.
- Improved user import. Updated csv files.
2015-06-25 00:15:56 +02:00
Norman Jäckel
6da0d41e50
Added agenda slides.
2015-06-24 23:45:21 +02:00
Norman Jäckel
6b5ce5ae2f
Added motion and assignment detail slide.
2015-06-24 22:12:06 +02:00
Oskar Hahn
367404b20d
Added projector methods to user model
2015-06-24 13:07:49 +02:00
Norman Jäckel
95b7b16992
Merge pull request #1555 from emanuelschuetze/speakers
...
List of speakers with angularjs
2015-06-22 21:37:39 +02:00
Emanuel Schuetze
8075b0adbb
List of speakers with angularjs.
...
- Add/remove user to/from list
- Open/close list
2015-06-22 14:34:23 +02:00
Emanuel Schuetze
f006b99caf
Added style to projector slide.
...
Added Customslide views.
2015-06-22 14:27:19 +02:00
Oskar Hahn
35aa36f88e
Revert "Added view to create related assignment and motion items. Updated ser…"
2015-06-22 14:23:42 +02:00
Oskar Hahn
2d6cdfa168
Merge pull request #1557 from emanuelschuetze/angular-motions
...
Updated motion list, form and detail views.
2015-06-22 14:18:09 +02:00
Oskar Hahn
3f321051c5
Merge pull request #1562 from emanuelschuetze/chromium-fixes
...
Fix JavaScript errors in chromium (Fixed #1530 )
2015-06-22 14:12:12 +02:00
Oskar Hahn
bb2da91204
Merge pull request #1563 from normanjaeckel/Fix
...
Fixed bug in users/projector.py.
2015-06-22 14:11:43 +02:00
Norman Jäckel
e0188a149d
Added view to create related assignment and motion items. Updated serializers.
2015-06-21 23:32:21 +02:00
Norman Jäckel
c4e23daccf
Fixed bug in users/projector.py.
2015-06-21 22:36:21 +02:00
Emanuel Schuetze
002a4d583e
Fix JavaScript errors in chromium.
2015-06-21 19:39:36 +02:00
Emanuel Schuetze
9a117999ef
Updated motion list, form and detail views.
2015-06-20 10:44:00 +02:00
Oskar Hahn
2b9c0b4620
Fixed default_value in option request
2015-06-19 09:08:36 +02:00
Oskar Hahn
a0f4506c35
Merge pull request #1549 from normanjaeckel/ConfigRefactoring
...
Refactored config API. Removed form_fields. Added extra fields for HT…
2015-06-18 23:40:23 +02:00
Oskar Hahn
a4c00d5ee3
Angular Client
...
* Split angular app into a site- and a projector app
* Created client slide api and slides for customslide and user
* JS-function to activate a slide
2015-06-18 23:23:34 +02:00
Oskar Hahn
a5d9f0bb42
Merge pull request #1554 from normanjaeckel/UserResetPassword
...
Added view to reset user's password.
2015-06-18 23:16:45 +02:00
Norman Jäckel
466fab8752
Added view to reset user's password.
2015-06-18 22:45:23 +02:00
Norman Jäckel
211e39be2c
Added version view via REST API.
2015-06-18 21:48:20 +02:00
Norman Jäckel
c5fbe2e9ee
Refactored config API.
...
Removed form_field attributes.
Added extra fields for HTML rendering like label and help text.
Added fields for sorting and grouping. Removed old collection system.
Added config groups to config view via OPTIONS requests.
Regrouped all variables.
Added validation. Changed internal handling.
2015-06-18 21:13:30 +02:00
Oskar Hahn
dc675e173b
Removed old static files
2015-06-18 18:24:54 +02:00
Norman Jäckel
632ca2bd9a
Renamed config variables. Fixed error in settings.
2015-06-17 12:07:09 +02:00
Emanuel Schuetze
b7abf770c7
Added two agenda import ways.
...
Note: CSV example file was updated because English csv header strings are
required now.
2015-06-16 20:29:09 +02:00
Norman Jäckel
51455e8563
Merge pull request #1539 from ostcar/delete_old_stuff
...
Delete old stuff.
2015-06-16 17:32:38 +02:00
Oskar Hahn
fbf7d0e43d
Remove old thinks not needed for the 2.0 release:
...
* django templates
* widgets
* views
* mppt
* main_menu
* projector 1.x api
Sorted all imports
Add a ending slash to each url with a redirect view
2015-06-16 17:07:39 +02:00
Norman Jäckel
95683949ec
Merge pull request #1536 from emanuelschuetze/portable-fixes
...
Fixed FileFinder importer for plugin detection in portable.
2015-06-16 17:00:30 +02:00
Oskar Hahn
1ccd2ab91c
Merge pull request #1529 from normanjaeckel/RESTConfig
...
Added config update view.
2015-06-16 16:18:33 +02:00
Norman Jäckel
3e2aa6c081
Update
2015-06-16 14:04:38 +02:00
Emanuel Schuetze
ea908419be
Fixed FileFinder importer for plugin detection in portable.
...
Updated setuptools version for openslides-gui.
2015-06-16 10:38:54 +02:00
Norman Jäckel
6f02d769cc
Added config update view.
2015-06-15 18:24:23 +02:00
Norman Jäckel
5813b8341c
Added permission check for objects required for active projector elements.
2015-06-15 18:22:15 +02:00
Oskar Hahn
a604f36634
Merge pull request #1537 from normanjaeckel/RESTPoll
...
Added create, updated and destroy view for assignment polls.
2015-06-15 16:34:11 +02:00
Oskar Hahn
cb1b262c92
Fix anonymous user for rest requests
2015-06-15 15:54:39 +02:00
Norman Jäckel
ccaa1eaf27
Added create, updated and destroy view for assignment polls.
2015-06-14 23:26:06 +02:00
Norman Jäckel
a033f74ba1
Merge pull request #1527 from ostcar/start_browser_on_localhost
...
Start the browser on 127.0.0.1.
2015-06-12 13:01:00 +02:00
Oskar Hahn
e836bccb72
Start the browser on 127.0.0.1
...
Fixed #1525
2015-06-11 11:37:01 +02:00
Norman Jäckel
5de7365c9a
Merge pull request #1526 from normanjaeckel/AgendaSpeakerREST
...
Added view to add and remove users from the list of speakers.
2015-05-29 13:08:10 +02:00
Norman Jäckel
dc7d27a985
Added REST API for projector. Introduced new projector API.
...
Added custom slide projector element class.
Added welcome slide as custom slide.
Added user slide projector element class.
Added clock, countdown ans message projector elements.
Renamed SignalConnectMetaClass classmethod get_all_objects to get_all (private API).
Added migrations to core app.
Fixed and wrote tests.
Updated CHANGELOG.
2015-05-29 12:44:25 +02:00
Norman Jäckel
0853701cdd
Added view to begin and end speach.
2015-05-27 15:42:32 +02:00
Norman Jäckel
95be18b78e
Added view to add and remove users from the list of speakers.
2015-05-26 18:42:39 +02:00
Norman Jäckel
b30afbd635
Added several motion REST API views.
...
Added motion creation view, motion update view, version permit and delete view, view to support motions, view to set and reset state. Refactored motion submitters and supporters.
2015-05-13 12:22:50 +02:00
Emanuel Schuetze
8d638a908d
Added new angularjs templates
...
for agenda, motions, assignments, users and mediafiles apps.
Users app:
- Show permissions in group form (Fixed #1500 )
- Added experimental csv import for users.
Agenda:
- new agenda sort view.
- Added experimental angular-xeditable for item-list view.
General:
- Added core.tag templates.
- Added mediafiles templates.
- Remove old template and js files. Remove old views.
- Skip old tests.
Added external angular modules:
- angular-loading-bar (Fixed #1448 )
- ui-tree (for sorting agenda tree)
- ng-fab-forms (for better form validation)
- ui-bootstrap (for modal window, dropdown, popover)
- ngBootbox (for confirm delete dialogs in agenda and users app)
2015-05-06 09:19:16 +02:00
Oskar Hahn
9f93208afd
Merge pull request #1512 from normanjaeckel/AssignmentRESTAPIChanges
...
Assignment REST API changes
2015-04-19 21:26:58 +02:00
Norman Jäckel
d0dc2f8934
Set assignment phase index to zero. Added views to manage candidatures.
2015-04-19 21:20:39 +02:00
Oskar Hahn
505e587d6f
Send tree for agenda items
2015-04-17 16:46:13 +02:00
Oskar Hahn
0b5f75339e
Rename apps and permissions
...
* Fixed agenda permissions
* Renamed assignment to assignments, fixed assignments permission names
* Renamed mediafile to mediafiles
* Renamed motion to motions. Fixed motions permission names
2015-03-29 20:35:53 +02:00
Norman Jäckel
9b369e1afc
Changed development settings path.
...
Settings and user data live now at development/var/.
Move your existing directory or create new settings and database.
2015-03-06 16:43:13 +01:00
Oskar Hahn
80ca3f2484
Use ui-router to handle django urls
...
See: #1453
2015-03-02 19:03:19 +01:00
Emanuel Schuetze
db3625ec91
Angular templates for users app. Use angular-gettext.
...
- Use new "Font Awesome" icons.
- Sorting columns.
- Filter table.
- New focusMe directive.
- Delete user
- Use ui-sref.
- Use angular-gettext for i18n.
- Added sample po files for DE and FR.
- group views
- use google coding style (2 spaces, optional end tags, etc)
2015-03-02 16:25:36 +01:00
Norman Jäckel
681d1115c9
Merge pull request #1499 from ostcar/autoupdate_delete
...
Autoupdate for delete views.
2015-03-01 16:52:37 +01:00
Oskar Hahn
86c189c964
Autoupdate for delete views
...
Fixes : #1495
Also fixed the (example) assignment angular code
2015-03-01 08:42:47 +01:00
Oskar Hahn
f8e18a8900
Altered ui-router definitions
...
1. Allow trailing slash in urls
2. Use integer ids for detail views as default
2015-03-01 07:15:44 +01:00
Oskar Hahn
787343d651
Fixes users password PDF view.
...
Fixes : #1496
2015-02-27 11:56:31 +01:00
Norman Jäckel
2ef7c7cf29
Added 'id' to user creation response.
2015-02-25 17:16:36 +01:00
Norman Jäckel
1777ac48b6
Cleaned up urls.py. Fixed #1472 . Removed use of 'django.views.i18n.javascript_catalog'.
2015-02-25 16:55:44 +01:00
Norman Jäckel
acbfd84fc5
Cleaned up users.signals. Fixed #1483 .
2015-02-25 16:12:20 +01:00
Norman Jäckel
1fe84195e1
Merge pull request #1488 from normanjaeckel/OpenSlidesVersion
...
Updated setup.py and openslides module init, esp. version string.
2015-02-25 13:37:13 +01:00
Norman Jäckel
274648b180
Merge commit 'stable/1.7.x' into master.
...
Conflicts:
CHANGELOG
openslides/__init__.py
openslides/assignment/views.py
2015-02-25 13:26:49 +01:00
Oskar Hahn
de52634561
Merge pull request #1482 from normanjaeckel/Groups
...
Updated REST API for group create, update and delete.
2015-02-25 12:12:13 +01:00
Norman Jäckel
8c04454ecd
Updated setup.py and openslides module init, esp. version string. Removed git commit id grabbing during development.
2015-02-18 16:44:26 +01:00
Norman Jäckel
fd34055611
Updated REST API for group create, update and delete.
2015-02-17 21:24:33 +01:00
Oskar Hahn
cfdabfbb40
Added utils.views.CSRFMixin to append the csrf token to a view
...
Fixes : #1476
2015-02-17 20:09:09 +01:00
Oskar Hahn
1969416e64
Implemented auth via AngularJS
...
Also added the derective osPerms to check if the current user has permissions.
Removed old Django views and urls for user.
Created utils.views.APIView which should be used instead of the AjaxView.
Fixes : #1470
Fixes : #1454
2015-02-16 11:42:48 +01:00
Norman Jäckel
0f55583b4c
Updated version to 1.7.1-dev
2015-02-15 20:48:02 +01:00
Norman Jäckel
7806e79574
Release 1.7
2015-02-15 20:45:21 +01:00
Norman Jäckel
3015e3d389
Updated CHANGELOG. Updated language files (only metadata changes).
2015-02-15 20:43:15 +01:00
Oskar Hahn
411213b1ce
Merge pull request #1458 from normanjaeckel/feature/rest-api/users
...
Refactoring users app.
2015-02-14 02:35:56 +01:00
Norman Jäckel
3a19218bd5
Refactored parts of users app.
...
Refactored user creation and update via REST API. Used new serializer.
Cleaned up management commands, signals and imports. Moved code from 'api.py' to 'models.py'.
Changed usage of group 'Registered'. Now the users don't have to be members to gain its permissions. Used customized auth backend for this.
Added and changed some tests.
2015-02-14 02:29:53 +01:00
Norman Jäckel
99c6a4dbd8
Merge pull request #1461 from ostcar/js-data
...
Updated angular-data to js-data (angular-data 2.1).
2015-02-14 00:32:17 +01:00
Oskar Hahn
d31be54817
Update angular-data to js-data (angular-data 2.1)
...
Also reload all data after 5 minutes
2015-02-13 23:27:27 +01:00
Norman Jäckel
87cd31f6a5
Updated ViewSets to Django REST Framework 3.0.5. Refactored imports from openslides/utils/rest_api.py for better overriding them later.
...
Fixed #1450 . Updated requirements.
2015-02-12 19:19:44 +01:00
Oskar Hahn
c4c9322321
Rework of assignment
...
fixes : #1429 , #1345
A database recreation is needed
2015-02-12 10:14:10 +01:00
Oskar Hahn
ac6f3de60d
Used AngularUI Router for more generic URL routing.
2015-02-12 09:52:07 +01:00
Oskar Hahn
dcd7ce4e80
Small agenda improvments
...
Updated the tests and changed only small internal parts of method of the agenda model. No API changes
2015-02-09 20:30:04 +01:00
Oskar Hahn
7171a71919
angular single page application
2015-02-05 23:06:09 +01:00
Oskar Hahn
afc295b2ec
Merge pull request #1441 from normanjaeckel/RefactorConfigAPI
...
Added api retrieve method for config variables. Refactored api output.
2015-02-05 20:05:56 +01:00
Norman Jäckel
eed5c59013
Refactored serializers and autoupdate.
...
Added api for groups.
Refactored serializers now using 'id' instead of 'url'.
Rework of tornado autoupdate functionality.
Implemented extra data in SockJS messages.
2015-02-05 19:49:54 +01:00
Norman Jäckel
ecf7e07fe7
Added api retrieve method for config variables. Refactored api output.
2015-02-05 19:42:51 +01:00
Norman Jäckel
aad0e8d2d2
Merge pull request #1437 from ostcar/tornado_requests
...
Send data via tornado and sockjs.
2015-01-31 14:36:54 +01:00
Norman Jäckel
7238b8159a
Added REST api for motion, mediafile and config app. Refactor REST api in other apps.
2015-01-31 14:15:10 +01:00
Oskar Hahn
7ec4cdcdf7
send data via tornado
2015-01-30 14:00:04 +01:00
Oskar Hahn
c7b52245b7
Fix AssignmentPollUpdateView
2015-01-25 15:15:28 +01:00
Oskar Hahn
b4e17b9b35
fix #1430 - anonymous user and motion detail view
2015-01-25 01:20:59 +01:00
Oskar Hahn
ac01d39eaa
use our anonymous user object for the rest framework
...
fix : #1432
2015-01-25 01:11:14 +01:00
Oskar Hahn
e7230b7391
New Test order.
...
* seperate unittests and integration tests
* moved old tests in seperat folder 'old'
* created a testrunner that does not create a testdatabase, if only unittests are run
* wrote some unit- and integration tests as examples
* fixed user.get_short_name() to use the sort order from config
* fixed wrong url_pattern in the user app
2015-01-24 18:00:03 +01:00
Oskar Hahn
ea45469338
Merge pull request #1424 from ostcar/simple_anonymous_user
...
Use a real anonymous user object, instadt of a authentification backend
2015-01-23 15:53:03 +01:00
Oskar Hahn
35024764cf
Rework of management command
2015-01-23 15:40:12 +01:00
Oskar Hahn
285d8c2cfb
Use a real anonymous user object, instadt of a authentification backend
2015-01-23 15:38:14 +01:00
Oskar Hahn
8b88d38ac5
Merge branch 'stable/1.7.x'
...
Conflicts:
openslides/__init__.py
openslides/assignment/views.py
openslides/motion/pdf.py
openslides/users/pdf.py
2015-01-23 02:33:17 +01:00
Norman Jäckel
33c4562e62
Updated version to 1.7
2015-01-21 20:58:03 +01:00
Norman Jäckel
136f57057f
Release 1.7b1
2015-01-21 20:58:03 +01:00
Norman Jäckel
afc2b246db
Fixed bug in chatbox.
2015-01-21 17:24:39 +01:00
Emanuel Schuetze
6cbec7a32a
Updated translations (DE, FR, CS, PT) for 1.7.
2015-01-21 15:59:27 +01:00
Emanuel Schuetze
4296fb0360
Show special characters in PDF, like "&". ( Fixed #1415 )
...
Added escape function for agenda, motion, assignment and participants
pdf views.
2015-01-21 13:03:03 +01:00
Emanuel Schuetze
18fe7e2d89
Update to bootstrap 3.3.1.
2015-01-21 12:23:32 +01:00
Norman Jäckel
c5a7cc889e
Merge pull request #1411 from boehlke/master
...
Fix #1352 and fix order in motion form.
2015-01-18 09:07:24 +01:00
André Böhlke
591d230cbb
Fix field order in motion forms.
...
Add documentation for new attribute.
Added .idea to .gitignore.
2015-01-18 01:01:38 +01:00
Norman Jäckel
4821a3b59b
Added api for assignments.
...
Also small changes in agenda REST api.
2015-01-17 22:46:23 +01:00
André Böhlke
e2e16a4c34
explicitly define fields attribute to fix deprecation warnings
2015-01-17 22:28:32 +01:00
Norman Jäckel
0d56424c90
Refactored REST api in agenda, core and users app.
2015-01-17 15:58:51 +01:00
Norman Jäckel
2b744942e7
Merge pull request #1407 from ostcar/super_signal
...
Remove update_projector and add inform_changed_data.
2015-01-17 15:25:41 +01:00
Oskar Hahn
1a1d072454
remove update_projector and add inform_changed_data
2015-01-17 15:16:49 +01:00
Roland Geider
06b5ad5f2e
Fix typos
2015-01-17 12:12:08 +01:00
Oskar Hahn
0a24b7267b
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
README.rst
openslides/assignment/models.py
openslides/users/forms.py
requirements_production.txt
tests/settings.py
2015-01-17 10:18:29 +01:00
Norman Jäckel
b0422c4680
Added api viewset for agenda items.
...
Fixed style checker problem.
2015-01-17 09:18:40 +01:00
Norman Jäckel
8cb70017da
Added api viewset for users.
2015-01-17 08:51:57 +01:00
Norman Jäckel
7644cb9a09
Added api viewset for custom slides.
2015-01-17 08:51:54 +01:00
Norman Jäckel
7ed5d2fc43
Setup Django REST Framework.
2015-01-17 08:49:52 +01:00
Norman Jäckel
82f46708f6
Merge pull request #1397 from emanuelschuetze/haystack-fix
...
Fixed haystack indexing problem for m2m objects.
2015-01-17 00:21:45 +01:00
Norman Jäckel
9b89e10cc7
Merge pull request #1398 from emanuelschuetze/portable-install-script
...
Improved portable install script.
2015-01-17 00:20:49 +01:00
Norman Jäckel
f7cb518430
Used Bower and gulp to manage third party JavaScript and Cascading Style Sheets libraries.
...
Cleaned up settings. Updated development section in README.rst.
Removed jQuery, jquery.cookie and bootstrap from repository.
2015-01-17 00:12:04 +01:00
Emanuel Schuetze
fd266a4e45
Fixed AttributeError in chatbox on_open method.
...
Fixed TODO and updated get session method for session key.
2015-01-16 23:41:46 +01:00
Emanuel Schuetze
3127048be5
Fixed haystack indexing problem for m2m objects.
...
Updated django-haystack to <2.4.
2015-01-16 23:07:56 +01:00
Oskar Hahn
5d0737f656
Merge pull request #1396 from DebVortex/feature/update-pdfjs
...
Updated pdf.js to 1.0.907
2015-01-16 22:37:49 +01:00
Max Brauer
f0af21103c
Updated pdf.js to 1.0.907
2015-01-16 22:16:31 +01:00
Oskar Hahn
4f27b9b63d
Fix LocalizedModelMultipleChoiceField
...
It has to be a generator, so it does not call the queryset
2015-01-16 20:47:43 +01:00
Emanuel Schuetze
a9468cb0a4
Fixed missing translation strings.
2015-01-16 14:25:34 +01:00
Norman Jäckel
3ba86a6441
Updated English language files.
2015-01-11 19:04:21 +01:00
Norman Jäckel
3ec55daaf9
Fixed bug. Projector was not updated when an object was deleted. Fixex #1394 .
2015-01-11 18:43:05 +01:00
Emanuel Schuetze
91cef13326
Improve the usage of bsmselect jquery plugin.
...
Allow to disable the plugin for defined <select multiple> form fields
with extra css class 'dont_use_bsmselect'. (E.g. not for the group form
fields permissions and users.)
Partly fixed changes from pull request #1381 .
2015-01-08 10:58:25 +01:00
Norman Jäckel
06919fa543
Fixed bug in ResetPasswordView. Fixed #1391 .
2015-01-06 16:27:50 +01:00
Oskar Hahn
34b6ca80f3
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
openslides/users/signals.py
2015-01-06 13:04:07 +01:00
Emanuel Schuetze
3cfb9b739b
Template improvements for tags of agenda items, motions and
...
assignments.
2015-01-05 13:57:37 +01:00
Oskar Hahn
bcb1ee1213
Tags for motions, agenda items and assignments
2015-01-03 17:00:48 +01:00
Oskar Hahn
2951b4b38c
Feature: amendments
2015-01-03 15:17:49 +01:00
Norman Jäckel
dcd8b7a639
Merge branch 'stable/1.6.x' into 'master'.
...
Conflicts:
CHANGELOG
openslides/agenda/views.py
openslides/assignment/views.py
openslides/mediafile/views.py
openslides/users/views.py
openslides/utils/views.py
tests/motion/test_pdf.py
tests/settings.py
2015-01-02 22:11:56 +01:00
Norman Jäckel
8dafa2bfcd
Added possibility to hide motions from non staff users in some states.
2015-01-02 19:32:56 +01:00
Norman Jäckel
f6b1a84545
Cleaned up utils.views to increase performance when fetching single objects from the database for a view. Fixed #1378 .
2014-12-25 00:02:50 +01:00
Norman Jäckel
4f04223e08
Added Django's application configuration.
...
Used customized AppConfig classes in openslides.core, openslides.account,
openslides.projector, openslides.agenda, openslides.motion, openslides.assignment,
openslides.users, openslides.mediafile, openslides.config.
Refactored loading of signals, template signals and slides.
2014-12-10 17:16:58 +01:00
Norman Jäckel
808aae597f
Merge branch 'stable/1.6.x' into 'master'.
...
Conflicts:
CHANGELOG
openslides/__init__.py
openslides/assignment/views.py
2014-12-08 22:17:22 +01:00
Norman Jäckel
750918fe74
Update version to 1.6.2-dev
2014-12-04 15:47:21 +01:00
Norman Jäckel
9a50dab5fc
Release 1.6.1
2014-12-04 15:45:19 +01:00
Emanuel Schuetze
6df6b92dd7
Fixed #1326 (Rearanged assignment pdf table cells to prevent a LayoutError)
2014-11-28 20:58:19 +01:00
Emanuel Schuetze
8be1215e12
Updated FR translation.
2014-10-27 20:42:36 +01:00
Norman Jäckel
c89f9bcccd
Updated German and Czech language files.
2014-10-26 16:12:20 +01:00
Oskar Hahn
88222857bb
Use the new django transaction API
...
fixes #1027
2014-10-19 10:52:48 +02:00
Oskar Hahn
5c6f7a41a8
Merge branch 'stable/1.6.x'
...
Conflicts:
tests/assignment/test_views.py
2014-10-18 08:53:51 +02:00
Oskar Hahn
bcd6b9fad4
Merge pull request #1356 from ostcar/poll404
...
Returns a 404 response if a requested poll does not exist.
2014-10-17 19:42:47 +02:00
Oskar Hahn
cb03908a1b
Returns a 404 response if a requested poll does not exist.
...
fixes #1355
2014-10-17 07:55:41 +02:00
Norman Jäckel
ff9fedd14f
Updated English language files.
2014-10-16 23:28:02 +02:00
Oskar Hahn
c454faef94
Updated Django to 1.7.x
2014-10-14 17:14:52 +02:00
Stefan Frauenknecht
ebadb9078c
Bugix in method get_title. Return item no for related objects.
2014-10-12 10:55:56 +02:00
Oskar Hahn
9b381b712e
Merge pull request #1341 from frauenknecht/i1324
...
Fix #1324 - Agenda item has whitespaces before number.
2014-10-12 10:31:31 +02:00
Norman Jäckel
af8dead5a3
Fixed motion detail view template. Added block to enable extra content via plugins. Updated CHANGELOG.
2014-10-12 10:23:38 +02:00
Oskar Hahn
3527b0a75b
Refactory of the participant app
...
* New user model (used Django's AbstractBaseUser)
* Renamed the app to users
* removed person api
See #861
Fixed #576 #478
2014-10-12 10:06:54 +02:00
Emanuel Schuetze
2a389b4a7f
Fixed #1326 : Assignment PDF fails when having a lot of posts.
...
Print always 7 signature lines in assingment pdf.
Added test.
2014-10-10 22:24:28 +02:00
Stefan Frauenknecht
276f76d320
Omit leading zero in method item_no if no agenda prefix is given.
2014-10-10 21:30:22 +02:00
Oskar Hahn
32137b6523
Use python3
...
python3.3 and python3.4 are supported
2014-08-24 21:21:11 +02:00
Emanuel Schuetze
f6d0a96126
Show supporters on motion slide if available.
2014-07-14 22:54:53 +02:00
Emanuel Schuetze
587a3766d2
Fixed participant csv import for group id
...
- Allowed to add multiple groups in csv group id field (e.g. "3,4")
- Fixed bug that group ids > 9 can not be imported.
- Updated error message if group id does not exists.
2014-07-14 22:54:53 +02:00
Emanuel Schuetze
648d5a6ad7
Fixed CKEditor stuff:
...
- Added missing insertpre plugin and allow <pre> tag with class
attribute. Added font style to base.css.
- Removed unused link to old ckeditor.css (now managed by
django-ckeditor).
2014-07-14 22:54:53 +02:00
Norman Jäckel
dee81e58b3
Bump version to 2.0a1-dev.
2014-07-14 22:33:54 +02:00
Norman Jäckel
5db47bef76
Update version to 1.6.1-dev
2014-06-02 20:37:51 +02:00
Norman Jäckel
9d40e22783
Release 1.6
2014-06-02 20:37:50 +02:00
Norman Jäckel
2ebd215198
Merge pull request #1321 from emanuelschuetze/template-fixes
...
Last template fixes for 1.6
2014-06-02 18:23:04 +02:00
Emanuel Schuetze
0ebb2eb901
Last template fixes in agenda, motion and assignment list view.
2014-06-01 22:48:15 +02:00
Norman Jäckel
c2ae991fb2
Update help texts in start script. Set x-bit for manage.py.
2014-05-31 12:40:51 +02:00
Oskar Hahn
513000d241
Merge pull request #1316 from normanjaeckel/FixWorkflowBug
...
Fixed bug with workflows. Fixed #1309 .
2014-05-28 12:32:12 +02:00
Norman Jäckel
efb6c17903
Added stylesheet to list of speakers overlay. Fixed #1310 .
2014-05-28 00:30:33 +02:00
Norman Jäckel
52f7dff0f1
Fixed bug with workflows. Fixed #1309 .
2014-05-28 00:20:13 +02:00
Norman Jäckel
c5db1c5e02
Merge pull request #1315 from emanuelschuetze/translations
...
Updated final translations for 1.6 (DE, FR, PT, CS)
2014-05-27 22:45:40 +02:00
Emanuel Schuetze
45c5f13980
Updated final translations for 1.6 (DE, FR, PT, CS)
2014-05-27 21:25:08 +02:00
Emanuel Schuetze
91ebd719bc
Fixed #1311 (Motion poll slides shows wrong value for Abstain vote)
2014-05-22 17:26:38 +02:00
Norman Jäckel
769695bf14
Merge pull request #1307 from emanuelschuetze/en-translationfile
...
Updated EN translation file for transifex
2014-05-20 21:59:00 +02:00
Emanuel Schuetze
431f437ded
Fixed motion title in motion list view ( #1148 ).
2014-05-20 20:29:57 +02:00
Emanuel Schuetze
f1743a3790
Updated EN translation file for transifex
...
String freeze for 1.6.
2014-05-20 12:33:23 +02:00
Norman Jäckel
7ee5f688ae
Update version to 1.6c1-dev
2014-05-19 23:02:39 +02:00
Norman Jäckel
fca8da8ae6
Release 1.6b2
2014-05-19 23:02:39 +02:00
Norman Jäckel
2bfa5f3a72
Prepared for release.
...
Small style changes, CHANGELOG and README.rst update.
2014-05-19 22:55:54 +02:00
Norman Jäckel
f9729fdae3
Merge pull request #1301 from normanjaeckel/MotionTitle
...
Changed motion title behavior.
2014-05-19 22:49:23 +02:00
Norman Jäckel
48471699c2
Merge pull request #1304 from emanuelschuetze/translations
...
Updated translations (from transifex).
2014-05-19 22:48:19 +02:00
Norman Jäckel
00eabcb8c8
Changed motion title appearance. Fixed #1148 .
2014-05-19 22:42:43 +02:00
Emanuel Schuetze
715edf8a03
Updated translations (from transifex).
2014-05-19 22:30:50 +02:00
Norman Jäckel
ae99784372
Enabled reload always when DEBUG==True.
2014-05-19 22:29:05 +02:00
Oskar Hahn
22bacd1054
bind the reload of the webserver on the debug settings
...
fix #1163
2014-05-19 22:18:45 +02:00
Emanuel Schütze
bf8bb31cdb
Merge pull request #1298 from emanuelschuetze/fix-995
...
Improved html templates for mobile devices (responsive).
2014-05-19 22:17:26 +02:00
Emanuel Schuetze
6bdfc33182
Motion CSV Import: Create new category if category is unkown.
2014-05-19 20:31:38 +02:00
Oskar Hahn
16a6ad4a9e
Merge pull request #1278 from rolandgeider/ckeditor
...
Replace own CKeditor with dedicated app
2014-05-19 15:15:54 +02:00
Oskar Hahn
0feed94bf6
Merge pull request #1297 from emanuelschuetze/fix-1104
...
Fixed #1104 (Enable copy/paste in dashboard widgets)
2014-05-19 14:58:01 +02:00
Oskar Hahn
53e0a1086d
Merge pull request #1294 from emanuelschuetze/fix-1158
...
Fixed #1158 (Clean up assignment.css)
2014-05-19 14:57:17 +02:00
Norman Jäckel
38a4cf1bc3
Merge pull request #1295 from emanuelschuetze/pdf-fix
...
PDF: Added missing 'fontName'.
2014-05-19 09:57:50 +02:00
Norman Jäckel
5dc4742f2f
Merge pull request #1291 from emanuelschuetze/fix-1235
...
Fixed #1235 (DeprecationWarning in utils.views.PDFView).
2014-05-19 09:54:45 +02:00
Norman Jäckel
60ba0f6900
Merge pull request #1292 from ostcar/fix_list_of_speaker_on_related_item
...
Fixed link to list of speaker on related items.
2014-05-19 09:50:47 +02:00
Roland Geider
e9d52245cb
Replace own CKeditor with dedicated app
2014-05-19 00:00:18 +02:00
Emanuel Schuetze
802fde42ce
Improved html templates for mobile devices (responsive).
...
Fixed #995 (Use responsive navbar for main menu in backend template)
2014-05-18 22:19:02 +02:00
Emanuel Schuetze
6cb99d9128
Fixed #1104 (Enable copy/paste in dashboard widgets)
2014-05-18 20:42:29 +02:00
Emanuel Schuetze
5f202c22a7
PDF: Add missing 'fontName'.
...
And set 'registerFontFamily(...)' to use bold/italic in regular paragraphs.
2014-05-18 13:57:20 +02:00
Emanuel Schuetze
99ee335925
Fixed #1158 (Clean up assignment.css)
2014-05-17 21:15:46 +02:00
Oskar Hahn
3419855a1e
Fix link to list of speaker item on related items
...
fix #1242
2014-05-17 14:21:57 +02:00
Emanuel Schuetze
bacc9ca87b
Fixed #1235 (DeprecationWarning in utils.views.PDFView)
2014-05-17 13:42:18 +02:00
Oskar Hahn
f0572551b3
Fix default-slide-preview-url
...
Fix #1246
2014-05-17 13:30:37 +02:00
Norman Jäckel
b16641c0dc
Renamed 'permission_required' to 'required_permission' etc.
...
Renamed method and attribute of openslides.utils.views.PermissionMixin. Renamed attribute of widgets and main menu entries. Fixed #1160 .
2014-05-15 20:07:09 +02:00
Norman Jäckel
ecf0e8b0d7
Cleaned up some widgets and the base.css. Removed icon definitions.
2014-05-15 17:23:46 +02:00
Emanuel Schuetze
f651ccf3b9
Fixed #1275 (Creating assignment pdf failed)
2014-05-13 21:39:27 +02:00
Oskar Hahn
86ac16dd14
Merge pull request #1283 from normanjaeckel/FixEnglishString
...
Fixed English strings concerning agenda items and organizational items a...
2014-05-13 13:08:05 +02:00
Oskar Hahn
c132346d14
Merge pull request #1284 from normanjaeckel/RefactorConfig
...
Changed permission system for config pages.
2014-05-13 13:03:09 +02:00
Oskar Hahn
bebd73dde2
Merge pull request #1282 from normanjaeckel/FixWidgets
...
Fixed permission error in some widgets.
2014-05-13 13:00:45 +02:00
Oskar Hahn
e6cbfdf575
Merge pull request #1281 from normanjaeckel/AssignmentPollBug
...
Fixed error when creating an assignment poll. Fixed #1203 .
2014-05-13 12:59:58 +02:00
Oskar Hahn
cfea637676
Merge pull request #1277 from emanuelschuetze/fix-mediafileprojector
...
Added missing mediafile projector stylefile for pdf.js presentation.
2014-05-13 12:57:51 +02:00
Norman Jäckel
9f99ef8a38
Fixed error when creating an assignment poll. Fixed #1203 .
2014-05-12 22:58:23 +02:00
Norman Jäckel
43429d4015
Changed some docstrings.
2014-05-12 22:57:57 +02:00
Norman Jäckel
ee82c2c105
Fixed English strings concerning agenda items and organizational items and their relation. Fixed #1271 .
2014-05-12 22:56:57 +02:00
Norman Jäckel
c747f09ad0
Changed permission system for config pages.
...
Config pages are now only available for users with permission 'config.can_manage'. Fixed #1159 .
2014-05-12 22:56:19 +02:00
Norman Jäckel
ebe8f90d1e
Fixed permission error in some widgets.
...
Fixed agenda item widget, assignment widget, motion widget, participant user widget and participant group widget. Fixed #1279 .
2014-05-12 22:55:49 +02:00
Emanuel Schuetze
1deaaf241e
Added missing mediafile projector stylefile for pdf.js presentation.
2014-05-09 14:03:53 +02:00
Norman Jäckel
d4358d6aae
Update version to 1.6b2-dev
2014-05-05 21:30:12 +02:00
Norman Jäckel
a581393b32
Release 1.6b1
2014-05-05 21:28:53 +02:00
Norman Jäckel
1857195812
Updated German translation.
2014-05-05 21:11:09 +02:00
Norman Jäckel
b8cd2d360b
Merge pull request #1270 from emanuelschuetze/fix1178
...
Adds plugin directory for win32 portable version (Fixed #1178 ).
2014-05-05 21:07:51 +02:00
Emanuel Schütze
7add4c5691
Portable: Create empty plugins directory.
...
Fixed file permissions.
2014-05-05 21:01:25 +02:00
Norman Jäckel
7e085be54c
Updated English language file.
2014-05-05 20:31:22 +02:00
Norman Jäckel
808715f34f
Merge pull request #1262 from emanuelschuetze/fix-1260-1261
...
Fix for new percent base choice config (Fixed #1260 )
2014-05-05 20:28:20 +02:00
Emanuel Schütze
5953e58c99
Fixed #1260 (Change description of percent base choices)
2014-05-05 20:21:21 +02:00
Oskar Hahn
921e4ab2bd
Merge pull request #1268 from emanuelschuetze/translationstrings
...
Updated translation strings.
2014-05-05 16:15:44 +02:00
Oskar Hahn
9be0409869
Merge pull request #1266 from andkit/issue1253
...
Fix #1253 data table in motion overview displayed incorrectly
2014-05-05 16:14:59 +02:00
Andy Kittner
3584da89c3
Automatically load plugins from portable plugins dir; closes #1178
...
All modules/ packages in the openslides/plugins subdirectory of the
portable version will be automatically added to INSTALLED_PLUGINS
2014-05-05 00:55:22 +02:00
Emanuel Schütze
3ece699cd6
Add get_win32_portable_user_data_path() function in main.py to return
...
correct user data path ("/openslides") of portable version.
2014-05-05 00:55:17 +02:00
Emanuel Schütze
9c43523f06
Updated translation strings.
...
Improved shortcut countdown layout.
2014-05-04 20:49:05 +02:00
Andy Kittner
4af6fe1c9a
Fix #1253 data table in motion overview displayed incorrectly
2014-05-04 16:40:50 +02:00
Norman Jäckel
d638d5b7e2
Fixed bug of numbering view when there are orga items. Renamed toRoman to to_roman.
2014-05-04 14:00:28 +02:00
Stefan Frauenknecht
f8bd4b0d86
Numbering of agenda items, part 2.
...
Config item agenda_agenda_fixed removed'.
Config items agenda_agenda_fixed and agenda_enable_auto_numbering removed.
FixAgendaView and ResetAgendaView removed. AgendaNumberingView added.
Old two fix- and reset numbering buttons replaced by 'Number agenda items'.
2014-05-04 13:47:01 +02:00
Norman Jäckel
5254cc83a6
Updated numbering feature.
...
Fixed organizational item structuring. Prevented organizational items
from having agenda items as descendents. Some coding style changes.
Added CHANGELOG and README entries.
2014-05-04 13:47:01 +02:00
Stefan Frauenknecht
2c5b3a8e4f
Automatic numbering of agenda items
2014-05-04 13:47:01 +02:00
Norman Jäckel
1fbd77e701
Updated English language files.
2014-05-02 23:53:51 +02:00
Emanuel Schuetze
157d4bdc14
New poll slides for motion and assignment. ( Fixed #862 )
...
Move result table from assignment slide to assignment poll slide.
Use "result" in singular for motion and election results.
2014-05-02 23:40:23 +02:00
