Commit Graph

2572 Commits

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