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
Norman Jäckel
84f9963bea
Updated English language files.
2014-04-28 23:45:44 +02:00
Norman Jäckel
c1c952c136
Merge pull request #1257 from emanuelschuetze/projector-logo
...
Use right projector logo (as in stable/1.5.x branch).
2014-04-28 22:21:11 +02:00
Emanuel Schütze
945771e8a6
Use right projector logo (as in stable/1.5.x branch).
2014-04-28 22:07:06 +02:00
Emanuel Schütze
fa6c7d9d86
Fixed #1102 (New config option to set percent base for polls)
...
Use locale format for poll percentage decimal number.
2014-04-28 21:57:31 +02:00
Emanuel Schütze
579c9d49f0
Fixed #1240 (No assignment poll form fields for votes invalid and votes cast)
2014-04-28 21:57:17 +02:00
Norman Jäckel
3379f9542a
Update English translation files.
2014-04-28 21:11:15 +02:00
Oskar Hahn
b232ed0c96
Merge pull request #1221 from emanuelschuetze/fix-1197
...
Fixed #1197 : Use big heading for custom slides without text.
2014-04-27 21:08:18 +02:00
Emanuel Schütze
3b3597aa1f
Improved chatbox style. Updated jquery cookie and jquery ui.
...
- Fixed js error on dashboard page if no cookie is found.
- Use cookies only until end of session. For dashboard cookies use url /dashboard only.
- Updated permission numbering of builtin groups and added can_use_chat permission.
- Used minified version of jquery.cookie.
- Added TODO comment for django session way from pull request.
2014-04-27 20:58:22 +02:00
Norman Jäckel
42796f6118
Added global chatbox for managers.
2014-04-27 20:58:22 +02:00
Emanuel Schütze
d44f385ba8
Fixed #1197 : Use big heading for custom slides without text.
...
Keep last projector scale/scroll values after activate new slide.
2014-04-27 20:55:06 +02:00
Oskar Hahn
3d092f6dcc
countdown shortcuts
2014-04-27 19:48:57 +02:00
Norman Jäckel
ac1ab81d7a
New projector view with the current list of speakers.
2014-04-15 01:00:56 +02:00
Norman Jäckel
f8cdad711c
Simplify overlay api methods.
2014-04-15 00:33:34 +02:00
Norman Jäckel
2a10feecad
Added CSV import, fixed #1186 . Also cleaned up motion and user CSV import.
2014-04-13 20:35:19 +02:00
Norman Jäckel
78077e4ab1
Fix syntax and style errors and errors after deficient merge conflic
...
resolving after branch merging.
2014-04-08 21:02:09 +02:00
Norman Jäckel
e6dad6d087
Merge part of stable/1.5.x into master.
...
Conflicts:
CHANGELOG
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/__init__.py
openslides/core/templates/base.html
requirements_production.txt
tests/config/test_config.py
2014-04-08 20:33:07 +02:00
Emanuel Schütze
3d7ecab8e4
Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2
...
Conflicts:
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/assignment/views.py
openslides/core/static/img/circle.png
openslides/motion/pdf.py
openslides/utils/pdf.py
2014-04-07 22:35:52 +02:00
Norman Jäckel
c13c0997bf
Merge part of stable/1.5.x into master.
...
Conflicts:
openslides/agenda/views.py
openslides/mediafile/forms.py
openslides/projector/api.py
The fix from commit 39de1924cb
was removed
because of the new widget system in master branch. See GitHub Issue #1191
2014-04-05 15:19:42 +02:00
Norman Jäckel
ba1dc9673f
Update version to 1.5.2-dev
2014-03-31 23:55:32 +02:00
Norman Jäckel
18a434ed87
Release 1.5.1
2014-03-31 23:55:32 +02:00
Norman Jäckel
a15311dfeb
Merge pull request #1238 from normanjaeckel/Translation
...
Update translation files, fix translation for dataTables, update footer.
2014-03-31 23:21:54 +02:00
Norman Jäckel
3ae7b0f761
Update translation files, fix translation for dataTables, update footer.
2014-03-31 23:07:42 +02:00
Roland Geider
5bac8ec1e4
Correctly handle nested lists in the motion PDF
...
See #1217
2014-03-31 22:07:14 +02:00
Oskar Hahn
3b65e89f7c
fix user status view (activate, deactivate user without js)
2014-03-30 17:22:42 +02:00
Emanuel Schütze
b5fb83c026
Fixed #551 : Used unicode font for circle in ballot pdf. Removed pillow.
...
That fixed also #1140 (Server error when trying to view ballot paper pdf)
2014-03-29 13:20:31 +01:00
Norman Jäckel
ee3ec3d4b6
Fixed flake8 errors.
2014-03-27 20:38:13 +01:00
Norman Jäckel
39de1924cb
Added extra permission check to speaker widget, fixed #1191 only for 1.5.x branch
2014-03-13 00:50:49 +01:00
Norman Jäckel
e7f67457db
Regrouped config collections and pages. Fixed #1201 .
2014-03-13 00:41:57 +01:00
Oskar Hahn
a6fa8457cc
Merge remote-tracking branch 'openslides/stable/1.5.x'
...
Conflicts:
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/motion/templates/motion/motion_list.html
openslides/projector/templates/projector.html
requirements_production.txt
2014-03-12 19:29:22 +01:00
Oskar Hahn
57ea4af4e2
Merge pull request #1211 from normanjaeckel/PreviewAgenda
...
Reinserted icon and link for preview of agenda slide. Fixed #1199 .
2014-03-11 07:42:24 +01:00
Norman Jäckel
ce8274fb53
Inserted command line option to translate config strings during database setup. Fixed #460 .
2014-01-31 02:03:43 +01:00
Norman Jäckel
3b42c16e04
Reinserted icon and link for preview of agenda slide. Fixed #1199 .
2014-01-31 01:02:12 +01:00
Norman Jäckel
d49d087f4e
Merge pull request #1208 from ostcar/customslide
...
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-29 04:09:52 -08:00
Oskar Hahn
2392c1ab36
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-28 08:32:26 +01:00
Emanuel Schuetze
cfa35241e1
Fixed #1138 : Wrong file for projectors logo
2014-01-27 21:15:53 +01:00
Emanuel Schuetze
d15488478d
Fixed #1195 : Correct path to circle.png on ballot paper (assignment and motion).
2014-01-27 20:54:32 +01:00
Emanuel Schuetze
13eb0ccb30
Fixed #1190 : Wrong sorting of motion identifier
...
- Added natural sorting JS plugin for motion DataTables (column identifier).
- Added the new requirements python package 'natsort' for natural sorting of motions in PDF.
2014-01-21 23:14:39 +01:00
Norman Jäckel
4c3791a9a8
Merge pull request #1193 from emanuelschuetze/rename-static-files
...
Rename and clean up static directories.
2014-01-16 13:35:38 -08:00
Emanuel Schuetze
d8d2ad002a
Rename and clean up static direcories.
...
- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files
2014-01-14 23:27:12 +01:00
Norman Jäckel
4b63f3a288
Coupled assignment candidates with list of speakers. Fixed #1092 .
2014-01-13 15:22:46 +01:00
Oskar Hahn
d72fe39da6
Merge branch 'stable/1.5.x'
2014-01-12 13:38:07 +01:00
Oskar Hahn
bbd7542341
Fixed agenda_item.is_active_slide() with related item and list of speakers
2014-01-12 12:48:38 +01:00
Norman Jäckel
04b0cfb0bc
Used entry points to detect plugins automaticly.
2014-01-12 12:48:24 +01:00
Norman Jäckel
e0223c950b
Added possibility to use custom templates and static files in user data path directory.
2014-01-12 11:05:54 +01:00
Oskar Hahn
6409f828d7
Added a poll description field for each assignment poll
...
fixed signals in MainMenuTests
2014-01-12 10:22:38 +01:00
Oskar Hahn
c82ee4ce1f
Added AbsoluteUrlMixin and used it in any model.
...
cleaned up get_absolute_url() in some models
2014-01-12 00:35:16 +01:00
Norman Jäckel
3fe9169786
Merge pull request #1175 from normanjaeckel/MultipleParticipantsForm
...
Added form field for multiple creation of new participants. Fixed #178 .
2014-01-11 15:26:36 -08:00
Norman Jäckel
b95a856904
Added form field for multiple creation of new participants. Fixed #178 .
2014-01-11 23:09:59 +01:00
Oskar Hahn
90f9313faa
Use the jsonfield as requirement
2014-01-11 23:01:29 +01:00
Oskar Hahn
56c8dcdac1
Merge branch 'stable/1.5.x'
2014-01-11 22:58:39 +01:00
Oskar Hahn
558bef2e91
Merge pull request #1167 from normanjaeckel/MainError
...
Fixed error in main script when using other database engine. Fixed #1166 .
2014-01-11 13:49:57 -08:00
Oskar Hahn
cde6232477
Merge branch 'stable/1.5.x'
...
Conflicts:
openslides/projector/projector.py
openslides/templates/base.html
2014-01-11 22:30:14 +01:00
Oskar Hahn
ad09a18e3f
removed edit and view in get_absolute_view
2014-01-11 17:39:16 +01:00
Oskar Hahn
4c86c9cd07
Fix list_of_speaker overlay
...
* Issue a warning message, if a overlay raises a exception
* Fixed #1131
2014-01-11 09:21:35 +01:00
Norman Jäckel
19ccbd3b17
Fixed error in main script when using other database engine. Fixed #1166 .
2014-01-11 08:51:17 +01:00
Norman Jäckel
21ff62dd32
Changes in projector and core app and in utils.
...
Changed api for main menu entries.
Enhanced http error pages using a classed based views.
Moved dashboard and select widgets view from projector to core app.
Also some small clean ups.
2014-01-10 16:17:54 +01:00
Norman Jäckel
22960748a3
Added permission to see participants also to the manager group. See #1150 .
2013-12-23 19:14:11 +01:00
Norman Jäckel
1e52959f70
Fixed error when a file was removed from filesystem. Fixed #1120 .
2013-12-23 18:46:04 +01:00
Norman Jäckel
03fd7fd142
Fixed http status code when requesting a non-existing static page using Tordado web server. Fixed #1161 .
2013-12-23 17:42:11 +01:00
Norman Jäckel
9a3243706b
Inserted api for the personal info widget.
2013-12-09 12:16:16 +01:00
Norman Jäckel
405fadb6f5
Rename some classes of the poll api. Clean up the poll api.
2013-12-07 00:24:11 +01:00
Norman Jäckel
bdf1679eb0
Rename classes in the config api.
...
Also change attributes for config collection without view.
2013-12-06 10:47:20 +01:00
Norman Jäckel
fee983045b
Change API for plugins, esp. for names and versions of plugins. Also enhance possibility to patch existing OpenSlides urlpatterns.
...
Fix some other tests by the way.
2013-12-05 16:40:54 +01:00
Norman Jäckel
91ca066aa5
Enable update and delete view for uploader refering to his own files.
2013-12-03 01:53:37 +01:00
Norman Jäckel
43c6efa222
Disable participant widgets by default. Fixes #988 .
2013-12-02 18:03:28 +01:00
Oskar Hahn
2cf2774e58
Merge pull request #1139 from DerPate/fix_last_gpl_header
...
remove the last occurence of gnu gpl license header fix #1130
2013-12-02 07:46:09 -08:00
Dominik Breu
a3bf29acf2
remove the last occurence of gnu gpl license header fix #1130
2013-12-01 22:52:08 +01:00
Norman Jäckel
1fb1f17d15
New API for widgets using a metaclass.
...
It is now possible to define a default state and to submit extra stylefiles and javascript files when defining a widget in an app. This is done by a new metaclass in openslides.utils.dispatch. Also fixed some other tests.
2013-12-01 21:30:12 +01:00
Emanuel Schuetze
25d7e0f99b
Fixed dummy-notification message class and generic new_message function.
2013-11-29 13:04:29 +01:00
Emanuel Schuetze
42f10fa03d
Fixed projector template: Removed double <hr> in welcome and custom slide.
2013-11-29 13:04:28 +01:00
Norman Jäckel
f510399230
Update version to 1.6a1-dev.
2013-11-25 23:42:52 +01:00
Norman Jäckel
dfa334782e
Update version to 1.5.1-dev
2013-11-25 20:26:06 +01:00
Norman Jäckel
dc529feda4
Release 1.5
2013-11-25 20:26:06 +01:00
Oskar Hahn
5541861176
Merge pull request #1125 from emanuelschuetze/documentation1.5
...
Documentation1.5
2013-11-25 11:08:25 -08:00
Emanuel Schuetze
0d149180dd
Updated documentation for 1.5
...
- Updated all screenshots.
- Improved image handling with autoimage extension.
- Some minor content updates for 1.5 version.
- Fixed wrong list of speakers icon.
2013-11-25 17:14:11 +01:00
Oskar Hahn
49ca243153
Add function get_active_object and bugfixes
...
* Dont throw errors in overlay.get_projector_html if debug == False
* fixe check of active slide in agenda
* Fix #1121
2013-11-25 11:35:03 +01:00
Oskar Hahn
d6a824936d
Merge pull request #1119 from ostcar/translate_languages
...
translate lanuage names in global_settings
2013-11-24 15:08:42 -08:00
Oskar Hahn
d02721a1f1
translate lanuage names in global_settings
...
Fixes : #1118
2013-11-25 00:07:06 +01:00
Emanuel Schuetze
ed427048af
Final update of all languages for 1.5: CS, DE, FR, PT.
2013-11-24 20:37:13 +01:00
Oskar Hahn
f8048da76c
Fixed countdown and projector update issues
...
* agenda_item.get_absolute_url('projector') returns the activate-url of the related slide.
* agenda_item.is_activate() returns True, if the related item is active
* Fixed set_active_slide to accept kwargs
* Reset countdown when saving a new duration time
* Update countdown overlay when begin_speak and end_speak is called
* Fixed blinking countdown
Fixes : #1078 , #1076 , #1075
2013-11-24 10:04:01 +01:00
Norman Jäckel
d2d8b5a39d
Fix start script help text.
2013-11-23 18:49:51 +01:00
Norman Jäckel
2af3b320c8
Merge pull request #1116 from emanuelschuetze/template-fix2
...
Minor template fixes
2013-11-23 08:25:33 -08:00
Emanuel Schuetze
f1fd3208bd
Template fixes
...
- Agenda overview: Fixed padding of duration column.
- Agenda overview: Optimize header information for small devices with bootstrap's row-fluid class.
- Fixed text align in assignment detail template.
2013-11-23 15:05:19 +01:00
Emanuel Schuetze
8ca4f0409f
Use btn-mini class for list of speakers question in agenda view.
2013-11-22 20:39:28 +01:00
Emanuel Schuetze
f59b25e0dc
Updated EN po file.
2013-11-22 15:35:24 +01:00
Emanuel Schuetze
301bc8ac7c
Translate state.name in motion log message.
2013-11-22 15:34:32 +01:00
Emanuel Schuetze
94abda60b5
Added help text for duration field in agenda item form. ( Fixed #1085 )
2013-11-22 10:04:00 +01:00
Norman Jäckel
5bff907b34
Merge pull request #1091 from emanuelschuetze/template-fixes
...
Fixed a lot of template bugs from irc test session.
2013-11-21 10:48:40 -08:00
Dominik Breu
8e6269b495
fix #1085 maybe could be done better but for 1.5 integration this could be used . input 60< is converted to hh:mm
2013-11-21 08:13:24 +01:00
Emanuel Schuetze
9aed1f764d
Fixed a lot of template bugs.
...
- agenda overview: Text align right for duration column.
- item summary slide: Show 'get_title_supplement' after each related agenda item.
- item detail view: Add ":" in button after item content_type
- projector: Show <hr> below title/subtitle line.
- motion view: Check manage permission for delete version button in version history table.
- motion detail view: Update version authorized badges and go to buttons.
- motion list: Link warning icon to newest version.
- assignment detail view: Added ballot paper pdf button.
- Group slide and overview: Show members.
- Use dynamic title column width in participants pdf.
- Fixed missing translations in user settings form.
- IE8/9 fix for projector template style.
- Style linebreak and border in h1 title with css.
2013-11-20 22:05:10 +01:00
Norman Jäckel
c34b407945
Fix templatetag, #1077 .
2013-11-19 17:57:03 +01:00
Oskar Hahn
3d19ae7db2
Merge pull request #1082 from normanjaeckel/SetStateView
...
Add check for set state view, fix #1080 .
2013-11-19 08:13:10 -08:00
Norman Jäckel
31af5c0ce6
Add check for set state view, fix #1080 .
2013-11-19 01:06:38 +01:00
Norman Jäckel
1a33c1c9f1
Add percent base value to all polls, fix #1079 .
2013-11-19 00:19:46 +01:00
Emanuel Schuetze
208c870705
Rename assignment to election in translation strings which are used in the GUI.
...
Updated EN po file.
2013-11-18 17:21:21 +01:00
Emanuel Schuetze
28271019fd
Improved #1023 - Motion csv import: Collect all warnings and errors in one message.
2013-11-18 17:21:21 +01:00
Oskar Hahn
ddffffd3a1
Merge pull request #1071 from emanuelschuetze/fix-1070
...
Fixed #1070 (Clear search index for deletedb and syncdb command)
2013-11-18 08:07:32 -08:00
Oskar Hahn
ecb3db851a
Use the default django message back end
2013-11-18 09:28:49 +01:00
Oskar Hahn
3fc531255f
Merge pull request #1069 from ostcar/reset_passwort_question
...
Make sure QuestionView.get_question_message is in a unicode context.
2013-11-18 00:26:24 -08:00
Oskar Hahn
4db41e3161
Merge pull request #1064 from emanuelschuetze/fix-947
...
Fixed #947 : Move pdf functions of participant app to new pdf.py
2013-11-18 00:25:52 -08:00
Oskar Hahn
4fa2c25978
Make sure QuestionView.get_question_message is in a unicode context.
...
This is important if the attribute question_message is set with
ugettext_lazy which needs an unicode context
Fixes #1066
2013-11-17 11:11:39 +01:00
Emanuel Schuetze
85fc09036f
Fixed #1070 (Clear search index for deletedb and syncdb command)
2013-11-16 20:38:41 +01:00
Emanuel Schuetze
40ef2a31f6
Fixed #947 : Move pdf functions of participant app to new pdf.py
2013-11-15 20:15:21 +01:00
Dominik Breu
0c32ef9c40
fix #1044 Remove GNU GPL header
2013-11-15 16:01:14 +01:00
Andy Kittner
87d46d079d
Rework DjangoStaticFileHandler ( fixes #1034 )
...
Fixes multiple issues
- Unicode errors when path contained non-ascii characters
- 403 errors when the current working directory was not a parent
directory of the static files
- "API abuse" super() implementation of the get() method was passed a
filesystem path instead of the url-path it was expecting
- The above could also lead to 403 errors on case-insensitive file
systems due to the way the base-class resolved and validated paths
with respect to self.root
2013-11-14 22:45:29 +01:00
Norman Jäckel
9dc73fa6de
Verbose name of Assignment inserted, fixed #1036
...
It is neccessary to refresh the database table for the content types, e. g. by deleting the database and runing syncdb.
2013-11-14 22:38:12 +01:00
Andy Kittner
0d4c48a9c0
Set reuse address option ( fixes #1043 )
...
When the server is killed there may still be client-sockets connected in
the TIME_WAIT state, causing the bind() call to fail. With the
REUSEADDR option we can reuse the address immediately unless another
process is actually *listening* on the same address.
that we want to reuse the address
2013-11-14 22:38:12 +01:00
Max Brauer
091a2bc35c
Bugfix in agenda.js ( fixes #1041 )
2013-11-12 21:33:57 +01:00
Oskar Hahn
728a33f5c3
Merge pull request #1021 from DebVortex/feature/fix-issue-994
...
fixes #994 : store collapsed and fixed of widets in cookie, too.
2013-11-12 05:36:08 -08:00
Max Brauer
c7afce30a1
fixes #994 : store collapsed and fixed of widets in cookie, too.
2013-11-12 14:29:48 +01:00
Oskar Hahn
c4c9483b5e
Merge pull request #1046 from emanuelschuetze/translation-fix
...
Fixed typo (titel->title).
2013-11-12 05:07:45 -08:00
Oskar Hahn
d9cf05ef55
Merge pull request #1042 from emanuelschuetze/1.5b2-fixes
...
1.5b2 fixes
2013-11-12 05:07:17 -08:00
Emanuel Schuetze
b8e30188ad
Fixed #1040 : Show only last motion poll results on projector.
2013-11-12 11:13:36 +01:00
Emanuel Schuetze
06b91b89bb
Fixed typo (titel->title).
2013-11-12 10:57:07 +01:00
Oskar Hahn
9d8d9f806f
Fixed agenda slide
...
Fixes #1035
2013-11-12 08:59:20 +01:00
Emanuel Schuetze
2034852fa8
Fixed #1038 : Increase small input fields in poll forms.
2013-11-11 17:36:52 +01:00
Emanuel Schuetze
92b111c0bd
Fixed #1039 : Motion poll edit view: projector icon needs 'if slide is activate' check.
2013-11-11 17:36:12 +01:00