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

626 Commits

Author SHA1 Message Date
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
Maximilian Krambach
e8fa0eca5a New calculate percentage options (fixes issue #2182) 2016-09-23 14:45:49 +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
448756f17a Docx export with docxtemplater 2016-09-23 14:20:07 +02:00
FinnStutzenstein
ceb9e70f6e Updating lodash (fixes #2293) 2016-09-22 12:34:53 +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
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
Sean Engelhardt
cc5ff21005 Add line numbers to pdf (fixes #2300) 2016-09-20 11:34:19 +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
a7f5d4dd3c Fixed syntax of all uib-alerts. 
Required after ui-bootstrap upgrade.
 2016-09-18 21:09:37 +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
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
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
FinnStutzenstein
bdeeb53f9b Confirm multiple deletions (fixes #2384) 2016-09-15 14:48:03 +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
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
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
sean
23b7d74890 create ballot papers with pdfmake (fixes #2298) 2016-09-06 16:08:25 +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
Norman Jäckel
b4d4026316 Refactored user serializers for different client permissions. See #1871. 2016-09-05 13:48:06 +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
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
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
Maximilian Krambach
fc1ce3d90d added option to calculate % based on Yes/No (for motions) (fixes #2182) 2016-08-29 13:07:57 +02:00
Maximilian Krambach
126cfb9000 Parent items for Agenda items (fixes #2213) 2016-08-25 13:51:54 +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
Norman Jäckel
b0070d13b9 Added possibility to sort motions in category numbering view. 2016-08-16 23:51:12 +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
Norman Jäckel
7e6dc50b39 Added viewpoint to number all motions in a category. 2016-07-29 11:56:12 +02:00
Emanuel Schuetze
af16733b36 Use origin field in motion detail and list view (Fixes #2227) 2016-07-27 16:16:22 +02:00
Norman Jäckel
0b9a64f968 Added motion origin field. 2016-07-13 14:45:40 +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
Sean Engelhardt
520f8362fa Add translatable entries for QuickEdit (Fixes #2164) 2016-06-28 14:06:46 +02:00
Norman Jäckel
b45e0ea09f Fixed coding style. 2016-06-16 10:28:14 +02:00
Maximilian Krambach
a5a00a7eda Config translations moved to client side (Issue #2093) 2016-06-12 11:46:46 +02:00
Joel Macht
b7d83e786f Fix linebreak on tags, add spacing and remove commas (Fixes #2147) 2016-06-10 18:17:42 +02:00
Maximilian Krambach
5061ea1770 typo fixing (issue #2181) 2016-06-08 22:18:35 +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
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
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
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
Norman Jäckel
8d5e983d29 Merge pull request #2077 from emanuelschuetze/translations 
Translations
 2016-04-12 23:47:38 +02:00
Emanuel Schuetze
7229c8dc3a Fix translation strings. 2016-04-12 22:47:46 +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
e2383dc770 Merge pull request #2051 from emanuelschuetze/templateFixes2 
Template improvements
 2016-03-20 21:21:52 +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
Emanuel Schuetze
5e08e073f4 Fix translation strings in motions and users forms. 2016-03-19 13:06:36 +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
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
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
Norman Jäckel
de871f3f9c Squished migrations files. 2016-03-02 14:26:47 +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
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
9a94dfc735 Merge pull request #1993 from emanuelschuetze/fix1710 
Added motion poll pdf (Fixes #1710).
 2016-02-23 22:38:28 +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
0e40735931 Fix motions and users csv import. 2016-02-17 21:19:26 +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
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
Emanuel Schuetze
322957eb7e Fixed motion edit url. 2016-02-09 23:05:36 +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
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
3be21473a4 Merge pull request #1956 from emanuelschuetze/master 
Several template fixes
 2016-02-08 22:32:56 +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
f89f3a9933 Improved motion state dropdown element. 2016-02-08 20:34:12 +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
fb41d0a219 Show missing translations. Updated de and pt. 2016-01-30 09:20:53 +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
Emanuel Schuetze
deea222434 Translate permission strings. (Fixes #1895) 
Remove unused gettextCatalog content provider.
 2016-01-27 20:23:53 +01:00
Emanuel Schuetze
09b397f3b1 Fixed remarks from #1898. 2016-01-27 20:03:53 +01:00
Emanuel Schuetze
23503eb4ba Several template fixes and clean up 
- Use ng-cloak for hide template parts while loading.
- Set html lang attribute dynamically (Fixes #1546)
- Clean up: Rename 'dashboard' to 'home'.
- Show duration of speech in minutes. (Fixes #1882)
- Save agenda specific stuff for customslides. (Fixes #1887)
- Remove title from QuickEdit from.
- Checkbox for item.closed is now visible for manager only.
- Agenda list view: Show list of speakers link also for normal users.
- Improve slide templates: Show agenda item number and subtitle.
- Fixed agenda title for motions and assignments.
  (Don't load motions and assignmetn in agenda app.)
- Added missing seach template.
 2016-01-27 12:10:40 +01:00
Emanuel Schuetze
2a9e0b4b81 Implement full text search (client side) Fixes #1699 2016-01-27 00:16:30 +01:00
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
673a761f6d Merge pull request #1877 from emanuelschuetze/translationFix 
Add Translation strings and updated po files
 2016-01-24 22:17:56 +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
7bc1851a09 Use osFilter for motions, assignments and mediafiles. (Fixes #1784) 2016-01-21 23:20:14 +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
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
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
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
Emanuel Schuetze
d8aee16fec Added missing motionpoll-form template. Fix remark in motion-detail. 2016-01-15 09:46:55 +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
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
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
09b88fb4a6 Redesign projector template. 2016-01-13 10:28:49 +01:00
Emanuel Schuetze
93e2296bdc A lot of template fixes 
- Reset password from current (unsaved) value of default_password.
- MotionForm, AssignmentForm and UserForm factory for open ngDialog.
  Fixes edit url redirect problem.
- Added back-to-detail-view-button to list of speakers view.
- Add translation context.
- Fixed (missing) translation strings.
- Fixed tags and category list views.
- motion detail: Use select box for changing state.
- motion slide updated
 2016-01-13 10:22:24 +01:00
Emanuel Schuetze
f9f3af245e Template fixes. 
- Use PATCH request for user profile update.
 2016-01-10 11:18:13 +01:00
Emanuel Schuetze
071b0a76be Fixed permissions in list views. 2016-01-10 01:02:13 +01:00
Norman Jäckel
8d1c351c9a Squished all migrations. 2016-01-09 19:10:57 +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
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
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
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
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
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
Norman Jäckel
7843cc2ec0 Merge pull request #1785 from emanuelschuetze/fix-template-bugs 
Fix template bugs
 2016-01-09 01:12:51 +01:00
Emanuel Schuetze
de77cfc38c Fixed zooming/scrolling on slides. 2016-01-08 21:31:58 +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
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
Emanuel Schuetze
f5efca1d1e Added whitespace before triple dots in template (Fixes #1729) 2015-12-12 10:16:44 +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
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
Emanuel Schuetze
ca94a4e720 Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728) 2015-12-11 19:50:50 +01:00
Norman Jäckel
114a38e4ee Deleted Django's default permissions. 2015-12-10 00:31:27 +01:00
Emanuel Schuetze
3c5f49a127 Updated English translation strings. 2015-12-07 15:15:12 +01:00
Emanuel Schuetze
5c6977c46d Template fixes 2015-12-06 17:26:10 +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
b81704a88f Fixed translations in agendaSupplement. 2015-12-01 13:45:54 +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
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
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
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
Norman Jäckel
c5f5fbf203 Remove translations for projector exception messages. 2015-11-21 00:01:48 +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
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
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
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
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
0fc915ec35 Fixed changes in motion poll serializer. 2015-10-21 22:24:11 +02:00
Norman Jäckel
817e15b01a Changed Motion Poll REST fields. 2015-10-21 21:20:38 +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
Norman Jäckel
8c48d67df0 Fixed projector. 2015-09-14 20:30:37 +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
2da2177c49 Autogenerate the main menu. 2015-09-05 17:23:47 +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
0e124dbbae Use tags in agenda. Fix motions.js. 2015-09-05 10:07:53 +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
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
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
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
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
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
6b5ce5ae2f Added motion and assignment detail slide. 2015-06-24 22:12:06 +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
Norman Jäckel
e0188a149d Added view to create related assignment and motion items. Updated serializers. 2015-06-21 23:32:21 +02:00
Emanuel Schuetze
9a117999ef Updated motion list, form and detail views. 2015-06-20 10:44:00 +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
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
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
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
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