dc80efeee9
Fix syntaxerror in python
2016-01-10 09:47:08 +01:00
78640a27f1
Remove item id from error message "{user} is already on the list of speakers."
2016-01-10 09:32:06 +01:00
071b0a76be
Fixed permissions in list views.
2016-01-10 01:02:13 +01:00
83ac20a704
Fixed strange empty field for sorting list of speakers.
2016-01-10 00:56:04 +01:00
c30116f5c1
Merge pull request #1815 from emanuelschuetze/candidateElected
...
Mark candidate as elected. Updated assignment detail.
2016-01-09 22:37:39 +01:00
2c46d3ae0a
Mark candidate as elected. Updated assignment detail.
2016-01-09 22:35:04 +01:00
8d1c351c9a
Squished all migrations.
2016-01-09 19:10:57 +01:00
ae315d388b
Merge pull request #1804 from ostcar/remove_old_search
...
Remove old haystack files
2016-01-09 17:01:42 +01:00
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
b7d63afc91
Remove old haystack files
2016-01-09 16:50:39 +01:00
c2041dca6f
Merge pull request #1796 from normanjaeckel/MoveTranslations
...
Remove model field verbose names. Move help texts.
2016-01-09 14:25:42 +01:00
e406b92745
Remove model field verbose names. Move help texts.
2016-01-09 14:17:51 +01:00
54b1c8e350
Show agenda titles with correct numbering
2016-01-09 14:01:30 +01:00
4b69c57c78
Merge pull request #1789 from ostcar/update_requirements
...
Update requirements
2016-01-09 12:22:41 +01:00
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
db22d1f7dc
Merge pull request #1777 from emanuelschuetze/fix1662
...
Sort list of speakers (Fixes#1662)
2016-01-09 12:04:38 +01:00
74110453c8
Rename ItemDetailSlide to ListOfSpeakersSlide ( Fixes #1576 )
2016-01-09 10:55:12 +01:00
5cab3bf3dc
Added indentation of subitems on agenda slide ( Fixes #1716 )
2016-01-09 10:34:34 +01:00
3304cf48c5
Sort list of speakers ( Fixes #1662 )
2016-01-09 09:44:01 +01:00
7843cc2ec0
Merge pull request #1785 from emanuelschuetze/fix-template-bugs
...
Fix template bugs
2016-01-09 01:12:51 +01:00
241d3dbc20
Sorted list of speakers.
2016-01-08 23:32:29 +01:00
de77cfc38c
Fixed zooming/scrolling on slides.
2016-01-08 21:31:58 +01:00
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
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
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
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
f5efca1d1e
Added whitespace before triple dots in template ( Fixes #1729 )
2015-12-12 10:16:44 +01:00
31c320f9ef
Improved csv import for agenda and users.
...
- Fix users list.
2015-12-12 10:12:22 +01:00
66e0fe272b
Merge pull request #1764 from normanjaeckel/DefaultPermissions
...
Deleted Django's default permissions.
2015-12-12 09:32:40 +01:00
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
ca94a4e720
Rename template variable 'isFilter' to 'isFilterOpen' ( Fixes #1728 )
2015-12-11 19:50:50 +01:00
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
114a38e4ee
Deleted Django's default permissions.
2015-12-10 00:31:27 +01:00
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
3c5f49a127
Updated English translation strings.
2015-12-07 15:15:12 +01:00
5c6977c46d
Template fixes
2015-12-06 17:26:10 +01:00
232ce522fe
Updated translation strings and pot file.
2015-12-06 07:25:07 +01:00
d987a1138d
Added motion csv import ( Fixes #1675 )
...
using pre-import checks and preview table.
2015-12-05 21:44:19 +01:00
b81704a88f
Fixed translations in agendaSupplement.
2015-12-01 13:45:54 +01:00
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
f84b8f29ac
Template and translation changes. Updated English language files.
2015-11-30 21:06:31 +01:00
5cf2134e95
Fix translation tags.
2015-11-30 20:52:02 +01:00
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
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
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
5ddedf94e1
angular: Fix deletion of speakers
2015-11-27 23:59:04 +01:00
35a8042759
Assignments template improvements
...
- list view with quickview
- ngDialog for create/update view
- candidates
- polls
2015-11-27 00:19:37 +01:00
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
7bff79b377
Added manager to number all agenda items.
2015-11-25 13:05:39 +01:00
28df416ec7
Added auto numbering button on agenda list view.
2015-11-25 13:05:39 +01:00
f0080865e6
Added REST API viewpoint to number the agenda.
2015-11-25 13:05:39 +01:00
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
c5f5fbf203
Remove translations for projector exception messages.
2015-11-21 00:01:48 +01:00
1016af3c52
Updated English language files.
2015-11-20 23:23:01 +01:00
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
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
32b23df763
Split and cleaned up JS files. Added test.
2015-10-22 00:28:01 +02:00
fac45fbf2a
Added multiselection delete mode for users list view.
...
Fix users import: Allows multiple groups.
2015-10-15 21:09:49 +02:00
4559ffb882
Fix agenda slide and agendaIsProjected function.
2015-09-24 21:43:37 +02:00
2a23150b78
Fixed agenda tree, fixed #1635 .
2015-09-14 22:18:55 +02:00
c8dfb9437b
Removed imports from openslides.users in other apps: Cleaned up agenda, assignments and motions.
2015-09-14 21:13:56 +02:00
7f9c8b6a38
Agenda item list: new multiselect delete mode
...
Remove action column.
2015-09-14 20:35:24 +02:00
8c48d67df0
Fixed projector.
2015-09-14 20:30:37 +02:00
e22b9984e3
Calculate agenda tree on the client side.
...
Update changed agenda tree via autoupdate.
2015-09-06 15:01:41 +02:00
d8e9ef5575
Merge pull request #1616 from ostcar/main_menu
...
Autogenerate the main menu.
2015-09-05 18:19:59 +02:00
2da2177c49
Autogenerate the main menu.
2015-09-05 17:23:47 +02:00
719b5ffedd
Bundle countdown with list of speakers. Fixed #1541 .
2015-09-05 15:07:03 +02:00
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
0e124dbbae
Use tags in agenda. Fix motions.js.
2015-09-05 10:07:53 +02:00
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
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
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
f31925387f
Updated python requirements.
...
This included django 1.8
2015-07-02 14:51:08 +02:00
291f60ee9f
Added a way to load angular apps dynamical
2015-07-01 20:10:40 +02:00
bc74a2983c
Fixed typo. Removed unused config.js.
2015-06-29 20:23:10 +02:00
6f985ef483
Use item-detail and item-list slides for agenda app.
2015-06-29 16:45:46 +02:00
ec1d676ed9
Added initial migrations for all apps
2015-06-29 15:38:15 +02:00
16fa6bfffc
Removed the projector App
2015-06-29 15:20:28 +02:00
e042c668d5
Moved config app into the core app
2015-06-29 15:15:33 +02:00
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
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
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
f5654837e1
Merge pull request #1569 from normanjaeckel/Slides
...
Added agenda slides.
2015-06-25 08:12:47 +02:00
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
6da0d41e50
Added agenda slides.
2015-06-24 23:45:21 +02:00
8075b0adbb
List of speakers with angularjs.
...
- Add/remove user to/from list
- Open/close list
2015-06-22 14:34:23 +02:00
002a4d583e
Fix JavaScript errors in chromium.
2015-06-21 19:39:36 +02:00
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
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
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
dc675e173b
Removed old static files
2015-06-18 18:24:54 +02:00
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
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
cb1b262c92
Fix anonymous user for rest requests
2015-06-15 15:54:39 +02:00
0853701cdd
Added view to begin and end speach.
2015-05-27 15:42:32 +02:00
95be18b78e
Added view to add and remove users from the list of speakers.
2015-05-26 18:42:39 +02:00
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
505e587d6f
Send tree for agenda items
2015-04-17 16:46:13 +02:00
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
86c189c964
Autoupdate for delete views
...
Fixes : #1495
Also fixed the (example) assignment angular code
2015-03-01 08:42:47 +01:00
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
c4c9322321
Rework of assignment
...
fixes : #1429 , #1345
A database recreation is needed
2015-02-12 10:14:10 +01:00
ac6f3de60d
Used AngularUI Router for more generic URL routing.
2015-02-12 09:52:07 +01:00
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
7171a71919
angular single page application
2015-02-05 23:06:09 +01:00
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
7238b8159a
Added REST api for motion, mediafile and config app. Refactor REST api in other apps.
2015-01-31 14:15:10 +01:00
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
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
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
18fe7e2d89
Update to bootstrap 3.3.1.
2015-01-21 12:23:32 +01:00
4821a3b59b
Added api for assignments.
...
Also small changes in agenda REST api.
2015-01-17 22:46:23 +01:00
0d56424c90
Refactored REST api in agenda, core and users app.
2015-01-17 15:58:51 +01:00
1a1d072454
remove update_projector and add inform_changed_data
2015-01-17 15:16:49 +01:00
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
b0422c4680
Added api viewset for agenda items.
...
Fixed style checker problem.
2015-01-17 09:18:40 +01:00
34b6ca80f3
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
openslides/users/signals.py
2015-01-06 13:04:07 +01:00
3cfb9b739b
Template improvements for tags of agenda items, motions and
...
assignments.
2015-01-05 13:57:37 +01:00
bcb1ee1213
Tags for motions, agenda items and assignments
2015-01-03 17:00:48 +01:00
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
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
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
88222857bb
Use the new django transaction API
...
fixes #1027
2014-10-19 10:52:48 +02:00
5c6f7a41a8
Merge branch 'stable/1.6.x'
...
Conflicts:
tests/assignment/test_views.py
2014-10-18 08:53:51 +02:00
ebadb9078c
Bugix in method get_title. Return item no for related objects.
2014-10-12 10:55:56 +02:00
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
276f76d320
Omit leading zero in method item_no if no agenda prefix is given.
2014-10-10 21:30:22 +02:00
32137b6523
Use python3
...
python3.3 and python3.4 are supported
2014-08-24 21:21:11 +02:00
2ebd215198
Merge pull request #1321 from emanuelschuetze/template-fixes
...
Last template fixes for 1.6
2014-06-02 18:23:04 +02:00
0ebb2eb901
Last template fixes in agenda, motion and assignment list view.
2014-06-01 22:48:15 +02:00
efb6c17903
Added stylesheet to list of speakers overlay. Fixed #1310 .
2014-05-28 00:30:33 +02:00
bf8bb31cdb
Merge pull request #1298 from emanuelschuetze/fix-995
...
Improved html templates for mobile devices (responsive).
2014-05-19 22:17:26 +02:00
16a6ad4a9e
Merge pull request #1278 from rolandgeider/ckeditor
...
Replace own CKeditor with dedicated app
2014-05-19 15:15:54 +02:00
e9d52245cb
Replace own CKeditor with dedicated app
2014-05-19 00:00:18 +02:00
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
3419855a1e
Fix link to list of speaker item on related items
...
fix #1242
2014-05-17 14:21:57 +02:00
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
ecf0e8b0d7
Cleaned up some widgets and the base.css. Removed icon definitions.
2014-05-15 17:23:46 +02:00
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
c132346d14
Merge pull request #1284 from normanjaeckel/RefactorConfig
...
Changed permission system for config pages.
2014-05-13 13:03:09 +02:00
ee82c2c105
Fixed English strings concerning agenda items and organizational items and their relation. Fixed #1271 .
2014-05-12 22:56:57 +02:00
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
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
d638d5b7e2
Fixed bug of numbering view when there are orga items. Renamed toRoman to to_roman.
2014-05-04 14:00:28 +02:00
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
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
2c5b3a8e4f
Automatic numbering of agenda items
2014-05-04 13:47:01 +02:00
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
ac1ab81d7a
New projector view with the current list of speakers.
2014-04-15 01:00:56 +02:00
2a10feecad
Added CSV import, fixed #1186 . Also cleaned up motion and user CSV import.
2014-04-13 20:35:19 +02:00
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#1191
2014-04-05 15:19:42 +02:00
ee3ec3d4b6
Fixed flake8 errors.
2014-03-27 20:38:13 +01:00
39de1924cb
Added extra permission check to speaker widget, fixed #1191 only for 1.5.x branch
2014-03-13 00:50:49 +01:00
3b42c16e04
Reinserted icon and link for preview of agenda slide. Fixed #1199 .
2014-01-31 01:02:12 +01:00
2392c1ab36
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-28 08:32:26 +01:00
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
d72fe39da6
Merge branch 'stable/1.5.x'
2014-01-12 13:38:07 +01:00
bbd7542341
Fixed agenda_item.is_active_slide() with related item and list of speakers
2014-01-12 12:48:38 +01:00
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
cde6232477
Merge branch 'stable/1.5.x'
...
Conflicts:
openslides/projector/projector.py
openslides/templates/base.html
2014-01-11 22:30:14 +01:00
ad09a18e3f
removed edit and view in get_absolute_view
2014-01-11 17:39:16 +01:00
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
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
9a3243706b
Inserted api for the personal info widget.
2013-12-09 12:16:16 +01:00
bdf1679eb0
Rename classes in the config api.
...
Also change attributes for config collection without view.
2013-12-06 10:47:20 +01:00
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
a3bf29acf2
remove the last occurence of gnu gpl license header fix #1130
2013-12-01 22:52:08 +01:00
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
5541861176
Merge pull request #1125 from emanuelschuetze/documentation1.5
...
Documentation1.5
2013-11-25 11:08:25 -08:00
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
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
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
2af3b320c8
Merge pull request #1116 from emanuelschuetze/template-fix2
...
Minor template fixes
2013-11-23 08:25:33 -08:00
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
8ca4f0409f
Use btn-mini class for list of speakers question in agenda view.
2013-11-22 20:39:28 +01:00
301bc8ac7c
Translate state.name in motion log message.
2013-11-22 15:34:32 +01:00
94abda60b5
Added help text for duration field in agenda item form. ( Fixed #1085 )
2013-11-22 10:04:00 +01:00
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
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
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
0c32ef9c40
fix #1044 Remove GNU GPL header
2013-11-15 16:01:14 +01:00
091a2bc35c
Bugfix in agenda.js ( fixes #1041 )
2013-11-12 21:33:57 +01:00
9d8d9f806f
Fixed agenda slide
...
Fixes #1035
2013-11-12 08:59:20 +01:00
1fb0a21d0b
Some more template fixes:
...
- Fixed #992 (Use correct countdown format)
- Fixed #909 (Backend und projector template style)
* Search bar with same border-radius like login button.
* Projector: Fixed overlay message style. Allow HTML code (use template filter 'safe').
* Dashboard: Tooltips, Buttons and Widget fixes.
- Fixed template does not exists error if custom slide is activated.
- Countdown: Add css to show negative countdown in red.
- Add missing translation strings to English po file (for transifex).
2013-11-10 20:50:30 +01:00
34701c67a6
Template improvements.
...
- motion detail template: Fixes motion manage state template block.
- mediafile list template: Fixed missing activeline class.
- item detail template: Fixed is_active_slide conditions.
- assignment view template: Use bottongroup instead of single radio buttons.
- Projector template: Updated header and countdown style. Removed footer.
- Added config options to show logo and/or title/description.
- Projector template: New config options to set background color and font color for projector header.
- Make WLAN form labels not translateable.
2013-11-10 20:27:38 +01:00
2a7a50a817
Show default_slide if an error occurs in a slide
...
See #925
2013-11-09 15:14:55 +01:00
0752d476e4
Change to MIT Licence
...
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
b2afa77e25
Add error message if a invalid answer was send via POST to a QuestionView. Fix #940 .
2013-10-28 17:02:18 +01:00
6f7dabe870
Merge pull request #955 from normanjaeckel/Fix927
...
Add message if someone adds himself to the list of speakers. Fix #927 .
2013-10-25 23:59:00 -07:00
218d0bad23
Add message if someone adds himself to the list of speakers. Fix #927 .
2013-10-24 18:24:19 +02:00
84d2619289
Improved projector zoom and scroll behaviour.
...
Zoom and scroll the full content div (incl. title and sidebar).
Add zoom and scroll level in projector live view widget.
2013-10-23 19:44:37 +02:00
bac918a9e8
Some bug fixing for 1.5b1
...
- Fixed #921 (Check THANKS URL for jQuery UI Nested Sortable)
- Fixed #919 (Permission problem in agenda)
- Fixed #918 (Search does not work for guest users)
- Fixed search-bar position.
- Updated EN po files.
2013-10-21 14:39:28 +02:00
82f0df4fea
Send js to the projector
...
* fixed scroll and scale of the projector
2013-10-21 07:53:21 +02:00
40faaa39c6
Changed begin speach behavior. Fix merge conflicts. Add tests.
2013-10-19 14:52:37 +02:00
40af20cedb
New feature: couple countdown with list of speakers
...
'Begin speach' button starts countdown, 'end speach' button stops countdown.
2013-10-18 22:30:05 +02:00
8f274c2691
Add CKeditor to the agenda item text field
2013-10-18 10:18:05 +02:00
68b9a2e291
Cache the results of ItemDelete.get_answer_options
...
Fix #911
2013-10-18 07:49:39 +02:00
d3f673a276
Merge pull request #912 from normanjaeckel/Fix910
...
Fix wrong question_url_name in ItemDelete view. Fix #910 .
2013-10-17 22:36:04 -07:00
d76a04f443
Fix wrong url_name_args in ItemDelete view. Fix #910 .
2013-10-17 22:00:00 +02:00
e277b8babf
Full text search with haystack and whoosh.
...
Updated THANKS file.
Portable: Added haystack and whoosh.
2013-10-16 08:58:35 +02:00
95fe58eb99
Add prototype of full text search integration in openslides
...
Allow for empty title and text body, fix pep8 errors
2013-10-15 22:35:53 +02:00
d937262d28
Use flake8 instead of pep8. Orderd the imports with isort
...
* changed the fab-command pep8 to check
* checked and fixed any code with flake8. Also the urls.py
* checkt the projector app with pylint
2013-10-14 18:43:12 +02:00
d644d49579
Cleaned up utils
2013-10-13 20:43:26 +02:00
84d5293fbc
Rework (projector) template with bootstrap.
...
- Always use templatetag 'absolute_url' instead of (depricated) 'model_url'.
Search and replace all old arguments: edit -> update, view -> detail, delete
- Fixed bug in setting default value in 'absolute_url' templatetag
(default value is defined in models.py only).
Updated 'backend' template.
2013-10-07 08:57:22 +02:00
ecf5248962
Rework of the projector with websocket
...
* Set a static projector title
* absolute_urls for the activate links
* update the projector when a slide changes (in save())
* insert the absolute_url template filter
* Preview to slides
* renamed is_active to is_active_slide
* The SlideMixin has to come before the PersonMixin
* Update list of speakers
* Render Countdown via JS
* Reconnect projector after connection lost
* Overlays can allways be active and do not appear in the widget
* Rewrote the clock as overlay
2013-09-24 23:35:05 +02:00
66679c8efe
Merge branch 'stable/1.4.x'
...
Conflicts:
openslides/__init__.py
2013-09-14 11:07:02 +02:00
3bf1f24a4a
Fixed wrong ordering of agenda items after order change
...
Fixed #875
2013-09-08 11:17:32 +02:00
a50617676a
Add default sorting of widgets. Fix #493
2013-09-07 15:13:27 +02:00
c800884a43
Use GenericForeignKey for agenda related items, fix #865
2013-09-07 14:30:25 +02:00
9dcdf67398
Fixed typo in English translation string in djangojs.po.
2013-09-06 21:59:53 +02:00
b03e8cc06b
Fixed #833
2013-07-29 19:45:06 +02:00
b39cb8e8a4
Fixed tooltip and duration in agenda.
...
The tooltip did not show the end of an agenda item, but of the hole event.
If a item was closed, it was not used to calculate the end of the event.
Fixed #833
2013-07-27 10:02:40 +02:00
f39e8dd92e
Fixed #794 bug when a non speaking list slide was active, when a projector tab was opend
2013-07-08 13:44:44 +02:00
64e7cfd98e
Some template and doc fixes
...
- Fixed #766 (agenda overview parent item look).
- Fixed #767 (Documentation sphinx bootstrap theme: html header)
- Fixed #785 (Enlarged doc screenshots by hover via CSS)
- Updated sphinx-bootstrap-theme to 0.2.4
- Add btn class for agenda end time tooltip
2013-06-25 22:15:51 +02:00
c14302dd6f
small translation update
2013-06-16 18:44:14 +02:00
575da78f3a
Editview for releated agenda items.
...
Releated Agenda Items need there own edit view to edit some agenda specifc
values.
Also added a new filter 'trans' to translate variables.
Fixes #710
2013-06-16 00:55:07 +02:00
a383a4305b
Fixed some (pdf) template issues and updated (DE) translation.
...
- Fixed #737 (Motion edit link is missing for normal delegate users)
- Fixed motion pdf filename errors (now use motion-<identifier>.pdf or if no identifier: motion-<title>.pdf with using djangos slugify for special chars in title)
- Fixed motion pdf build error if there is an unauthorized version
- Enlarge max_length of event name field to 50 chars.
- Align participant import instruction with motion import page.
- Added title field to particpants-demo_en.csv.
- participant overview: Show comma after last_name only if first_name and last_name are given.
- Changed all page titles to "<specific action page> - <event-name>" (moved event-name to the end of the string)
- Updated EN tranlation string.
- Updated DE translations.
2013-06-15 17:50:30 +02:00
3afc58be9e
Add request to all widgets, fixed #653
2013-06-13 23:45:30 +02:00
4b0c62d29a
Fixes #721
...
Saving the anonymous user into a list of speakers.
Also raises an AttributeError if someone tries to save the anonymous user
into any person field.
2013-06-09 18:57:42 +02:00
cf791e599a
Updated EN translation strings and updated EN po files.
...
Template fixes and improvements.
2013-06-03 23:33:01 +02:00
bdfdb4c064
Fixed #652 : Button for ageda item with related sid.
2013-06-03 22:42:16 +02:00
4126c180c8
Fixed #701 : Check bootstrap tooltips on all buttons.
2013-06-03 22:42:16 +02:00
cd84d64071
Fixed #702 : list of speakers projetor/overlay style.
2013-06-03 22:42:15 +02:00
ef6eaf8fa4
Fixed #703 : Mcrophon icons for list of speakers
2013-06-03 22:42:14 +02:00
e5e7e1bcce
Template improvements.
...
Improved agenda and participants overview.
2013-06-03 22:38:45 +02:00
5c18635418
Change order of agenda fields
2013-06-03 19:16:42 +02:00
e5db00b637
Add tests for the list of speakers global links. Add end_speach link on the list of speakers widget.
2013-05-31 17:25:48 +02:00
1e188761d4
Validator for agenda_start_time aded. PEP8 issue 'missing whitespace after ','' resolved
2013-05-31 14:01:30 +02:00
9e5088d49e
Fixed #683
2013-05-31 13:15:55 +02:00
d5becd5c18
Fixed #431 : Template improvements (removed unused loaded tags and check of all html template files)
2013-05-30 23:25:49 +02:00
4ec33106ed
Fixed #680 (Open all PDFs in new tab).
2013-05-29 22:59:33 +02:00
9fb2052b3d
Bugfixing, template improvements, translation updates.
...
- Fixed #649 : Clean old motion fragments in template and pdf (about motion notes).
- Fixed motion pdf issues: missing submitters, voting result and make motion state translateable- Added post_save function also for UserUpdateView.
2013-05-29 22:59:24 +02:00
9d698854a9
Insert Next Speaker Button in speaker widget
2013-05-24 01:44:58 +02:00
6566a2897c
Fixed #675 : CSS for list of speakers slide and overlay
2013-05-24 00:52:09 +02:00
00910b218e
Fix appearance of agenda items with related sid, also some other small fixes and template fixes
2013-05-24 00:31:52 +02:00
099ed76d0e
Insert info to list of speakers overlay widget checkbox
2013-05-23 23:31:57 +02:00
894f16ec53
Several template and bug fixes, some minor view behavior changes
2013-05-23 00:32:32 +02:00
b082f8a8fc
A lot of template improvements
...
- Translate group name in participant overview table.
- Move 'status_link' function from participants.js to utils.js for using in VoteCollector plugin.
- Added hook 'post_js' for VoteCollector plugin.
- Fixed poll id in poll_form.
- Improved 'show log' button
- Used welcome_title for default custom slide
- Used bootstraps' fluid grid nesting for responsive layout of widgets.
- Added microphone icon for 'add-me-to-list-of-speakers' button.
- Format motion identifier and title in (motion and account) widgets.
- Format list of speakers (slide, overlay, view, overview)
- Format list of speakers widget and view. Added view to link to current list of speakers (without add to list).
- Fixed motion slide. Made up/down animation faster and the scroll way shorter.
- Fixed icon name.
- Set default context of 'extra_javascript' to use kwargs['context']['extra_javascript'].append('...') without error.
- Fixed translation of motion state.
Moved css code.
2013-05-14 23:20:54 +02:00
a469831f1f
Fixed link 'Put me on the list of speakers' when the list is already closed.
2013-05-12 02:06:55 +02:00
af6659a67e
Hide list of speakers overlay on list of speakers slide
2013-05-12 01:16:41 +02:00
411f8d0892
Fixed hiding of orga items on summary slides
2013-05-11 16:26:43 +02:00
98c7611622
Fixed wrong permission on agenda detail view
2013-05-11 13:53:43 +02:00
719b6ff790
Rework on list of speakers. Insert a method to get a formated list for various use in the templates.
2013-04-29 20:17:50 +02:00
52e16d2e34
Show a defined value of last speakers
...
Some work on the design of the speaker-list on the projector
2013-04-29 20:05:42 +02:00
0b85164b84
Add second time field for list of speakers. Now you can click begin and end speach.
2013-04-29 20:05:42 +02:00
5865a73a3e
sortable and disableSelection are not always defined; lead to issue #615
2013-04-24 19:51:33 +02:00
81b82c559d
Updated jQuery UI to v1.10.2.
...
Changed link in agenda view to static file.
2013-04-24 11:34:24 +02:00
abad75c129
A lot of template improvements and translation fixes
...
- Fixed agenda widget for special slide views (e.g. list of speakers, summary).
- Fixed back to motion(s) link
- Set icon for list of speakers widget.
- Fixed overlay widget layout of form elements.
- Added submenu with other config_pages to version.html.
- Updated completly DE translations, fixed EN strings.
- Coding style: Use correct ugettext and ugettext_lazy strings. Use "as _" for ugettext only.
Updated translation.
- Improved projector template (clock image, fixed facicon, added subtitle for list of speakers)
- Changed permission strings ('oneself'). Added check if group(pk=3) exists.
- Added event name and description to base template. Some minor template layout fixes.
- Use static subtile (no context var). Show last 2 old_speakers for projector.
- Cut old_speakers.
- Projektor template style changes (e.g. overlay list of speakers).
2013-04-24 10:38:03 +02:00
f581169e1e
Fixed saving anonymous user in a PersonField
2013-04-24 09:28:58 +02:00
acba281581
Sorting agenda items with nestedSortable.
2013-04-23 17:24:27 +02:00
Oskar Hahn