ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,773 Commits 6 Branches 42 Tags 64 MiB
148e7f6a9b
Commit Graph

233 Commits

Author SHA1 Message Date
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