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
Norman Jäckel
cc0298eaa0
Use encoded string for insert in sys.path and print during main script. Fix #1022 .
2013-11-10 22:21:14 +01:00
Norman Jäckel
84a2fa41f0
Merge pull request #1029 from normanjaeckel/RepairDjangoUpdate
...
Move run_tornado import into runserver function because its imports need...
2013-11-10 13:21:32 -08:00
Norman Jäckel
c4850e4b19
Move run_tornado import into runserver function because its imports needs settings (new in Django 1.6).
2013-11-10 22:15:13 +01:00
Emanuel Schuetze
0a2c73842a
Updated translations (DE, PT, CS).
2013-11-10 21:56:07 +01:00
Norman Jäckel
d2309cbe49
Merge pull request #1026 from normanjaeckel/EnglishTransFile
...
Update English translation files.
2013-11-10 12:27:09 -08:00
Norman Jäckel
7b45231211
Merge pull request #1001 from ostcar/django1.6
...
Update to Django 1.6
2013-11-10 12:26:06 -08:00
Norman Jäckel
ec0a27e545
Update English translation files.
2013-11-10 21:13:57 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
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
Emanuel Schuetze
45588024fd
Fixed #957 (Allow list-style in CKEditor)
...
Allowed additional css styles 'color' and 'background-color'
for span html fields in ck-editor (and bleach).
2013-11-10 19:33:38 +01:00
Oskar Hahn
31729534fa
Merge pull request #1016 from emanuelschuetze/fix897
...
Use correct server time for all clients
2013-11-10 08:32:16 -08:00
Emanuel Schuetze
3b8c8145d7
Fixed #897 (Use correct server time for clock/countdown on other clients)
2013-11-09 21:28:45 +01:00
Oskar Hahn
2a7a50a817
Show default_slide if an error occurs in a slide
...
See #925
2013-11-09 15:14:55 +01:00
Oskar Hahn
ab048e3393
Update to Django 1.6
2013-11-07 18:56:06 +01:00
Oskar Hahn
e92af391c3
Merge pull request #1005 from ostcar/activate_view
...
Update scroll and sale in activate view.
2013-11-07 09:53:34 -08:00
Oskar Hahn
5fff885c89
Merge pull request #1012 from ostcar/issue_998
...
removed unused javascript. Fixes #998
2013-11-07 08:03:42 -08:00
Oskar Hahn
fe68fffdda
removed unused javascript. Fixes #998
2013-11-07 13:53:33 +01:00
Oskar Hahn
01eb64c1d2
Update scroll and sale in activate view.
...
Fixes #939
2013-11-07 12:45:17 +01:00
Oskar Hahn
929587971a
Merge pull request #1006 from normanjaeckel/CheckPort
...
Check used port, fix #985 .
2013-11-06 13:03:40 -08:00
Oskar Hahn
2309bd4772
Merge pull request #1004 from ostcar/update_projector_default_slide
...
Update projector when the title of the default slide changes
2013-11-06 12:34:33 -08:00
Norman Jäckel
17a2eb97cb
Check used port, fix #985 .
2013-11-06 17:49:41 +01:00
Oskar Hahn
cc8b573b62
Update projector when the title of the default slide changes
2013-11-06 17:28:17 +01:00
Oskar Hahn
1ebca3b12e
Fixed participant edit view
2013-11-06 17:08:54 +01:00
Oskar Hahn
5040de8dcb
Merge pull request #1000 from ostcar/javascript
...
Fixed some javascript related problems
2013-11-06 07:40:51 -08:00
Oskar Hahn
2d07644d3c
Fixed some javascript related problems
2013-11-06 14:58:30 +01:00
Emanuel Schuetze
97d6cd37b4
Updated EN po file for transifex.
2013-11-06 08:56:40 +01:00
Oskar Hahn
0752d476e4
Change to MIT Licence
...
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
Oskar Hahn
2691e2b239
More Tests for projector views
2013-11-04 14:53:07 +01:00
Oskar Hahn
71666094e7
Add tests for the projector code
2013-10-30 18:58:15 +01:00
Emanuel Schuetze
4234b46b36
Update version to 1.5-dev
2013-10-29 22:31:43 +01:00
Emanuel Schuetze
efcaffaa02
Release 1.5b1
2013-10-29 22:31:28 +01:00
Max Brauer
bd332bd3d5
added possibility to show pdfs on the projector
2013-10-29 22:05:11 +01:00
Emanuel Schuetze
ccdf5ef2e0
Motion PDF: Keep whitespaces in monospace <pre> tags and replace it with ' '.
2013-10-29 14:57:23 +01:00
Oskar Hahn
558b4e9f86
Merge pull request #966 from normanjaeckel/NewCommandDevSettings
...
New command create-dev-settings. Clean up main script. Fix wrong path fo...
2013-10-29 00:08:16 -07:00
Norman Jäckel
3ec18194fa
New command create-dev-settings. Clean up main script. Fix wrong path for Windows version.
2013-10-29 00:48:49 +01:00
Emanuel Schuetze
2c4a2b3628
Fixed #943 : User settings menu button should not run out of the screen (right side)
2013-10-28 21:43:11 +01:00
Oskar Hahn
10bd38d3a5
Fixed reload of javascript
2013-10-28 21:17:32 +01:00
Oskar Hahn
76c0a98ab8
Merge pull request #960 from ostcar/time_format
...
Time format
2013-10-28 13:05:53 -07:00
Oskar Hahn
ffe612359f
use the server_time for countdown and clock
2013-10-28 21:05:32 +01:00
Dominik Breu
ef687ad23c
Fix for wrong format of clock and countdown on projector
2013-10-28 21:05:28 +01:00
Norman Jäckel
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
Oskar Hahn
47c60078b3
Use sockjs instead of only websocket
2013-10-27 20:50:10 +01:00
Oskar Hahn
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
Oskar Hahn
e27c746f4a
Merge pull request #954 from emanuelschuetze/password-pdf
...
Use DIN A4 format and wlan ssid qrcode on access data PDF
2013-10-25 23:56:21 -07:00
Emanuel Schuetze
a513477033
Fixed #948 : Use DIN A4 format and wlan ssid qrcode on access data PDF.
2013-10-25 20:51:48 +02:00
Norman Jäckel
218d0bad23
Add message if someone adds himself to the list of speakers. Fix #927 .
2013-10-24 18:24:19 +02:00
Emanuel Schuetze
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
Norman Jäckel
6175ce25c5
Fix #934 : Error in motion import with bad csv file.
2013-10-22 00:18:58 +02:00
Norman Jäckel
9d80c05f90
Fix url_name_args bug.
...
Fix delete view for motion categories. Add test for custom slide delete view.
2013-10-21 22:51:38 +02:00
Oskar Hahn
8303c4444f
Merge pull request #933 from emanuelschuetze/requirements
...
Requirements
2013-10-21 12:59:10 -07:00
Emanuel Schuetze
f1a8993452
Used reportlabs qrcode widget (instead of extra qrcode package).
2013-10-21 21:27:07 +02:00
Emanuel Schuetze
d76846e385
Updated EN + DE translation file.
2013-10-21 21:20:55 +02:00
Emanuel Schütze
af14f962df
Merge pull request #936 from emanuelschuetze/translation
...
Updated EN djanog.po file.
2013-10-21 11:50:29 -07:00
Emanuel Schuetze
8b8435109b
Updated EN djanog.po file.
2013-10-21 20:46:59 +02:00
Norman Jäckel
b0e3c7d456
Fix missing url_name_args = [] lines in different views.
...
Fix custom slide create and update view.
Fix motion category create and update view.
2013-10-21 19:10:53 +02:00
Emanuel Schuetze
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
Oskar Hahn
82f0df4fea
Send js to the projector
...
* fixed scroll and scale of the projector
2013-10-21 07:53:21 +02:00
Norman Jäckel
273140007e
Fix url_name_args problems in user and group views. Add tests.
2013-10-20 21:42:17 +02:00
Oskar Hahn
c399eea2dd
Merge pull request #920 from normanjaeckel/CountdownAndAgenda
...
Countdown and agenda
2013-10-19 22:19:26 -07:00
Norman Jäckel
40faaa39c6
Changed begin speach behavior. Fix merge conflicts. Add tests.
2013-10-19 14:52:37 +02:00
Norman Jäckel
a1ad1e4c49
Some changes in __main__.py and utils.main and other.
...
Reinsert --no-browser option.
Move some code to utils.main.
Some other small style changes.
Fix merge conflict misstakes.
Change settings behavior. Add tests.
Fix rebase problems.
2013-10-19 14:44:46 +02:00
Andy Kittner
21a1d77e29
fix gui/portable for pull request #903
2013-10-19 14:44:20 +02:00
Norman Jäckel
c63b7f995f
Clean up main.py and move code to __main__.py and utils/main.py.
2013-10-19 14:44:20 +02:00
Emanuel Schuetze
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
Norman Jäckel
30371e964f
Insert new feature: attachments for motions.
...
Fixed #522 . Database struture changed.
2013-10-18 12:32:29 +02:00
Roland Geider
8f274c2691
Add CKeditor to the agenda item text field
2013-10-18 10:18:05 +02:00
Oskar Hahn
68b9a2e291
Cache the results of ItemDelete.get_answer_options
...
Fix #911
2013-10-18 07:49:39 +02:00
Oskar Hahn
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
Norman Jäckel
d76a04f443
Fix wrong url_name_args in ItemDelete view. Fix #910 .
2013-10-17 22:00:00 +02:00
Emanuel Schuetze
e277b8babf
Full text search with haystack and whoosh.
...
Updated THANKS file.
Portable: Added haystack and whoosh.
2013-10-16 08:58:35 +02:00
Roland Geider
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
Oskar Hahn
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
Oskar Hahn
d644d49579
Cleaned up utils
2013-10-13 20:43:26 +02:00
Emanuel Schuetze
a4d024f45c
Some template fixes and improvements:
...
- Fixed absoluteurl in motion detail template. Renamed '_edit' to '_update'.
- Fixed wrong projector link ind assigment poll template.
- Improved assignment projector slide.
- Fixed #884 : Add PDF note to translation string "Show paragraph numbering"
2013-10-12 20:29:27 +02:00
Oskar Hahn
6aae8bff15
More projector fixtures
...
* Update projector when polls are updated.
* Update projector when assignment candidates are updated
* Update projector when motion submitter are updated
* Fixed the assignment publish poll view
* Added projector.api.register_slide_model
2013-10-10 18:40:24 +02:00
Emanuel Schuetze
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
Oskar Hahn
d681e94eed
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
AUTHORS
2013-10-04 09:13:51 +02:00
Oskar Hahn
6926630d3e
Added Feature for config app, to return the default value for a key
2013-09-29 15:10:01 +02:00
Oskar Hahn
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
Oskar Hahn
93079938a3
Fixed keyerror on user setting page
...
Fix #891
2013-09-24 23:31:45 +02:00
Emanuel Schuetze
7f172692da
Added Portuguese translation (Thanks to Marco A.G.Pinto)
2013-09-24 22:13:50 +02:00
Oskar Hahn
d2f5302e28
Merge pull request #888 from ostcar/sucess_message
...
Success_message in utils.views
2013-09-14 21:34:47 -07:00
Max Brauer
bf4825a3e0
Refactored assignments app to use class based views instead of
...
functions.
2013-09-14 18:20:35 +02:00
Oskar Hahn
477daa3fdf
Success_message in utils.views
2013-09-14 11:09:45 +02:00
Oskar Hahn
66679c8efe
Merge branch 'stable/1.4.x'
...
Conflicts:
openslides/__init__.py
2013-09-14 11:07:02 +02:00
Norman Jäckel
cd2f01ed26
Update version to 1.4.3-dev
2013-09-10 21:40:44 +02:00
Norman Jäckel
5854bb1f50
Release 1.4.2
2013-09-10 21:38:30 +02:00
Emanuel Schuetze
f2829eb173
Updated DE and FR translation (one new translation string).
2013-09-10 20:58:59 +02:00
Emanuel Schuetze
e621335169
Updated English translation file (for new translation string in motion config).
2013-09-10 09:07:12 +02:00
Emanuel Schuetze
0246525a7a
Updated DE, FR, CS translation (typo in EN translation string).
2013-09-09 22:12:10 +02:00
Oskar Hahn
7faf59a82b
Merge pull request #878 from ostcar/change_agenda_items
...
Fixed wrong ordering of agenda items after order change
2013-09-09 02:04:27 -07:00
Oskar Hahn
3bf1f24a4a
Fixed wrong ordering of agenda items after order change
...
Fixed #875
2013-09-08 11:17:32 +02:00
Norman Jäckel
404d0fc272
Add on_change_callback to config variables. These callback can be defined in the ConfigVariable object and is called, when the variable is changed.
2013-09-08 11:16:23 +02:00
Oskar Hahn
a28ca8a4a3
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/assignment/models.py
2013-09-07 16:48:55 +02:00
Norman Jäckel
26607da154
Fix delete of assignments with related agenda items.
2013-09-07 16:33:10 +02:00
Oskar Hahn
b228a02429
Merge remote-tracking branch 'openslides/stable/1.4.x'
2013-09-07 15:42:16 +02:00
Oskar Hahn
5ad3085551
Merge pull request #871 from normanjaeckel/DefaultWidgetSorting
...
Add default sorting of widgets. Fix #493
2013-09-07 06:36:21 -07:00
Oskar Hahn
afe186add4
Fixed repr in widget
2013-09-07 15:19:03 +02:00
Norman Jäckel
a50617676a
Add default sorting of widgets. Fix #493
2013-09-07 15:13:27 +02:00
Emanuel Schuetze
1045f14026
Fixed missing creation time of motion version.
...
Show now string if identifier is not set set (in widgets and motion detail).
2013-09-07 14:31:21 +02:00
Norman Jäckel
c800884a43
Use GenericForeignKey for agenda related items, fix #865
2013-09-07 14:30:25 +02:00
Oskar Hahn
9084216f06
Merge branch 'stable/1.4.x'
2013-09-07 00:15:31 +02:00
Emanuel Schuetze
cb7d54973d
Fixed #858 : Removed max value (8) of config field "motion_min_supporters".
...
Removed supporters signature field in motion pdf to prevent the unused signature fields
which are printed for each required supporters if you have a high minimum supporters number.
2013-09-06 21:59:54 +02:00
Emanuel Schuetze
48f8e82eda
Fixed #859 : New config option to disable paragraph numbering in motion pdf
...
Default value: disabled
2013-09-06 21:59:54 +02:00
Emanuel Schuetze
9dcdf67398
Fixed typo in English translation string in djangojs.po.
2013-09-06 21:59:53 +02:00
Emanuel Schuetze
67175042f9
Fixed #857 : Use jquery plugin 'bsmSelect' for <select multiple> form elements.
2013-09-06 21:59:52 +02:00
Emanuel Schuetze
011786d360
Updated CKEditor from 4.1.1 to 4.2.
2013-09-06 21:59:52 +02:00
Emanuel Schuetze
ec61bd8cdc
Fixed #854 : IE fix for ckeditor's plugin insertpre:
...
Removed 'class' attribute to fix viw in IE8+.
Use monospace in insertpre dialog in IE.
Updated German translation file.
2013-09-06 21:59:50 +02:00
Norman Jäckel
c88d180808
Deletes config cache after each test if it exists.
2013-08-19 18:05:03 +02:00
Oskar Hahn
25bac4a704
Fixed a bug when setting a config var before getting one
2013-08-19 17:59:35 +02:00
Oskar Hahn
20cf960c82
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/core/templatetags/tags.py
2013-08-19 17:54:50 +02:00
Oskar Hahn
1113b6d861
Added template filter 'absolute_url'
2013-08-19 11:21:29 +02:00
Oskar Hahn
99895a28d1
Fix get_absolute_url for deleted persons.
...
Fix #845
2013-08-19 10:50:37 +02:00
Oskar Hahn
967c199a56
Removed utils from INSTALLED_APPS.
...
Moved utils.management and utils.templatetags to core
2013-08-11 09:40:14 +02:00
Oskar Hahn
b8d23164f7
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/__init__.py
2013-07-29 20:52:05 +02:00
Norman Jäckel
1225c5bbb6
Update version to 1.4.2-dev
2013-07-29 20:19:29 +02:00
Norman Jäckel
119fb90bfd
Release 1.4.1
2013-07-29 20:17:26 +02:00
Oskar Hahn
b03e8cc06b
Fixed #833
2013-07-29 19:45:06 +02:00
Emanuel Schuetze
20d7a3b539
Add paragraph around each motion version warning (to show each warning in one line).
2013-07-29 09:06:36 +02:00
Norman Jäckel
30c3f5ea64
Disable deleting active versions of a motion
2013-07-28 01:14:15 +02:00
Oskar Hahn
b7edee8fdf
Merge pull request #836 from ostcar/issue-833
...
Fixed tooltip and duration in agenda.
2013-07-27 15:29:21 -07:00
Oskar Hahn
8743d75d10
Use get_active_version in motion.__unicode__()
...
Fixes the bug, that motion.__unicode__() raises an AttributeError, if the active_version
was None.
Fixes #822
2013-07-27 10:11:28 +02:00
Oskar Hahn
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
Emanuel Schuetze
bb538953ee
Added Czech translation (Thanks to Pavel Fric!)
2013-07-26 21:37:58 +02:00
Oskar Hahn
7726fa87a9
Merge pull request #831 from ostcar/issue-823
...
Generate poll-urls via model_url
2013-07-25 14:11:33 -07:00
Norman Jäckel
2128e787bf
Start Browser on custom IP, fixed #827
2013-07-25 17:03:04 +02:00
Oskar Hahn
b83b1c49e9
Generate poll-urls via model_url
...
Fixed Bug to wrong poll urls
Fixed #823
2013-07-18 09:50:54 +02:00
Oskar Hahn
ec3db2ffff
Prepare OpenSlides master for the next major release
2013-07-18 08:50:08 +02:00
Norman Jäckel
9d01881986
Update version to 1.4.1-dev
2013-07-08 20:08:10 +02:00
Norman Jäckel
304c572f85
Release 1.4
2013-07-08 20:05:31 +02:00
Oskar Hahn
526eeb5cea
Merge pull request #818 from ostcar/issue_814
...
Fixed #814 Sorting of candidates in the assignment
2013-07-08 05:27:19 -07:00
Oskar Hahn
47d70d5a73
Fixed #814 Sorting of candidates in the assignment
2013-07-08 14:08:27 +02:00
Oskar Hahn
f2d13e5ec9
Merge pull request #817 from ostcar/master
...
Issue 794
2013-07-08 05:03:40 -07:00
Oskar Hahn
8ebf3f9038
Merge pull request #815 from emanuelschuetze/csv-files
...
Updated CSV files with demo data. Minor fixes for motion.
2013-07-08 04:49:08 -07:00
Oskar Hahn
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
Emanuel Schuetze
b12fdb09cd
Updated German translation (some typos).
2013-07-08 13:40:06 +02:00
Norman Jäckel
d703ef9c4f
Rename visual strings of permissions: Add plural s ( fix #797 ). Also update all language files.
2013-07-08 00:03:47 +02:00
Emanuel Schuetze
5bff15762e
Motion detail template: Removed category from title (already in meta block)
2013-07-07 23:04:26 +02:00
Emanuel Schuetze
7e5c3f6a27
Removed whitespace in filename of motion pdf (identifier: PrefixNumber).
2013-07-07 22:00:10 +02:00
Oskar Hahn
aca2570cb7
Merge pull request #800 from andkit/portable-improvements
...
Portable improvements
2013-07-06 23:57:00 -07:00
Oskar Hahn
04ee38dcc0
Merge pull request #809 from emanuelschuetze/fixes-1.4
...
Fixed #798 and #803
2013-07-05 08:08:48 -07:00
Emanuel Schuetze
3fadb99ffd
Fixed #803 (Groups not translated on user detail view and overview pdf)
2013-07-05 15:49:10 +02:00
Emanuel Schuetze
4625c4731d
Updated translation. Fixed #798 (typo in translation of permissions).
2013-07-05 14:51:37 +02:00
Andy Kittner
b568546fb8
Add some explanation to is_portable(); fixes #729
2013-07-04 23:29:56 +02:00
Norman Jäckel
834851acbd
Typo in assignment view ( fixed #805 )
2013-07-04 15:40:47 +02:00
Emanuel Schuetze
5dd65cb173
Fixed motion pdf and template issues:
...
- Fixed #790 (Unicode Error while creating motion pdf if motion text contains umlauts and motion is imported from CSV)
- Fixed #742 : Added categories and identifier to motion pdf.
- Fixed wrong title order (app title - OpenSlides).
2013-06-28 12:43:58 +02:00
Emanuel Schuetze
db7e22229e
Fixed comments by norman.
2013-06-27 09:20:28 +02:00
Emanuel Schuetze
cf773c34a8
Updated translations.
2013-06-26 21:36:06 +02:00
Oskar Hahn
bf8482fc03
Merge pull request #786 from emanuelschuetze/1.4-fixes
...
Some template and doc fixes
2013-06-26 10:11:28 -07:00
Oskar Hahn
7d1eb5207a
Fixes #765 . Avoids the django AbstracUser username validator
...
Also changed added a white-space in the default username again
2013-06-26 19:00:52 +02:00
Emanuel Schuetze
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
Norman Jäckel
7dddd70493
Fix whitespaces in translated strings.
2013-06-25 17:44:31 +02:00
Emanuel Schuetze
4a0c40a333
Fixed white projector live view in IE 10 (missing transform-origin).
2013-06-25 14:03:36 +02:00
Norman Jäckel
c3d0c0f852
Update translation source files
2013-06-21 23:36:23 +02:00
Oskar Hahn
00d57e3011
Fixed #463 , typo in urls.py
2013-06-21 09:01:56 +02:00
Norman Jäckel
bad64144da
Fix translation of messages with additional content
2013-06-20 23:36:23 +02:00
Norman Jäckel
989f6b2d84
Space in Motion Log
2013-06-20 22:37:32 +02:00
Norman Jäckel
96c5b1d2dc
Fix numbering with category prefix in simple workflow, fix #769
2013-06-20 18:03:22 +02:00
Oskar Hahn
08a71c17a3
Fixed #770 . Ordering of Users in GroupForm regulated by the config var.
2013-06-20 08:33:55 +02:00
Norman Jäckel
c5beb07fbc
Update version to 1.4-dev (final)
2013-06-17 20:19:02 +02:00
Norman Jäckel
0039207899
Release 1.4c1
2013-06-17 20:17:32 +02:00
Oskar Hahn
32771d946e
Merge pull request #754 from emanuelschuetze/fixes-for-1.4c1
...
IE-Template fix and README/main.py updates.
2013-06-17 11:13:05 -07:00
Emanuel Schuetze
42809048f9
Updated and adjusted options help text in main.py and README.
2013-06-17 19:59:58 +02:00
Emanuel Schuetze
f191d3687b
Updated French translations (by Moira via transifex).
2013-06-17 17:54:05 +02:00
Emanuel Schuetze
7dc2b0d904
Fixed #753 (Wrong scaling of projector live view in Internet Explorer)
...
Supports IE8+ only. Dropped IE7 support.
2013-06-17 17:30:46 +02:00
Emanuel Schuetze
c450dfb1d5
Fixed typo.
2013-06-17 10:44:55 +02:00
Oskar Hahn
c14302dd6f
small translation update
2013-06-16 18:44:14 +02:00
Oskar Hahn
64af0b162f
Create admin-user after syncdb
2013-06-16 17:07:55 +02:00
Emanuel Schuetze
5237e1d90d
Fixed #745 and #744 : Make widgets fixable and collapsable.
...
Fixed widget header style issues.
2013-06-16 12:15:52 +02:00
Oskar Hahn
fd731d68fa
Merge pull request #733 from normanjaeckel/Fix_Syncdb
...
Disable interactive mode of the syncdb command, fixed #696
2013-06-16 02:31:27 -07:00
Norman Jäckel
31547f8e1a
Save identifier in MotionSetStateView, fixed #739
2013-06-16 01:06:47 +02:00
Norman Jäckel
dfc160af5b
Disable interactive mode of the syncdb command, fixed #696
2013-06-16 01:05:22 +02:00
Oskar Hahn
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
Oskar Hahn
9853f2c433
Change the Workflow of a motion in CreateView.
...
The Manager can choose the workflow in the createview. The default value
is the workflow from the config.
In the UpdateView the workflow in which the motion is, is choosen by
default.
The workflow will only be reset, if it is changed.
2013-06-16 00:53:49 +02:00
Emanuel Schuetze
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
Oskar Hahn
e630d600ed
Fixes #648
...
delete function for the motion versions
2013-06-15 09:18:21 +02:00
Norman Jäckel
3afc58be9e
Add request to all widgets, fixed #653
2013-06-13 23:45:30 +02:00
Norman Jäckel
48f237a92f
Print listening info to command line
2013-06-13 16:58:34 +02:00
Oskar Hahn
6dad2e5161
Listen per default to the public
2013-06-13 16:58:34 +02:00
Oskar Hahn
efd10eaecc
Fixed #718
...
An string argument was not used in the assignment app
2013-06-13 16:47:35 +02:00
Norman Jäckel
a0c023cf45
Use ordinal numbers in assignment and motion polls, fixes #456 . Include humanize app to portable
2013-06-13 15:48:55 +02:00
Oskar Hahn
42ad1113fa
Fixed #724
...
The motion updated view now uses the last_versio instead of the active_Version
2013-06-11 11:42:20 +02:00
Norman Jäckel
aa0728ff60
User lockout protection, fixed #666
...
Protection of updating and deleting users and groups if this caused a lockout of the requesting user.
2013-06-11 11:02:40 +02:00
Oskar Hahn
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
Norman Jäckel
0d1db941b8
Insert LocalizedModelChoiceField for use in MotionSetWorkflowMixin. Fixed #713 .
2013-06-09 16:41:58 +02:00
Emanuel Schuetze
a3038f3eb2
Set version to 1.4rc1-dev.
2013-06-04 01:05:15 +02:00
Emanuel Schuetze
27ed6a7c1d
1.4b2 release.
2013-06-04 01:02:25 +02:00
Emanuel Schütze
37da0cc7bb
Merge pull request #709 from emanuelschuetze/fixes-for-1.4b2
...
Fixes and improvements for 1.4b2
2013-06-03 15:58:13 -07:00
Emanuel Schuetze
a96b8a7833
Updated FR translations (Thanks to Moira).
2013-06-04 00:47:29 +02:00
Emanuel Schuetze
880b3cd19b
Updated DE translations.
2013-06-04 00:47:29 +02:00
Andy Kittner
9826e3ec06
Add a simple wxPython based gui frontend for openslides
2013-06-04 00:07:22 +02:00
Andy Kittner
fb91317ce1
Add command to backup the database
2013-06-04 00:07:22 +02:00
Andy Kittner
21c739a94f
Add --no-run parameter
...
This parameter allows e.g. to synchronize the database without starting
the webserver.
2013-06-04 00:07:22 +02:00
Emanuel Schuetze
cf791e599a
Updated EN translation strings and updated EN po files.
...
Template fixes and improvements.
2013-06-03 23:33:01 +02:00
Emanuel Schuetze
bdfdb4c064
Fixed #652 : Button for ageda item with related sid.
2013-06-03 22:42:16 +02:00
Emanuel Schuetze
4126c180c8
Fixed #701 : Check bootstrap tooltips on all buttons.
2013-06-03 22:42:16 +02:00
Emanuel Schuetze
cd84d64071
Fixed #702 : list of speakers projetor/overlay style.
2013-06-03 22:42:15 +02:00
Emanuel Schuetze
ef6eaf8fa4
Fixed #703 : Mcrophon icons for list of speakers
2013-06-03 22:42:14 +02:00
Emanuel Schuetze
e5e7e1bcce
Template improvements.
...
Improved agenda and participants overview.
2013-06-03 22:38:45 +02:00
Emanuel Schütze
d615c63eb1
Merge pull request #705 from normanjaeckel/ChangeMotionDefaultNumbering
...
Motion: Change default numbering method
2013-06-03 13:35:34 -07:00
Norman Jäckel
dc5b1e0893
Motion: Change default numbering method
2013-06-03 19:18:59 +02:00
Norman Jäckel
5c18635418
Change order of agenda fields
2013-06-03 19:16:42 +02:00
Norman Jäckel
a575a7a8c6
Fix #696
2013-06-03 00:23:47 +02:00
Norman Jäckel
93b02fa62b
Update docstrings, small enhancements to Oskar's motion rework.
2013-06-02 23:28:17 +02:00
Oskar Hahn
cd19920223
Rework of the motion model, to make it more explcit.
2013-06-02 23:28:17 +02:00
Norman Jäckel
d4739f5dd7
Fixed #130 : New config var for removal of supports when a motion is edited by the submitter in early state.
2013-06-02 15:48:21 +02:00
Emanuel Schuetze
5643065b84
Added en po files and updated en and fr po files (makemessages only) for transifex.
2013-06-01 21:58:25 +02:00
Oskar Hahn
4faf91424b
Fixed #682 Error if a group was added to a list of speakers
2013-06-01 09:10:15 +02:00
Norman Jäckel
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
Oskar Hahn
4aeb329d7c
Merge pull request #690 from normanjaeckel/DeleteFeatureRejectVersion
...
Fix #679
2013-05-31 06:44:59 -07:00
Norman Jäckel
31c04c280a
Fix #679
2013-05-31 14:54:53 +02:00
Norman Jäckel
7624dc67af
Fixed #687
2013-05-31 14:34:49 +02:00
Stefan Frauenknecht
1e188761d4
Validator for agenda_start_time aded. PEP8 issue 'missing whitespace after ','' resolved
2013-05-31 14:01:30 +02:00
Norman Jäckel
9e5088d49e
Fixed #683
2013-05-31 13:15:55 +02:00
Emanuel Schuetze
d5becd5c18
Fixed #431 : Template improvements (removed unused loaded tags and check of all html template files)
2013-05-30 23:25:49 +02:00
Emanuel Schuetze
17778ac80f
Fixed #574 : Changed DOCTYPE to HTML5 (for base.html and base-projector.html).
2013-05-30 22:23:48 +02:00
Emanuel Schuetze
a97cf4a680
Motion import improved:
...
- add semicolon support (use utils/csv_ext.py as participant import)
- show all warnings of each line in one warning message
- show success message with total counter (x of n motions imported).
- improved warning and error strings
2013-05-30 22:23:38 +02:00
Emanuel Schuetze
4ec33106ed
Fixed #680 (Open all PDFs in new tab).
2013-05-29 22:59:33 +02:00
Emanuel Schuetze
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
Norman Jäckel
9d698854a9
Insert Next Speaker Button in speaker widget
2013-05-24 01:44:58 +02:00
Norman Jäckel
6566a2897c
Fixed #675 : CSS for list of speakers slide and overlay
2013-05-24 00:52:09 +02:00
Norman Jäckel
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
Norman Jäckel
099ed76d0e
Insert info to list of speakers overlay widget checkbox
2013-05-23 23:31:57 +02:00
Norman Jäckel
c94f78c430
Fix message_list loop with a map
2013-05-23 23:19:53 +02:00
Norman Jäckel
894f16ec53
Several template and bug fixes, some minor view behavior changes
2013-05-23 00:32:32 +02:00
Emanuel Schuetze
c59f729a80
Set version to 1.4b2
2013-05-17 01:33:04 +02:00
Emanuel Schuetze
d5221d2ab5
Release 1.4b1.
2013-05-17 01:31:45 +02:00
Emanuel Schuetze
eedc79ca8f
Added non_field.errors in form.html.
2013-05-16 23:59:22 +02:00
Norman Jäckel
bf58f2a6cc
Ensure that the user has either a first name or a last name
2013-05-16 23:59:22 +02:00
Norman Jäckel
a65a4662ae
Fixed Pep 8 Error
2013-05-16 23:44:07 +02:00
Emanuel Schuetze
fa8b9d3888
Fixed translation issue for motion state.
2013-05-16 22:53:38 +02:00
Emanuel Schütze
6dbd606232
Merge pull request #660 from normanjaeckel/TranslatedStateChanged
...
Translate changed state in motion log (Fixed #656 )
2013-05-16 13:37:09 -07:00
Norman Jäckel
148ac53d11
Translate changed state in motion log ( Fixed #656 )
...
The database has to be reset.
2013-05-16 21:51:11 +02:00
Emanuel Schuetze
b5a5acbf2c
Some last (template) improvements for next release
...
- Added dataTable function for group overview table.
- Added default form help text for groups and an explanation for group overview table.
- Updated translation.
- Translate group name in form.
- Username: FirstName instead of First_Name
- Hide group 'registered' from UserForm
- Linked persons/candidates/submitter etc. to UserView
- Fixed permissions in template
Translation
2013-05-16 21:03:42 +02:00
Oskar Hahn
e76aa499f3
Merge pull request #659 from normanjaeckel/LogMotionImport
...
Log Entry for imported motions Fixed #655
2013-05-16 04:36:39 -07:00
Oskar Hahn
9a881eceeb
Merge pull request #651 from normanjaeckel/Workflow_Adjustablility_2
...
Workflow adjustablility (new feature)
2013-05-16 04:35:58 -07:00
Oskar Hahn
1dab39012c
Merge pull request #661 from normanjaeckel/PermitRejectVersionLog
...
Log permitting and rejecting motion versions (Fixed #657 )
2013-05-16 04:31:41 -07:00
Norman Jäckel
c163d6984d
Insert motion preamble in text field of the form of new motions ( Fixed #643 )
2013-05-16 01:38:51 +02:00
Norman Jäckel
5adf55bc8c
Log permitting and rejecting motion versions ( Fixed #657 )
2013-05-16 01:28:39 +02:00
Norman Jäckel
27da18f489
Fixed #655 Log Entry for imported motions
2013-05-16 00:58:37 +02:00
Norman Jäckel
bca8d3af15
Update view contains possibility for managers to change the workflow. Also other small fixes.
2013-05-16 00:25:44 +02:00
Emanuel Schuetze
c1996b81fc
Updated translation.
2013-05-15 09:43:59 +02:00
Emanuel Schuetze
4849955a16
Some more template improvements
...
- Better config icon.
- Renamed media to files (only for GUI).
- Add datatable function for motion and asssignemnt overview table. Removed old filter/sorting code.
- Some more template styling work.
2013-05-15 09:43:11 +02:00
Oskar Hahn
cefd509ae4
Merge pull request #650 from emanuelschuetze/template-improvements
...
Template improvements
2013-05-14 14:31:53 -07:00
Emanuel Schuetze
d1b6c38880
Fixed #627 (Open Link in new Tab) by setting back bootstrap.min.js to 2.3.0 release.
...
(bootstrap*.css are still from 2.3.1)
2013-05-14 23:21:46 +02:00
Emanuel Schuetze
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
Norman Jäckel
f07485627f
Motion identifier setting and versioning.
...
Now the view decides, whether to setup a new version or not. Automatic identifier setting is the default. Also some fixes of the motion save method.
2013-05-13 23:13:14 +02:00
Oskar Hahn
b8b5acd5f2
Merge pull request #639 from normanjaeckel/Url_name_args
...
Fixed 'Can't create agenda item of a motion'
2013-05-13 11:51:15 -07:00
Norman Jäckel
0f17f74fee
Fix and update motion csv import.
2013-05-13 18:30:20 +02:00
Oskar Hahn
485518975a
motion csv import
2013-05-13 18:25:59 +02:00
Norman Jäckel
864d20274e
Fixed #636 . Insert general url_name_args attribute to some generic views in utils.views.
2013-05-13 18:15:53 +02:00
Oskar Hahn
865860a96f
Merge pull request #640 from normanjaeckel/Fixes
...
Some Fixes
2013-05-13 05:06:29 -07:00
Oskar Hahn
e9a361cfea
Merge pull request #637 from normanjaeckel/ShowCategory
...
Show category in motion table. Fix template when a motion has no category.
2013-05-12 13:58:47 -07:00
Norman Jäckel
a469831f1f
Fixed link 'Put me on the list of speakers' when the list is already closed.
2013-05-12 02:06:55 +02:00
Norman Jäckel
af493d28e8
Items now appear also in the personal info widget (where someone is on the list of speakers).
2013-05-12 01:46:40 +02:00
Norman Jäckel
af6659a67e
Hide list of speakers overlay on list of speakers slide
2013-05-12 01:16:41 +02:00
Norman Jäckel
3ba5fd2dc6
Fixed bad typo in import users function
2013-05-12 00:56:40 +02:00
Norman Jäckel
411f8d0892
Fixed hiding of orga items on summary slides
2013-05-11 16:26:43 +02:00
Norman Jäckel
76d7409830
Change version view. New way to get name and version from plugins.
2013-05-11 14:27:46 +02:00
Norman Jäckel
98c7611622
Fixed wrong permission on agenda detail view
2013-05-11 13:53:43 +02:00
Norman Jäckel
96f5122c00
Show category in motion table. Fix template when a motion has no category.
2013-05-11 00:20:42 +02:00
Norman Jäckel
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
Oskar Hahn
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
Norman Jäckel
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
Oskar Hahn
b0e5854833
Fixed #629
2013-04-28 10:21:31 +02:00
Oskar Hahn
04edef9d8a
Fixed #604
2013-04-28 10:02:19 +02:00
Oskar Hahn
100238bc66
Fixed #580
2013-04-28 09:37:15 +02:00
Oskar Hahn
04b3a196ad
Merge pull request #620 from CatoTH/ckeditor-4.1.1
...
Upgrade CKEditor from 4.1rc to 4.1.1
2013-04-25 06:17:07 -07:00
Oskar Hahn
017561572d
Merge pull request #621 from CatoTH/Issue615
...
sortable and disableSelection are not always defined; lead to issue #615
2013-04-25 06:16:32 -07:00
Norman Jäckel
b6f2176cc8
Move Version page out of config menu. Insert Link into the footer.
2013-04-25 12:37:44 +02:00
Tobias Hößl
5865a73a3e
sortable and disableSelection are not always defined; lead to issue #615
2013-04-24 19:51:33 +02:00
Tobias Hößl
4aa033989a
Upgrade CKEditor from 4.1rc to 4.1.1
2013-04-24 19:04:02 +02:00
Emanuel Schuetze
8ca8b6911d
Set version to 1.4b1-dev
2013-04-24 15:50:49 +02:00
Emanuel Schuetze
b43a6ae1f6
Release 1.4-alpha1
2013-04-24 15:31:55 +02:00
Emanuel Schuetze
e268d43580
Fixed motion poll pdf (use correct delegates group, use template without header/footer)
2013-04-24 15:14:29 +02:00
Emanuel Schuetze
5071daa148
Updated translations.
2013-04-24 14:36:04 +02:00
Emanuel Schuetze
210df06c76
Minor template fixes.
2013-04-24 11:58:09 +02:00
Emanuel Schuetze
81b82c559d
Updated jQuery UI to v1.10.2.
...
Changed link in agenda view to static file.
2013-04-24 11:34:24 +02:00
Emanuel Schuetze
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
Oskar Hahn
f581169e1e
Fixed saving anonymous user in a PersonField
2013-04-24 09:28:58 +02:00
Tobias Hößl
acba281581
Sorting agenda items with nestedSortable.
2013-04-23 17:24:27 +02:00
Norman Jäckel
7fbe609d04
Rename the state flag dont_set_new_version_active to leave_old_version_active.
2013-04-22 22:31:58 +02:00
Oskar Hahn
ba75a34017
Fixed list of speakers overlay cache problem
2013-04-22 22:09:09 +02:00
Oskar Hahn
02d1025346
Motion poll PDF
2013-04-22 21:47:40 +02:00
Oskar Hahn
4f9041df65
Merge pull request #603 from ostcar/participant_name
...
Fixed username
2013-04-22 12:38:09 -07:00
Oskar Hahn
6b558907c0
Fixed username
2013-04-22 13:49:13 +02:00
Oskar Hahn
0549d22ec8
Fixed manage.py runserver.
...
The reload function did not work
2013-04-21 18:42:58 +02:00
Oskar Hahn
2d7bf8ca9a
fixed #558
2013-04-19 19:56:59 +02:00
Oskar Hahn
10b51f6897
Fixed #595
2013-04-19 19:39:33 +02:00
Oskar Hahn
db1503ad7b
Format fix
2013-04-19 19:15:57 +02:00
Roland Geider
56844d93f2
Move CKeditor configuration to a separate JS file
...
Remove unneeded try-except block
2013-04-18 13:26:01 +02:00
Emanuel Schuetze
1d1f5fa218
Added html support for motion text.
...
Use html parser 'beautifulsoup' to replace html tags which not supported by reportlab pdf.
'pip install bs4' required.
Fixed nested ol lists and unicode warning.
New requirement: beautifulsoup4
HTML support for reportlab.
Move parse html code into new function. Added missing html support in pdf for motion reason.
Added version number for bleach and beautifulsoup4. Moved to core requirements block.
Added bs4, bleach and html5lib requirements to portable build script. Updated portable readme for 1.4.
2013-04-18 13:23:40 +02:00
Roland Geider
01885c9304
Add first version of server-side filtering of HTML with bleach
...
Fix formatting (pep8 and otherwise)
Make the CleanHtml a mixin so it can be used easier, add a test case
Mark HTML fields as 'safe' in the template
Update list of allowed HTML tags, take special care for reportlab
Add heading tags to white list
Rename get_clean_html to get_clean_html_fields
2013-04-18 13:20:27 +02:00
Tobias Hößl
ce333d4c40
Initial attempt to integrate CKEditor into OpenSlides
2013-04-18 13:20:27 +02:00
Emanuel Schuetze
e81ed882ca
Fixed #553 : Switch projector control scroll arrows
2013-04-15 22:04:59 +02:00
Oskar Hahn
33f74c3025
List of speakers. Part 2
2013-04-15 19:28:44 +02:00
Emanuel Schuetze
1a416e5726
Updated template and some minor fixed for list of speakers. Updated projector slide.
2013-04-15 19:23:37 +02:00
Oskar Hahn
fa95119936
New Feature: List of speakers.
2013-04-15 19:23:37 +02:00
Oskar Hahn
f52df88cd6
fixed error on new overlay api
2013-04-15 15:47:18 +02:00
Oskar Hahn
bbf4b33086
New Overlay API
2013-04-15 13:24:08 +02:00
Norman Jäckel
0155690630
Protection for participant managers, Issue #122
...
Raises a validation error, if a non-superuser user edits himself and
removes the last group containing the permission to manage participants
2013-04-14 23:52:20 +02:00
Norman Jäckel
82b1796875
Fixed issue #585 . Sort group members by first name or last name in group detail view according to config variable
2013-04-13 18:13:11 +02:00
Oskar Hahn
632c9476ed
Merge pull request #584 from emanuelschuetze/participants-1
...
Participants fields: add 'title', remove 'type', use 'groups'
2013-04-09 13:25:18 -07:00
Emanuel Schuetze
2c5bae7b01
#560 fixed: FormField to choose permissions is too small
2013-04-09 20:12:57 +02:00
Emanuel Schuetze
9f6da9f33b
Reorder GroupDetailView code in view.py.
2013-04-09 19:53:18 +02:00
Emanuel Schuetze
2a97a61a14
Remove participants field 'type'. Use 'group' field instead. Updated csv import, overview table and user detail view
2013-04-09 11:21:55 +02:00
Emanuel Schuetze
051f9af1f7
#436 : New participant field 'title'
2013-04-09 08:51:31 +02:00
Norman Jäckel
82c804e2d6
Inserted a new config variable 'Stop submitting of new motions'
...
Normal delegates can not submit a new motion when this is set to true. Inserted also a new template filter to relate to config variables in if-clauses.
2013-04-05 11:49:57 +02:00
Roland Geider
e40a2e9332
Restart tornado on file changes, respect port and adress flags
2013-04-03 23:20:56 +02:00
Oskar Hahn
e7def39323
Merge pull request #582 from normanjaeckel/AgendaConfigJSFix
...
Moved javascript code for agenda config into extra file.
2013-04-03 10:21:08 -07:00
Norman Jäckel
5d472b274a
Update tests to extend test cover by coverage
2013-04-03 17:55:30 +02:00
Norman Jäckel
623cf60adf
Moved javascript code for agenda config into extra file. Moved translation to correct area for javascript files.
2013-04-03 14:51:19 +02:00
Norman Jäckel
b310d6077e
Move personal info widget to a new app: account.
2013-04-03 00:17:23 +02:00
Norman Jäckel
e3eabada8b
Update default groups and permissions.
2013-04-02 15:50:40 +02:00
Norman Jäckel
e1b149cde3
New config app. Apps only have to define config vars once. Config pages, forms and so on are created automaticly.
...
Changes after some reviews are done.
Problematic is still that the JS can not be moved to an extra file because of the template tags in the code.
2013-03-28 15:31:13 +01:00
Emanuel Schuetze
71ac7a1cdb
New feature: qr-code for system url on participants password pdf.
...
(Note: New dependency! Run 'pip install qrcode')
Fixed pep8 issues. Create qr-code image for system url one time only.
New feature: qr-code for system url on participants password pdf.
(Note: New dependency! Run 'pip install qrcode')
Fixed pep8 issues. Create qr-code image for system url one time only.
Print qrcode image from StringIO stream.
Adapted table stylesheet for better integration of reportlab's Image object.
Fixed pep8 issue.
Made qrcode import as optional feature. Fixed pep8 issue.
2013-03-22 14:35:40 +01:00
Oskar Hahn
f5e6f736dc
Merge pull request #572 from normanjaeckel/Fileupload_3
...
Mediafile (new)
2013-03-20 03:23:50 -07:00
Norman Jäckel
156acc451f
Insert whitespace. Fix docstrings.
2013-03-20 11:17:24 +01:00
Norman Jäckel
d81c3bb1f8
Change order of classes for User and Group
2013-03-18 22:43:46 +01:00
Norman Jäckel
d82bb6ee33
Small modifications. Enhencement of tests.
2013-03-18 22:41:42 +01:00
Norman Jäckel
ad0e157bd1
Insert new app to upload files via the frontend. Let tornado server media files. Insert icon-mediafile css class. Insert extra_stylfiles context variable.
2013-03-18 21:44:02 +01:00
Norman Jäckel
571649d5a6
Fix typo in assignment.
2013-03-18 21:31:24 +01:00
Emanuel Schuetze
4e6818fb1a
Compressed jquery-ui files (for agenda config).
2013-03-18 20:22:54 +01:00
Emanuel Schuetze
b3fca8f6f2
Updated bootstrap from 2.2.2 to 2.3.1
2013-03-18 20:19:17 +01:00
Oskar Hahn
3832aa4178
Tests for the motion views
2013-03-15 12:18:27 +01:00
Oskar Hahn
c46ec570bf
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-15 02:16:26 +01:00
Oskar Hahn
81eb92a761
fixed pep8
2013-03-15 02:14:15 +01:00
Oskar Hahn
1a2ebf7b3b
removed some unused functions
2013-03-15 01:34:17 +01:00
Emanuel Schuetze
d180b4f331
Reverted support/unsupport changes (question)
2013-03-14 23:45:17 +01:00
Emanuel Schuetze
20118ae833
Improved version.get command
2013-03-14 23:35:57 +01:00
Emanuel Schuetze
2a2c704bf2
GetVersionMixin not required. Fixed htmldiff function.
2013-03-14 23:26:41 +01:00
Emanuel Schuetze
3f4df58807
Moved htmldiff function to utils.py. Fixed travis build error (pep8).
2013-03-14 23:22:11 +01:00
Emanuel Schuetze
49765bbe6e
Merge remote branch 'upstream/master' into motiontemplate
2013-03-14 23:05:38 +01:00
Emanuel Schuetze
b2dc3820bd
Changed motion.number to motion.identifier.
2013-03-14 23:04:32 +01:00
Emanuel Schuetze
88a32dc546
Updated motion version warnings (not latest/authorized version)
2013-03-14 22:56:25 +01:00
Emanuel Schuetze
73430e45d8
Changed style for empty category table.
2013-03-14 22:54:33 +01:00
Emanuel Schuetze
fa098f6bd3
Typo.
2013-03-14 22:54:00 +01:00
Oskar Hahn
43cd5aba00
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-14 22:44:11 +01:00
Oskar Hahn
63932a348e
Merge pull request #561 from emanuelschuetze/datatables-participants
...
Datatables for participants table (reworked)
2013-03-14 14:40:01 -07:00
Emanuel Schuetze
0587c2019a
Integrated DataTables function for participants table (for client side sorting/filtering/pagination). Removed old server side sorting/filtering code.
...
Fixed csv import (added success url).
Added large csv file for testing import of >1000 participants.
Removed lage csv example file for paticipants (will be sustitute by a test script in future).
2013-03-14 22:34:40 +01:00
Oskar Hahn
545d4be04f
fixed update of person_api
2013-03-14 22:32:00 +01:00
Emanuel Schuetze
247f6c9431
Merge remote branch 'upstream/master' into motiontemplate
...
Conflicts:
openslides/motion/models.py
openslides/motion/views.py
2013-03-14 21:36:02 +01:00
Emanuel Schuetze
a1a11ff53c
New motion version diff view. Improved version history table in motion detail template.
2013-03-14 21:28:03 +01:00
Oskar Hahn
2944b6ded3
fixed travis
2013-03-13 00:29:53 +01:00
Oskar Hahn
71b9bd0a08
dont set identifier prefix, if it is empty
2013-03-12 23:54:37 +01:00
Oskar Hahn
b2c888b151
set identifier
2013-03-12 23:35:08 +01:00
Oskar Hahn
304887e8f3
Changed comlex workflow automaticly set the identifier
2013-03-12 22:13:17 +01:00
Oskar Hahn
d21185a449
Merge branch 'master' of github.com:OpenSlides/OpenSlides into category
2013-03-12 22:05:20 +01:00
Oskar Hahn
9cd69f59e0
Motion Identifier
2013-03-12 22:03:56 +01:00
Norman Jäckel
03fff46517
Add new TestCase class in utils to call the signal on running every test.
2013-03-12 21:38:22 +01:00
Norman Jäckel
9679be1867
Move builtin groups to a signal.
2013-03-12 20:58:22 +01:00
Emanuel Schuetze
196ad217b0
Fixed version history.
2013-03-11 23:58:45 +01:00
Emanuel Schuetze
d41ce146e2
Added category_delete function to template.
2013-03-11 21:50:16 +01:00
Emanuel Schütze
db97d3c312
Merge pull request #2 from ostcar/category
...
Category Delete View
2013-03-11 13:45:54 -07:00
Oskar Hahn
31ba70efd1
Category Delete View
2013-03-11 21:38:07 +01:00
Norman Jäckel
514577f7c6
Built-in Workflows are created by listening to a signal which is sent after syncdb.
2013-03-11 21:32:09 +01:00
Emanuel Schuetze
d9fbaf9aa7
Updated motion category template.
2013-03-11 21:29:56 +01:00
Emanuel Schütze
ff848a865a
Merge pull request #1 from ostcar/category
...
Category
2013-03-11 12:46:42 -07:00
Oskar Hahn
f411040c3a
Append missing files
2013-03-11 20:43:23 +01:00
Oskar Hahn
bc7be27131
Add CategoryFormField to the MotionForm
2013-03-11 20:41:02 +01:00
Oskar Hahn
2614a1cb2f
Categories for Motions
2013-03-11 20:17:19 +01:00
Emanuel Schuetze
1b93cec209
Merge remote branch 'upstream/master'
...
Conflicts:
openslides/motion/models.py
2013-03-11 19:16:16 +01:00
Emanuel Schuetze
42c847dfba
Update motion templates to new template design. Added some missing model and view functions.
2013-03-11 18:26:22 +01:00
Emanuel Schuetze
5c70b4a044
Update after comments: Removed user context var. Removed condition in unupport state check.
2013-03-11 16:56:56 +01:00
Emanuel Schuetze
ee0e599a6c
Update motion templates to new template design. Added some missing model and view functions.
2013-03-09 14:29:40 +01:00
Emanuel Schuetze
71b1bede6f
Set new button als primary/blue button.
2013-03-09 14:17:30 +01:00
Emanuel Schuetze
c3c200b423
Changed link to new csv import wiki page on github.
2013-03-09 14:16:28 +01:00
Emanuel Schuetze
48e1282cb9
Show duration clock only if start/end time is set.
2013-03-09 14:15:03 +01:00
Emanuel Schuetze
56a510e89c
Removed link to professional support in base template (footer).
2013-03-08 08:31:52 +01:00
Oskar Hahn
51a9e41015
Set new django setting. Put tornado code in a seperate file.
2013-02-27 18:54:06 +01:00
Oskar Hahn
757b97e4cb
Merge pull request #542 from frauenknecht/master
...
Issue #539 Default config value in agenda app
2013-02-22 03:54:30 -08:00
Stefan Frauenknecht
45856fc9b0
add signal callback to provide defaults
2013-02-20 23:50:34 +01:00
Stefan Frauenknecht
f81abe215f
Revert last changes
2013-02-20 23:48:04 +01:00
Stefan Frauenknecht
343aa018e4
Fixed Issue #539 - Default config value in agenda app
2013-02-20 22:09:40 +01:00
Norman Jäckel
03d57d17b0
Fix state attributes in motion pdf.
2013-02-19 23:43:20 +01:00
Norman Jäckel
6b71142747
Recover commit 6a639fe498
2013-02-18 22:08:21 +01:00
Oskar Hahn
853dcf8334
fixed pep8
2013-02-18 20:06:46 +01:00
Oskar Hahn
f388f3d41a
handle static files with tornado
2013-02-18 19:58:18 +01:00
Oskar Hahn
2822c39f8a
Merge branch 'master' into tornado
2013-02-18 19:08:58 +01:00
Oskar Hahn
ce1e1c112f
fixed pep8
2013-02-18 18:59:24 +01:00
Oskar Hahn
4f3f917812
some small code design changes
2013-02-18 18:56:37 +01:00
Oskar Hahn
cb5b735565
Merge branch 'master' into HEAD
2013-02-18 18:34:52 +01:00
Oskar Hahn
051723e686
Merge branch 'master' of github.com:OpenSlides/OpenSlides
...
Conflicts:
openslides/motion/models.py
openslides/motion/workflow.py
2013-02-18 18:31:35 +01:00
Norman Jäckel
2603d93d69
Fix PEP8 and tests.
2013-02-17 17:07:44 +01:00
Stefan Frauenknecht
1d1d72d45a
Fixed if condition with duration property which can be None
2013-02-16 11:55:40 +01:00
Stefan Frauenknecht
8103c09b81
PEP8 errors resolved
2013-02-16 10:41:22 +01:00
Emanuel Schuetze
0b3b91b8d5
Show item-tooltip in bootstrap tooltip style.
2013-02-15 08:51:08 +01:00
Emanuel Schuetze
4f60160667
Added missing success_url_name.
2013-02-15 08:50:42 +01:00
Emanuel Schuetze
e9c996340a
Used custom build jquery-ui javascript components file. Integrated required jquery-ui styles (no remote link). Added used jquery components/addons to THANKS file.
2013-02-15 08:39:36 +01:00
Norman Jäckel
8363b06fc1
Move motion exceptions to its own file in the motion app.
2013-02-14 19:27:36 +01:00
Norman Jäckel
2e37e4c18b
Comment the dev-file workflow.py
2013-02-14 11:16:46 +01:00
Norman Jäckel
f2dde228c9
Work on motion workflow system.
...
Also: Insert new base exception for OpenSlides.
Also: Insert a workflow field to the state class. Update tests. Rename versioning attribute.
2013-02-13 23:04:24 +01:00
Emanuel Schuetze
e3428d3e83
Some style work.
2013-02-11 23:01:48 +01:00
Emanuel Schuetze
e101fb8212
Merge branch 'master' into agenda-orga-items
...
Conflicts:
openslides/agenda/static/styles/agenda.css
openslides/agenda/templates/agenda/config.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/static/styles/base.css
requirements.txt
2013-02-11 22:36:19 +01:00
Emanuel Schuetze
a51a296434
Changed agenda start/end time to djangos DATETIME_FORMAT.
2013-02-09 22:59:15 +01:00
Oskar Hahn
6a639fe498
Add todos
2013-02-06 11:11:49 +01:00
Oskar Hahn
5573077b88
fixed pep8
2013-02-06 09:34:44 +01:00
Oskar Hahn
27c73092e1
Merge remote-tracking branch 'emanuel/newtemplate' into new_motion
...
Conflicts:
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
2013-02-06 09:25:27 +01:00
Emanuel Schuetze
ce51f0ef7e
template: minor style changes
2013-02-05 23:42:30 +01:00
Emanuel Schuetze
6b4ee0e4f6
Updated translation.
2013-02-05 23:09:23 +01:00
Emanuel Schuetze
c8ddb21760
Fixed wrong hiding of open agenda child items if parent item is closed
2013-02-05 22:36:05 +01:00
Emanuel Schuetze
e49efb40d8
template: Added new css class for minimum column width.
2013-02-05 22:03:43 +01:00
Emanuel Schuetze
bfd01e67b6
template: Removed unused 'cycle' template tag.
2013-02-05 21:55:41 +01:00
Emanuel Schuetze
d809ff95bb
template: Removed unused participant.css
2013-02-05 21:51:09 +01:00
Emanuel Schuetze
64e3c1f3cb
template: Removed unused 'load staticfiles'.
2013-02-05 21:41:26 +01:00
Emanuel Schuetze
8388774f12
template: Minor style changes.
2013-02-05 21:33:07 +01:00
Emanuel Schuetze
82e35bebff
Fixed wrong deletion if user clicks "no" in confirm form.
2013-02-05 21:31:45 +01:00
Emanuel Schuetze
0c5459f96e
template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
2013-02-05 20:40:55 +01:00
Oskar Hahn
042f1a8571
Fixed typo
2013-02-05 18:49:32 +01:00
Oskar Hahn
a08cf84ab8
Wrote docstrings to the motion app
2013-02-05 18:46:46 +01:00
Emanuel Schuetze
8f05ada6a1
template style and new icons
2013-02-05 17:05:40 +01:00
Stefan Frauenknecht
d6084f7c8b
Create items with duration loger than 23:59. Show start and end date. Duration has tooltip showing end date and time.
2013-02-05 16:36:57 +01:00
Emanuel Schuetze
80b0ab5252
template: Updated dashboard. Fixed ajax functionality. Adapted style.
2013-02-05 11:24:41 +01:00
Emanuel Schuetze
6db0210ef3
Updated jquery form plugin to v3.26.0-2013.01.28
2013-02-05 11:22:01 +01:00
Emanuel Schuetze
5e44bba941
Updated jquery from 1.9.0 to 1.9.1.
2013-02-05 11:15:23 +01:00
Emanuel Schuetze
404bf7f0b5
template: Added missing back link.
2013-02-04 13:38:29 +01:00
Emanuel Schuetze
36f5c97dbe
Added assignment context menu (more actions). Fixed 'back to election' link.
2013-02-04 13:18:10 +01:00
Emanuel Schuetze
e822efdc81
Some template style work.
2013-02-04 13:06:36 +01:00
Oskar Hahn
a34731c00e
fixed pep8 in motion.pdf
2013-02-03 20:12:44 +01:00
Oskar Hahn
90614cc637
Updated some views for the new utils.views style
2013-02-03 19:43:36 +01:00
Oskar Hahn
139ba74459
Merge remote-tracking branch 'emanuel/newtemplate' into new_template
...
Conflicts:
.travis.yml
INSTALL.txt
openslides/agenda/templates/agenda/base_agenda.html
openslides/agenda/templates/agenda/edit.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/agenda/templates/agenda/widget.html
openslides/assignment/templates/assignment/base_assignment.html
openslides/assignment/templates/assignment/config.html
openslides/assignment/templates/assignment/edit.html
openslides/assignment/templates/assignment/overview.html
openslides/assignment/templates/assignment/poll_view.html
openslides/assignment/templates/assignment/view.html
openslides/assignment/templates/assignment/widget.html
openslides/config/templates/config/general.html
openslides/motion/templates/motion/base_motion.html
openslides/motion/templates/motion/config.html
openslides/motion/templates/motion/edit.html
openslides/motion/templates/motion/import.html
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
openslides/motion/templates/motion/widget.html
openslides/motion/views.py
openslides/participant/templates/participant/base_participant.html
openslides/participant/templates/participant/config.html
openslides/participant/templates/participant/edit.html
openslides/participant/templates/participant/group_edit.html
openslides/participant/templates/participant/group_widget.html
openslides/participant/templates/participant/import.html
openslides/participant/templates/participant/login.html
openslides/participant/templates/participant/overview.html
openslides/participant/templates/participant/password_change.html
openslides/participant/templates/participant/settings.html
openslides/participant/templates/participant/user_widget.html
openslides/projector/templates/projector/base_projector.html
openslides/projector/templates/projector/control_countdown.html
openslides/projector/templates/projector/control_overlay_message.html
openslides/projector/templates/projector/custom_slide_widget.html
openslides/projector/templates/projector/live_view_widget.html
openslides/projector/templates/projector/new.html
openslides/projector/templates/projector/overlay_widget.html
openslides/templates/base.html
openslides/utils/template.py
openslides/utils/views.py
requirements.txt
2013-02-03 19:03:18 +01:00
Oskar Hahn
b8a353fa7c
Added PDF view for the motions
2013-02-03 18:18:29 +01:00
Oskar Hahn
42082ae3c2
fixed pep8
2013-02-03 14:14:07 +01:00
Oskar Hahn
cbd4acbd4b
fixed motion tests
2013-02-03 13:55:42 +01:00
Oskar Hahn
ef7f6cf476
Permission system for MotionVersions
2013-02-03 13:24:29 +01:00
Oskar Hahn
e7c65b3db1
Moved some methodes from utils.views.DeleteView to QuestionMixin
2013-02-03 13:23:55 +01:00
Oskar Hahn
f4ea611fb8
Wrote log messages for motion changes
2013-02-03 10:02:06 +01:00
Oskar Hahn
65a18953bd
Added translatable log to the new motion system
2013-02-02 21:40:23 +01:00
Oskar Hahn
15b13c2bcd
Handel null=True in PersonField
2013-02-02 21:19:37 +01:00
Oskar Hahn
2e430b4406
check permission in motion view
2013-02-02 10:59:07 +01:00
Oskar Hahn
3ffb16d4d8
Fixed pep8 errors
2013-02-02 10:52:13 +01:00
Oskar Hahn
4cc6539f0c
Added get_allowed_actions to new motion app
2013-02-02 10:24:28 +01:00
Oskar Hahn
a27bd7eade
Add motion to agenda
2013-02-02 00:51:08 +01:00
Oskar Hahn
910e0f17e7
Add slide Date to the motion
2013-02-02 00:37:43 +01:00
Oskar Hahn
1518543a9a
Added motion widget and deletion of motions
2013-02-02 00:27:16 +01:00
Oskar Hahn
0f7d0e349c
Fixed URLs in projector views
2013-02-02 00:26:08 +01:00
Oskar Hahn
bd317aed31
Wrote tests for openslides.motion.models.Motion
2013-02-01 19:19:18 +01:00
Oskar Hahn
6c3eb0f765
fixed urls in views from the participant app
2013-02-01 17:35:27 +01:00
Oskar Hahn
1a2f0a1b5a
Added links to set and reset the state of a motion
2013-02-01 17:20:11 +01:00
Oskar Hahn
ac41a02ac5
Block supporting, unsupporting and creation of poll in some states
2013-02-01 16:44:06 +01:00
Oskar Hahn
fb82a1787b
Add workflows for motions
2013-02-01 16:33:45 +01:00
Stefan Frauenknecht
7f03e02e9a
Item type changed from CharField to IntegerField. Constant type names added.
2013-02-01 15:13:40 +01:00
Stefan Frauenknecht
9f3dae8059
ConfigForm: Base classes reordered
2013-02-01 14:47:51 +01:00
Stefan Frauenknecht
c595701597
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
2013-02-01 14:41:52 +01:00
Oskar Hahn
3f02a28002
Added a poll delete view to the new motion app
2013-02-01 13:24:44 +01:00
Oskar Hahn
b6256b73e0
Changed utils.views.DeleteView
2013-02-01 13:24:30 +01:00
Emanuel Schuetze
d3b679442c
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling.
2013-02-01 12:55:04 +01:00
Oskar Hahn
da7a7a9d68
Add Poll-system to the new motion app
2013-02-01 12:51:54 +01:00
Oskar Hahn
adeaf248ef
Changed utils.- and poll.views
2013-02-01 12:51:01 +01:00
Stefan Frauenknecht
5a9b7fdca5
Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
2013-01-31 20:37:55 +01:00
Stefan Frauenknecht
9746b3818f
Rework code to ommit unnecessary filter call.
2013-01-31 20:32:29 +01:00
Stefan Frauenknecht
3dfd16558a
Blanks removed
2013-01-31 18:35:52 +01:00
Emanuel Schuetze
033ecd9497
Added new glyphicons icons.
2013-01-31 10:20:53 +01:00
Emanuel Schuetze
82ad5e2de0
Major changes for new twitter bootstrap template (e.g. replaced icons)
2013-01-31 10:19:56 +01:00
Stefan Frauenknecht
65ebcbc991
#41 Time for each agenda item finished
2013-01-30 17:39:53 +01:00
Stefan Frauenknecht
bc9dcffff4
#41 Time for each agenda item
2013-01-29 14:28:42 +01:00
Oskar Hahn
d911e311d6
Let the user support and unsupport the motion
2013-01-26 18:18:02 +01:00
Oskar Hahn
7bcfa16737
Merge branch 'master' of github.com:OpenSlides/OpenSlides into new_motion
...
Conflicts:
openslides/motion/templates/motion/view.html
openslides/utils/views.py
2013-01-26 17:57:35 +01:00
Oskar Hahn
87e42cf9f8
Let the user choose if the motion should have a new version
...
via config or form
2013-01-26 17:09:13 +01:00
Oskar Hahn
0702d49e2e
Save the supporter
2013-01-26 16:42:23 +01:00
Oskar Hahn
d3b340769b
Added motion config tab
2013-01-26 16:33:55 +01:00
Oskar Hahn
ecb6419f8c
fixed apply and success url in utils.views
2013-01-26 16:19:53 +01:00
Oskar Hahn
567e6c975a
Show initial submitters in the update-form
2013-01-26 16:05:30 +01:00
Oskar Hahn
8708ba5da6
Only save new version, when version-data has changed
2013-01-26 15:39:35 +01:00
Oskar Hahn
1f87749742
Save the submitters to the motion
2013-01-26 15:25:54 +01:00
Oskar Hahn
1ae140c11e
Add docstrings to the motion class
2013-01-26 12:28:51 +01:00
Roland Geider
bebaadf850
Actually do the right check for further args
2013-01-23 21:24:02 +01:00
Roland Geider
3bfead298d
Add custom management command to start the application with tornado
2013-01-23 21:12:36 +01:00
Roland Geider
a14f9b30ad
Fix help text
2013-01-23 19:37:12 +01:00
Andy Kittner
22e8457894
Add an option to suppress starting of web browser ( closes #436 )
2013-01-22 21:04:07 +01:00
Roland Geider
70407feab8
Use the tornado server to serve the application
2013-01-19 10:51:42 +01:00
Emanuel Schuetze
b8532fabe4
Removed files from images to img dir.
2013-01-18 22:23:31 +01:00
Emanuel Schuetze
da4ed365bc
Updated js and css libraries (twitter bootstrap to 2.2.2 and jquery to 1.9.0).
2013-01-18 22:10:00 +01:00
Emanuel Schuetze
a4592ec849
Reworked projector activate buttons in agenda widget.
2013-01-18 21:44:47 +01:00
Emanuel Schuetze
586425354d
Reworked new template, especially agenda and dashboard.
2013-01-08 23:05:35 +01:00
Oskar Hahn
0231fe37f5
Start to rewrite the motion app
2013-01-08 20:22:03 +01:00
Stefan Frauenknecht
aee24425bc
Ticket 433 - Organisational items
2013-01-05 23:52:29 +01:00
Norman Jäckel
deb0d5b2e5
Some fixes. Update requirements.txt and setup.py.
2013-01-05 23:20:38 +01:00
Emanuel Schuetze
369f418b0e
Fixed missing endif
2013-01-05 15:43:52 +01:00
Emanuel Schuetze
13cd52bd96
Merged (conflicts).
2013-01-05 15:29:57 +01:00
Oskar Hahn
6417f5f107
fixed pep8 error
2013-01-05 14:56:22 +01:00
Oskar Hahn
2fcf0b3a07
fixed typo in utils/views.py
2013-01-05 14:46:05 +01:00
Oskar Hahn
56510f94a8
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-01-05 13:44:35 +01:00
Stefan Frauenknecht
bb74674c41
Deprecated import django.conf.urls.defaults adjusted.
2013-01-05 12:39:20 +01:00
Oskar Hahn
ae8641bcad
Raise an error if an CreateView does not define a apply_url
2013-01-05 01:48:03 +01:00
Oskar Hahn
3229d86d4d
Import urls.py needed django functions from django.conf.urls
2013-01-05 01:05:38 +01:00
Oskar Hahn
2f28655a25
Show Tabs if there do not define some permissions
2013-01-05 01:03:42 +01:00
Norman Jäckel
d842214e26
Fix typo in template.
2013-01-04 19:14:56 +01:00
Oskar Hahn
5d754984a3
fixed pep8 errors
2013-01-04 12:39:42 +01:00
Oskar Hahn
c1903848f2
Update openslides/__init__.py
2013-01-04 11:49:43 +01:00
Emanuel Schuetze
d671740966
Fixed merged errors.
2013-01-02 23:22:12 +01:00
Emanuel Schuetze
4ae7f3e243
Merge remote branch 'upstream/master' into newtemplate
...
Conflicts:
openslides/application/views.py
openslides/assignment/templates/assignment/overview.html
openslides/assignment/templates/assignment/view.html
openslides/assignment/views.py
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/motion/templates/motion/config.html
openslides/motion/templates/motion/edit.html
openslides/motion/templates/motion/import.html
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
openslides/participant/templates/participant/base_participant.html
openslides/participant/templates/participant/config.html
openslides/participant/templates/participant/group_edit.html
openslides/participant/templates/participant/group_overview.html
openslides/participant/templates/participant/overview.html
openslides/projector/templates/projector/base_projector.html
openslides/projector/templates/projector/dashboard.html
openslides/projector/templates/projector/live_view_widget.html
openslides/static/styles/base.css
openslides/templates/base.html
openslides/templates/front_page.html
openslides/utils/utils.py
2013-01-02 23:01:43 +01:00
Oskar Hahn
8a84f72891
fixed more url-template-tags
2012-12-16 17:35:06 +01:00
Oskar Hahn
5ea863ca81
Let the user choose the language in his settings
2012-12-16 17:26:53 +01:00
Oskar Hahn
b79fedc215
fixed jsonfield for django 1.5
2012-12-14 15:36:57 +01:00
Oskar Hahn
804f842650
Updated the url template tag
2012-12-14 15:10:14 +01:00
Oskar Hahn
366b8e0f1f
Droped support for python 2.5
2012-12-14 14:21:53 +01:00
Oskar Hahn
a07146098b
Changed Version to 1.4.dev
2012-12-14 14:14:01 +01:00
Emanuel Schuetze
c83348923a
Set version number to 1.3.1a0-dev (unreleased)
2012-12-10 22:36:18 +01:00
Emanuel Schuetze
bf98224ebd
Fixed missing translation.
2012-12-10 20:34:37 +01:00
Emanuel Schuetze
9a0bca7fea
Set 1.3 final release.
2012-12-10 20:30:32 +01:00
Emanuel Schuetze
56a5778260
Updated translation (fixed minor typo).
2012-12-10 20:06:17 +01:00
Emanuel Schuetze
c48c4e0e90
Added missing remove icon (for unsupport motion button).
2012-12-10 19:44:35 +01:00
Oskar Hahn
67f6b36ebc
Updated fr translation from transifex
2012-12-09 14:17:52 +01:00
Oskar Hahn
84324cf317
Updated translations
2012-12-09 12:59:56 +01:00
Oskar Hahn
0369edae1e
Added translationcontext for posts in assignment
2012-12-09 10:48:45 +01:00
Oskar Hahn
442e5fba60
Added fr translation
2012-12-09 10:40:41 +01:00
Oskar Hahn
fc4c4c3f95
Revert "Updated fr translation"
...
This reverts commit 7ff0825dc3
.
2012-12-05 20:07:11 +01:00
Oskar Hahn
05c029d8e5
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-12-04 00:20:41 +01:00
Oskar Hahn
7ff0825dc3
Updated fr translation
2012-12-04 00:20:11 +01:00
Norman Jäckel
046db10d3a
Hide group registered in the group widget.
...
Make custom slides text scrollable.
Fix template of personal_info_widget.
2012-12-01 19:32:58 +01:00
Norman Jäckel
a5022a3f00
Fix pep8 in openslides/__init__.py
2012-12-01 14:05:19 +01:00
Norman Jäckel
4410e454c8
Update test for version string.
2012-12-01 13:39:29 +01:00
Norman Jäckel
e7744f8210
Merge branch 'master' into Version_String
2012-12-01 13:10:29 +01:00
Oskar Hahn
e76ec5e975
Added a new command to the startscript to show the version
2012-11-29 15:01:49 +01:00
Norman Jäckel
d53017eea8
Get git commit id also in detached head mode.
2012-11-28 18:02:33 +01:00
Norman Jäckel
589c209c79
Merge branch 'master' into Version_String
...
Conflicts:
openslides/__init__.py
openslides/config/views.py
2012-11-28 17:54:29 +01:00
Oskar Hahn
ab4c5791ad
Merge pull request #61 from ostcar/master
...
Forbid the deletion of the registered group
2012-11-28 05:16:10 -08:00
Oskar Hahn
8306e7bf6e
Don't allow to remove the registered group
2012-11-28 13:59:14 +01:00
Oskar Hahn
48b530487b
Merge pull request #59 from emanuelschuetze/master
...
Prepared 1.3-rc1
2012-11-27 13:59:38 -08:00
Emanuel Schuetze
a010df5d1f
Reverted person.sort_name AttributeError fix ( e0ce1052c0
)
2012-11-27 22:54:07 +01:00
Oskar Hahn
e7c47395bb
Gave the empty user all the attributes it needs
2012-11-27 22:46:54 +01:00
Emanuel Schuetze
ae35a8c719
Updated translations
2012-11-27 21:30:45 +01:00
Emanuel Schuetze
94928c20c5
Updated translation msg strings.
2012-11-27 21:22:57 +01:00
Emanuel Schuetze
301a379fa6
Prepared 1.3-rc1 release.
2012-11-27 20:13:18 +01:00
Emanuel Schuetze
40984a6508
Merge remote branch 'upstream/master'
2012-11-27 20:10:13 +01:00
Oskar Hahn
4dfd4ac67f
fix _proper_unicode
2012-11-26 15:48:23 +01:00
Oskar Hahn
bdfb714013
fixed pep8 in pdf.py
2012-11-26 10:35:29 +01:00
Oskar Hahn
c276bce780
Let travis test pep8
2012-11-26 10:11:36 +01:00
Oskar Hahn
abd21dd345
Added more tests for the agenda
2012-11-26 10:05:51 +01:00
Oskar Hahn
fddf929ab5
Load groups_de when creating the database
2012-11-25 01:07:39 +01:00
Oskar Hahn
ab4b117a93
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-25 00:55:37 +01:00
Oskar Hahn
a31a67c32e
removed initial_data
2012-11-25 00:55:25 +01:00
Oskar Hahn
804b514597
Merge pull request #57 from andkit/bug-409
...
Fix #409
2012-11-24 12:29:44 -08:00
Oskar Hahn
3f469ab9d6
Commited the fix for get_version
2012-11-24 21:26:09 +01:00
Oskar Hahn
b3806d8cdd
some tests for the agenda
2012-11-24 21:10:55 +01:00
Andy Kittner
5979b23b04
Merge remote-tracking branch 'origin/master' into bug-409
...
Conflicts:
openslides/main.py
2012-11-24 20:49:04 +01:00
Andy Kittner
21a51523a4
Make pep8.py happy
2012-11-24 20:35:06 +01:00
Emanuel Schuetze
ec60207cfd
Fixed typo (candidation -> candidature)
2012-11-24 17:39:28 +01:00
Emanuel Schuetze
e0ce1052c0
Catch AttributeError for 'person.sort_name' in assignment/models.py
2012-11-24 17:34:56 +01:00
Andy Kittner
c405e9b648
Rework default settings handling ( fixes #409 )
2012-11-24 15:00:36 +01:00
Oskar Hahn
6b2645d11c
reordered the tests
...
moved the tests from the openslides-module to an own module
configured coverage
2012-11-24 15:00:17 +01:00
Oskar Hahn
bd32994296
cleanup
...
Removed unused imports and fixed pep8 errors
2012-11-24 14:01:21 +01:00
Oskar Hahn
f5a438cf9f
cleanup in utils
2012-11-24 01:42:10 +01:00
Norman Jäckel
4c97291598
Remove non-used revision template var.
2012-11-23 11:33:34 +01:00
Norman Jäckel
baebfbb585
Fix get_version, insert and use get_git_commit_id.
2012-11-23 11:31:30 +01:00
Oskar Hahn
9943e84a96
default permissions for the registered group
...
plus some cleanup for the registered and the anonymous group
2012-11-23 09:35:41 +01:00
Emanuel Schuetze
bba301a4b3
#420 : Use clean layout for group slide: Remove printing group users; print group name and number of members only. (Later we need a solution to print users fullname not username.)
2012-11-22 22:07:33 +01:00
Emanuel Schuetze
c115ea59a0
Fixed typo in comment.
2012-11-22 21:48:49 +01:00
Oskar Hahn
fa1c384d28
made use of defaults in get_or_create
2012-11-22 18:47:50 +01:00
Oskar Hahn
1049141483
Created a default group for registered users
2012-11-22 18:39:54 +01:00
Oskar Hahn
e168445497
fixed error, which allowed admins to delete the anonymous grou
2012-11-22 17:29:49 +01:00
Oskar Hahn
1dc7d45670
sort persons in motions
2012-11-22 17:00:09 +01:00
Oskar Hahn
8014f327a2
Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api
2012-11-22 16:35:26 +01:00
Oskar Hahn
fbf81e7780
sort persons
2012-11-22 16:19:09 +01:00
René Köcher
ed33b47666
Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides
...
Conflicts:
openslides/locale/de/LC_MESSAGES/django.po
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-22 12:52:11 +01:00
René Köcher
9f51a24311
#419 - aftermath
...
- remove accidental print statements left over from debugging
- create missing groups on import
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-22 10:26:44 +01:00
René Köcher
36f83808fd
Implement #419 : Add group column for motion csv import
...
The motion import now features an additional column to indicate that the import should be created by an existing group.
If the column is missing it is considered as 'off' and first / last name are used as always.
If the column exists and contains 'y','yes','j','ja','true', '1' or 1 first name will be ignored and last name will be interpreted as a group name.
If the group exists and can act as a person the motion will be imported and assigned to this group.
Signed-off-by: René Köcher <shirk@bitspin.org>
2012-11-21 23:38:25 +01:00
Emanuel Schuetze
cbd04327bb
Reverted: Administrator can be deleted by other manager. (partly reverted 533c65562d
after discus it with oskar because import also possible as non-admin)
2012-11-21 23:26:54 +01:00
Emanuel Schuetze
8aec947303
Removed unused widget file (duplicate of welcome_widget.html).
2012-11-21 23:05:38 +01:00
Emanuel Schuetze
830f85109d
Minor formatting work.
2012-11-21 23:03:14 +01:00
Emanuel Schuetze
d5ee6d69b6
Enlarged users select box in new/edit group form.
2012-11-21 22:06:22 +01:00
Emanuel Schuetze
4877eed46c
Updated translation.
2012-11-21 21:45:27 +01:00
Emanuel Schuetze
ec1a15a835
#175 : Adjusted group slide; analog to user slide.
2012-11-21 21:45:19 +01:00
Oskar Hahn
2acfd02144
Merge pull request #45 from normanjaeckel/GroupSlide
...
Insert a slide for groups
2012-11-21 12:18:17 -08:00
Emanuel Schuetze
f3c865ee3c
#176 : Adjusted user slide. Show only relevant information in a nice and clear layout.
2012-11-21 21:05:56 +01:00
Emanuel Schuetze
c5a2f896e2
Fixed typo in identifier 'assignment_candidates'.
2012-11-21 20:12:08 +01:00
Emanuel Schuetze
da0757e40f
#417 : Don't hide vote results table if status is reset
2012-11-21 19:39:55 +01:00
Emanuel Schuetze
17d813e08b
Show error message for NameError.
2012-11-21 19:36:12 +01:00
Norman Jäckel
af6c403936
Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector.
2012-11-21 15:14:38 +01:00
Norman Jäckel
06af94fb91
Fix assignment poll choosing the right method (yes-no-abstain True or False)
2012-11-21 15:03:29 +01:00
Norman Jäckel
8e886a22ef
Insert a slide for groups
2012-11-21 14:22:30 +01:00
Norman Jäckel
00e77ba0fc
Use join for the group list also in the participant view
2012-11-21 14:09:47 +01:00
Norman Jäckel
5939b98772
Use join for group list in UserSlide.html
2012-11-21 14:07:14 +01:00
Norman Jäckel
d69e5a246b
Fix urls.py - Redirect from / to the dahsboard
2012-11-21 13:41:16 +01:00
Emanuel Schuetze
7fa86f7de0
Used blocktrans instead of trans
2012-11-20 12:37:16 +01:00
Emanuel Schuetze
ec10f357cf
Used RedirectView from openslides.utils.views. Used reverse_lazy
...
instead of hard coded redirect url.
2012-11-20 12:19:12 +01:00
Emanuel Schuetze
5e97ece5f4
#278 : Used cycle rowcolor in vote results table also for inavlid votes row
2012-11-19 23:52:48 +01:00
Emanuel Schuetze
0fbb7dced3
Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!)
2012-11-19 23:30:09 +01:00
Emanuel Schuetze
844b2892f1
Updated translation for professional support footer.
2012-11-19 23:05:38 +01:00
Emanuel Schuetze
c5595effef
Updated translation.
2012-11-19 22:59:13 +01:00
Emanuel Schuetze
93d2dc8d7d
Restructuring and optimization of assignment templates.
...
(Now: elected candidates are marked in candidate list; blocked candidates not visible for status 'finished')
2012-11-19 22:54:09 +01:00
Emanuel Schuetze
0cf4191934
Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty.
2012-11-17 23:44:41 +01:00
Emanuel Schuetze
b10cf331ab
Updated translation
2012-11-17 22:24:29 +01:00
Emanuel Schuetze
27fa32b718
Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard)
2012-11-17 22:14:49 +01:00
Emanuel Schuetze
e338529865
#296 : Localised the datetime in PDF header
2012-11-17 21:44:17 +01:00
Emanuel Schuetze
71eb529adf
Fixed #403 : Moved projector control icons into projector live widget (Added RequestContext to check perms in template.)
2012-11-17 20:59:30 +01:00
Emanuel Schuetze
f1fb68a569
#375 : Missing translation of participant type in participant PDF list. (Now get_type_display() is used.)
2012-11-17 20:02:16 +01:00
Andy Kittner
28cf531e4d
Pass along database path to create_settings if started as portable version
2012-11-09 13:45:52 +01:00
Oskar Hahn
b8bbec3a04
Merge pull request #42 from emanuelschuetze/master
...
Several minor fixes for 1.3-beta2
2012-11-09 01:16:37 -08:00
Oskar Hahn
6719cca7e1
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-09 09:52:00 +01:00
Oskar Hahn
54fb61d211
fixed main.py and manage.py for the openslides.exe
2012-11-09 09:51:10 +01:00
Emanuel Schuetze
81570b61e6
Rename submenu titel 'projector' to 'dashboard'.
2012-11-08 20:11:06 +01:00
Emanuel Schuetze
216ac95cfb
Redirect to dashboard after submit widget selection form.
2012-11-08 20:08:09 +01:00
Emanuel Schuetze
5623bb6888
Move professional support message into base template footer.
2012-11-08 19:13:31 +01:00
Emanuel Schuetze
533c65562d
Don't allow to deactivate or delete the superuser or yourself.
...
Otherwise it's very danger to lock out your current (superuser) session.
2012-11-08 18:57:53 +01:00
Emanuel Schuetze
e601d8a5a3
Fixed display_name of widgets.
2012-11-08 09:43:04 +01:00
Emanuel Schuetze
7c75f42d85
Updated translations.
2012-11-08 09:42:35 +01:00
Oskar Hahn
cbea48ab7e
Merge pull request #40 from emanuelschuetze/master
...
Fixed type in pdf list
2012-11-08 00:26:12 -08:00
Oskar Hahn
de7d4ed6cd
Merge pull request #34 from normanjaeckel/UserSlide
...
Add UserSlide with new template.
2012-11-08 00:25:04 -08:00
Emanuel Schuetze
8d599d6428
Fixed type in participants PDF list.
2012-11-08 09:22:23 +01:00
Oskar Hahn
f551b2fa6d
Merge pull request #39 from emanuelschuetze/master
...
Last translation update for 1.3-beta2
2012-11-07 13:43:02 -08:00
Emanuel Schuetze
71790a345b
Fixed some English strings. Updated translations.
2012-11-07 22:37:33 +01:00
Oskar Hahn
030058fb7c
Merge pull request #37 from andkit/master
...
Fix UnicodeError on widgets page
2012-11-07 13:35:24 -08:00
Emanuel Schuetze
a3627b77b4
Added new allowed language (French).
2012-11-07 22:24:39 +01:00
Emanuel Schuetze
b66a57d341
Prepared 1.3-beta2 release.
2012-11-07 22:21:55 +01:00
Emanuel Schuetze
9d183e9746
Rename user group to group. Updated translations. Clean up new french po file.
2012-11-07 22:16:11 +01:00
Emanuel Schuetze
7b64d464f5
Added user view url also for last_name.
2012-11-07 21:27:59 +01:00
Andy Kittner
32a76e2aad
Fix UnicodeError on widgets page
2012-11-07 21:12:52 +01:00
Emanuel Schuetze
af4f923527
Fixed KeyError in main.py.
2012-11-07 20:48:07 +01:00
Oskar Hahn
0330f74d1b
Merge pull request #35 from andkit/master
...
Fix missing translations (#415 )
2012-11-07 01:24:54 -08:00
Oskar Hahn
4b2fddc9ce
Merge pull request #36 from ostcar/fr
...
Added fr translation. The work was done from Moira.
2012-11-07 01:24:09 -08:00
Oskar Hahn
a691db5d30
updated fr translation
...
Thx to Moira
2012-11-07 10:22:32 +01:00
Oskar Hahn
2d9b0a8848
delete the projector cache after 1 second.
2012-11-07 10:05:38 +01:00
Oskar Hahn
13b5336af9
Merge pull request #33 from ostcar/manage
...
fixed manage.py
2012-11-07 00:59:35 -08:00
Andy Kittner
fbd77da788
Fix missing translations ( #415 )
...
- The text "motions" was used with a plural here, but it was also
present in other places without a plural, therefore the .po file
contained only a singular translation. Solved by disambiguating the
uses with a context
- The submitter field of the MotionManagerForm was missing a label
2012-11-07 00:12:15 +01:00
Norman Jäckel
35e41873a0
Add UserSlide with new template.
2012-11-06 00:02:44 +01:00
Oskar Hahn
41c1c5a2c8
Added fr translation
2012-11-05 18:41:53 +01:00
Emanuel Schuetze
a363efe2ef
Fixed #390 : Added new user field 'about me'
2012-11-03 09:34:42 +01:00
Emanuel Schuetze
005cb2f15e
Updated translations.
2012-11-03 08:59:34 +01:00
Oskar Hahn
3c58d8d64b
fixed manage.py
2012-11-02 20:57:59 +01:00
Oskar Hahn
424d10cb63
Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1'
...
Conflicts:
openslides/__init__.py
openslides/projector/views.py
2012-10-31 15:27:47 +01:00
Norman Jäckel
3b4e19ad3b
Enhence template of UserView and GroupView
2012-10-31 14:47:42 +01:00
Norman Jäckel
ac25e02e2d
Catch another IOError in get_version()
2012-10-31 14:38:06 +01:00
Emanuel Schuetze
d9ccb02969
Changed version number string. Important for building portable version.
...
Used alpha|beta|rc without git commit hash.
Added 'dev' suffix which use git hash only. It is easier to handle in file names of releases.
2012-10-31 07:11:53 +01:00
Emanuel Schuetze
8ffeadfe88
Cleared projector cache if countdown enabled or overlay message changed.
2012-10-30 23:45:06 +01:00
Emanuel Schuetze
3dd5ce9e73
Fixed default password generation while CSV import.
2012-10-30 23:10:23 +01:00
Emanuel Schuetze
9a522f3835
Use participant_sort_users_by_first_name config var for overview table, participant list (pdf) and first time passwords (pdf).
2012-10-30 23:00:24 +01:00
Emanuel Schuetze
4ee518dd96
Updated translations (for sorting participants).
2012-10-30 22:59:37 +01:00
Emanuel Schuetze
aa0abec970
Fixed motion csv import error.
2012-10-30 22:30:32 +01:00
Emanuel Schuetze
145a52eb24
Updated translations.
2012-10-30 22:16:43 +01:00
Emanuel Schuetze
85771c4af6
Fixed participant CSV import.
2012-10-30 22:05:03 +01:00
Emanuel Schuetze
f62b7f299b
Changed admin full name to "Adminstrator".
2012-10-30 21:02:39 +01:00
Emanuel Schuetze
d9fbfeff84
for pull request #23 : Removed "You have access to apps" code from welcome widget.
2012-10-30 20:18:16 +01:00
Emanuel Schuetze
51a762b4c6
Prepared 1.3-beta1 release.
2012-10-30 20:05:54 +01:00
Emanuel Schuetze
0c797aa476
Merge remote branch 'upstream/master'
2012-10-30 20:03:17 +01:00
Norman Jäckel
c13f4ba52d
Add UserView and GroupView part 2
2012-10-30 00:07:25 +01:00
Oskar Hahn
9dc799ef5e
fixed projector_cache.
...
It still does not work, but it does show changes on slides now
2012-10-29 23:26:10 +01:00
Oskar Hahn
f4e1f83f15
rename test_name_surfix in test_name_suffix in participant/tests.py
2012-10-29 16:27:15 +01:00
Norman Jäckel
b213e75223
Enhancement to ticket # 389 (Message on assignment slide when no vote results yet available)
2012-10-29 10:16:12 +01:00
Oskar Hahn
79c5e93422
Redesigned the QuestioMixin
2012-10-28 19:59:41 +01:00
Norman Jäckel
21c12a6d32
Fix POST request in SupportView
2012-10-28 17:44:15 +01:00
Oskar Hahn
a100fd5d78
Merge pull request #30 from normanjaeckel/SupportView_in_motion
...
New: Support view in motion
2012-10-28 07:19:10 -07:00
Norman Jäckel
9d3d095162
Clean up SupportView. Raise error message at GET request instead of POST.
2012-10-28 02:09:47 +02:00
Norman Jäckel
015dc159ed
Add UserView and GroupView part 1
2012-10-27 18:17:22 +02:00
Norman Jäckel
3f0c31d12b
Add user widget and group widget, see # 379
2012-10-26 18:16:09 +02:00
Norman Jäckel
1063e7011a
Change query for assignments in personal_info_widget
2012-10-26 17:14:46 +02:00
Norman Jäckel
510aca54eb
Add widget with personal info, ticket #25
2012-10-25 23:58:32 +02:00
Norman Jäckel
0ec106a034
Fix message on assignment slide, ticket #389
2012-10-25 22:18:20 +02:00
Norman Jäckel
d6ebbdc541
Fix plural-error on ballot paper, ticket #393
2012-10-25 21:57:02 +02:00
Norman Jäckel
1849e14dbf
Insert widget with static welcome text (see frontpage and config tab), ticket #387
2012-10-25 21:47:59 +02:00
Norman Jäckel
4052e137a2
Insert new list with all elected candidates, see ticket #374
2012-10-25 21:28:13 +02:00
Norman Jäckel
d0771063b3
Fix assignment overview table, ticket #372
2012-10-25 21:08:29 +02:00
Oskar Hahn
c4e6466926
Added cache for the ajax-version of the projector
2012-10-25 15:17:25 +02:00
Oskar Hahn
1002ecc6e6
Remove redundant keyword for the SupportView class
2012-10-25 10:25:59 +02:00
Oskar Hahn
2e41dcdefe
Fixt problems with the permission of supporting and unsupporting a motion
...
Ticket #377
2012-10-25 10:15:41 +02:00
Oskar Hahn
7dcc2374f4
Merge remote-tracking branch 'openslides/master' into supporter
...
Conflicts:
openslides/application/urls.py
openslides/motion/models.py
openslides/motion/views.py
2012-10-25 09:23:24 +02:00
Oskar Hahn
87d5f4b6f8
Updated german translation
2012-10-24 12:55:25 +02:00
Oskar Hahn
a0242c3c74
Show linebreaks in assignment description. #392
2012-10-24 12:48:11 +02:00
Oskar Hahn
413cd27d40
fixed deletion of motions. #391
2012-10-24 12:45:40 +02:00
Oskar Hahn
57d591fee8
Renamed category to detail
2012-10-24 12:30:45 +02:00
Oskar Hahn
56b9e831c8
Allowd access to the dashboard per default. #361
2012-10-24 12:21:44 +02:00
Oskar Hahn
3e1938941f
Append a default class for the person-api.
...
Also fixed the assignment-ballot-paper for group-persons
2012-10-24 12:15:29 +02:00
Oskar Hahn
c58d478151
rename render_to_forbitten to render_to_forbidden. #370
2012-10-24 11:39:27 +02:00
Oskar Hahn
17afa3c5d1
fixed #326 whitespace in allready used names
2012-10-24 11:35:07 +02:00
Oskar Hahn
681d909fa3
rename application to motion
2012-10-24 11:07:36 +02:00
Norman Jäckel
c036be05bf
Fix new class based view for support/unsupport motions. Fix strange error in QuestionMixin.
2012-10-23 11:54:18 +02:00
Norman Jäckel
fe69973dcc
Change version number to 1.3a1. Insert git hash as suffix of the version number. (Ticket #388 )
2012-10-23 02:03:47 +02:00
Emanuel Schuetze
fa9874038e
New welcome widget.
2012-09-20 20:45:37 +02:00
Oskar Hahn
3aefd252ff
Merge remote-tracking branch 'emanuel/master'
2012-09-20 10:05:00 +02:00
Oskar Hahn
5b97250df2
Small fix with the overlay message
2012-09-20 09:55:27 +02:00
Emanuel Schuetze
a60f03aebc
Fixed: Application is deleted if user clicks 'No' in confirm form.
2012-09-19 17:00:40 +02:00
Emanuel Schuetze
9f9ea81fc6
Fixed attribute error if anonymous opens application/assignment view.
2012-09-19 14:16:17 +02:00
Emanuel Schuetze
4cd1ad5954
Fixed missing supporters number
2012-09-19 11:58:24 +02:00
Norman Jäckel
3bde0a8af9
Use Class-based View to support or unsupport an application. Use QuestionMixin for a confirm message
2012-09-19 03:10:15 +02:00
Emanuel Schuetze
613956b62a
Fixed missing blue 'candidate elected' line in assignment projector template.
2012-09-18 22:55:31 +02:00
Emanuel Schuetze
1548479069
Fixed application and assigment ballot paper: don't use old profile object.
2012-09-18 22:47:12 +02:00
Emanuel Schuetze
12d8527255
Updated translations.
2012-09-18 22:40:30 +02:00
Emanuel Schuetze
9cb9270df3
Assignment: Fixed generating ballot pdf paper (typo: surfix).
2012-09-18 22:37:53 +02:00
Oskar Hahn
5aa2bc650f
Merge pull request #18 from normanjaeckel/Default_Sorting
...
Default sorting using Meta Class option and new config var
2012-09-15 00:23:50 -07:00
Oskar Hahn
eb267acf08
removed scrollbar in projector-template
2012-09-15 09:13:36 +02:00
Oskar Hahn
2984fd791c
small fix to the person api
2012-09-15 09:11:56 +02:00
Norman Jäckel
0db8af15b7
Clean up the code for pull request
2012-09-14 23:53:59 +02:00
Norman Jäckel
269b093b28
Enhence use of config var and Meta Class for default sorting of users
2012-09-14 03:02:00 +02:00
Norman Jäckel
e5c132e34c
Use new config var for sorting users
2012-09-14 02:46:43 +02:00
Norman Jäckel
f41fe87656
Insert new config var for sorting Users by first_name
2012-09-14 02:40:40 +02:00
Norman Jäckel
f8d3390c78
Docstrings and sorting of Users and Groups in the UsersAndGroupsToPersons class object (was: UsersConnector)
2012-09-14 02:24:02 +02:00
Norman Jäckel
811b780fb9
Fix typo TYPE_CHOICE to TYPE_CHOICES
2012-09-14 01:52:20 +02:00
Norman Jäckel
cb3b26c45d
Default sorting of applications using Meta Class
2012-09-14 01:14:25 +02:00
Norman Jäckel
77ae543ff2
Using Meta Class for ordering assignments by name
2012-09-14 00:21:59 +02:00
Oskar Hahn
eac23ecd99
remove confusing image
2012-09-13 22:02:42 +02:00
Oskar Hahn
56e3fe7a37
fix translation
2012-09-13 21:56:50 +02:00
Oskar Hahn
f0f14861e8
fixed message for unblocking users
2012-09-13 21:51:50 +02:00
Oskar Hahn
d8136045bb
update application pdf
2012-09-13 21:33:57 +02:00
Oskar Hahn
0cf0e58af9
Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides
...
Conflicts:
openslides/assignment/models.py
2012-09-13 15:28:35 +02:00
Oskar Hahn
ef7deb90c9
translate agenda hidden filter in js
2012-09-13 15:21:43 +02:00
Oskar Hahn
20ac817d49
Fixed error message when delrun after the list is closed
2012-09-13 15:07:24 +02:00
Oskar Hahn
e64f4f5efc
show blocked candidates of an assignment
2012-09-13 14:59:14 +02:00
Oskar Hahn
0725003377
clarify the submitter name in the application pdf
...
It was not clear, that the submitter should sign the formular
2012-09-13 12:16:46 +02:00
Oskar Hahn
48a992119a
Fixted permissions for editing an application
...
The suppmitter could edit an application after it was finished by
manipulating the url
2012-09-13 12:09:17 +02:00
Oskar Hahn
b15d70d13d
typo
2012-09-13 11:52:04 +02:00
Oskar Hahn
bcfceccb09
dont use simular passwords in gen_password (no Il10oO)
2012-09-13 11:50:06 +02:00
Oskar Hahn
63835e7443
fixed application deletion
2012-09-13 11:43:11 +02:00
Oskar Hahn
760f8e042e
some fixes
2012-09-12 10:17:51 +02:00
Emanuel Schuetze
7376b7a692
Updated translations.
2012-09-11 20:50:53 +02:00
Emanuel Schuetze
e9ac336b61
Fixed wrong permissions: can_create_applications instead of can_manage_applications
2012-09-11 20:20:58 +02:00
Emanuel Schuetze
bc25937aa0
Updated translations.
2012-09-11 19:57:22 +02:00
Oskar Hahn
93ee260856
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-09-11 19:30:50 +02:00
Oskar Hahn
38d53bbb92
fixed first-time-pdf
2012-09-11 19:30:12 +02:00
Oskar Hahn
8732b67bd8
Merge pull request #14 from ostcar/no_recandidate
...
block a user to be a candidate from a assignment, if he delete his candidation by him self
2012-09-11 00:52:50 -07:00
Oskar Hahn
d6a0ec5893
Merge pull request #11 from normanjaeckel/custom_slides
...
Insert weight field in custom slides and order custom slides in the
2012-09-11 00:47:07 -07:00
Emanuel Schuetze
51ab5e3850
Minor style for widgets.
2012-09-11 00:05:20 +02:00
Emanuel Schuetze
2bf992117c
Updated widget titel and icons.
2012-09-11 00:00:44 +02:00
Emanuel Schuetze
15ab01c9d1
Removed unused mainmenu and submenu blocks.
2012-09-10 23:43:33 +02:00
Emanuel Schuetze
2f3e57bf4a
Removed unused base_assignment.html template.
2012-09-10 23:40:08 +02:00
Emanuel Schuetze
a77bb31a2a
Clean template code.
2012-09-10 23:38:20 +02:00
Emanuel Schuetze
473c2c347f
Removed unused base_agenda.html template.
2012-09-10 23:37:59 +02:00
Emanuel Schuetze
889bd66e04
Adjusted dashboard templates for twitter bootstrap.
...
Reduced jquery-ui stuff to really neccessary files.
2012-09-10 23:28:19 +02:00
Emanuel Schuetze
b705df8c5f
Changed redirect to dashboard after changing password.
2012-09-10 21:02:58 +02:00
Emanuel Schuetze
e50abbbf03
Restructured base.css.
2012-09-10 18:03:33 +02:00
Emanuel Schuetze
ce233fc870
Updated config template.
2012-09-10 17:40:41 +02:00
Emanuel Schuetze
74ffad6ced
Minor changes for template style.
2012-09-10 17:17:22 +02:00
Emanuel Schuetze
65840d4261
Minor changes in assigment view template.
2012-09-10 17:15:43 +02:00
Emanuel Schuetze
94ffb3ab45
Redesign login template.
2012-09-07 21:25:18 +02:00
Emanuel Schuetze
6a3bead5f6
Cleanup template code and style.
2012-09-06 23:59:03 +02:00
Emanuel Schuetze
ae51d9e7da
Adjusted template for assignment app.
2012-09-06 23:58:20 +02:00
Emanuel Schuetze
7c90206b3f
Adjusted new template for participant app. Added new generic form.
2012-09-06 22:41:24 +02:00
Oskar Hahn
75eb596547
block a user to be a candidate from a assignment, if he delete his
...
candidation by him self
2012-09-06 15:57:42 +02:00
Norman Jäckel
d1c12ea0e5
Sorting applications in the widget by number
2012-09-05 22:42:44 +02:00
Norman Jäckel
2ecd552d2b
Default Sorting of applications by number
2012-09-05 22:38:40 +02:00
Norman Jäckel
d84a8d2bdd
Sorting assignments by name in the widget
2012-09-05 22:19:53 +02:00
Norman Jäckel
55073494fc
Insert weight field in custom slides and order custom slides in the widget
2012-09-05 21:54:34 +02:00
Emanuel Schuetze
8da28310f7
Hide optional columns on mobile devices (with small window width).
2012-09-05 07:54:01 +02:00
Emanuel Schuetze
13cfdb36af
Updated login form to new template style.
2012-09-05 00:43:19 +02:00
Emanuel Schuetze
7fde53a09e
Updated template with twitter bootstrap. Step 1: agenda and application.
2012-09-05 00:20:28 +02:00
Andy Kittner
1b65044223
Remove a few spaces for pep8 conformance
2012-08-28 19:07:40 +02:00
Andy Kittner
cc20ec3456
Add special handling to determine default settings for portable version
...
The portable version will prefer to create it's settings in it's own
directory and only fallback to a user-specific path
($LOCAL_APPDATA/openslides) if this directory is not writable
2012-08-27 21:48:46 +02:00
Norman Jäckel
6d1c356ffd
Name openslides_personal_settings.py and openslides_global_settings.oy
2012-08-24 14:23:12 +02:00
Norman Jäckel
32cfa6c914
Fix encoding error in settings.py #349
2012-08-23 23:34:30 +02:00
Emanuel Schuetze
777d2266bc
Fixed drag'n'drop of widgets into empty dashboard column. Renamed
...
projector-control{js|css} files into dashboard{js|css}.
2012-08-22 09:39:20 +02:00
Oskar Hahn
423f04d0be
send overlay message data to own view
2012-08-15 18:00:22 +02:00
Oskar Hahn
705fb972b1
removed projector link from agenda
2012-08-15 13:44:15 +02:00
Oskar Hahn
416f3f6ff3
added select widgets view
2012-08-15 13:42:25 +02:00
Oskar Hahn
6b7ea558fc
rewrote widgets for the dashboard
2012-08-15 11:56:43 +02:00
Oskar Hahn
dfb24ba61a
Merge branch 'master' into dashboard
2012-08-15 11:05:29 +02:00
Oskar Hahn
9c031768f8
fix merge errors
2012-08-15 11:01:38 +02:00
Oskar Hahn
c6bc50e2fd
rename projector to dashboard
2012-08-15 10:58:29 +02:00
Oskar Hahn
b7a0e83c68
changed the main script
2012-08-14 14:19:59 +02:00
Oskar Hahn
a2be848932
Merge branch 'master' into install
2012-08-13 19:35:14 +02:00
Oskar Hahn
bd64a6cb5c
Merge branch 'stable/1.2.x'
...
Conflicts:
openslides/application/models.py
openslides/application/views.py
openslides/participant/forms.py
openslides/participant/views.py
2012-08-13 19:16:42 +02:00
Oskar Hahn
d0e7419666
Merge remote-tracking branch 'openslides/stable/1.2.x'
2012-08-13 18:36:23 +02:00
Oskar Hahn
5178363127
Merge pull request #6 from ostcar/translation
...
Translation
2012-08-13 09:30:17 -07:00
Oskar Hahn
31ca01563e
some corrective actions
2012-08-13 14:37:49 +02:00
Oskar Hahn
df40de67b0
rename openslidesuser to user and openslidesgroup to group
2012-08-12 12:52:38 +02:00
Oskar Hahn
0a8ee9cbad
changed request.user to be the openslidesuser
2012-08-12 10:12:26 +02:00
Oskar Hahn
6795ccd25b
change the users in the groupform
2012-08-11 11:36:55 +02:00
Oskar Hahn
cdf160dfc3
fix some problems with the creation of new users
2012-08-11 11:09:20 +02:00
Oskar Hahn
f01fe5a894
removed unused imports from participant and did some pep8 changes
2012-08-11 10:51:52 +02:00
Oskar Hahn
bc3e7fdaab
rewrote the group views as class based views
2012-08-11 10:09:54 +02:00
Oskar Hahn
9b3bec69d1
rewrote the passwort reset view as class base view
2012-08-10 21:24:26 +02:00
Oskar Hahn
87af568eeb
redesign the DeleteView
...
Append a QuestionMixin to send a question via the django message api
2012-08-10 21:00:13 +02:00
Oskar Hahn
1f2f7cc73a
rewrote user csv import
...
The import does not delete the existing users anymore, but append the users as new users.
2012-08-10 19:49:46 +02:00
Oskar Hahn
bb00eb3eb4
rewrote participant status view as class based view
2012-08-10 19:19:41 +02:00
Oskar Hahn
90fddba63b
rewrote delete participant view as class based view
2012-08-10 13:29:46 +02:00
Oskar Hahn
c029fe2f95
ix participant tests
2012-08-10 13:26:03 +02:00
Oskar Hahn
ddb5756868
rewrote the participant edit view as class based view
2012-08-10 13:22:09 +02:00
Oskar Hahn
1832a0c125
make the openslides user a child model of the django user model
2012-08-10 13:11:10 +02:00
Oskar Hahn
29049119f7
rewrote participant overview as class based view
2012-08-10 11:51:45 +02:00
Oskar Hahn
f008a4eb0a
use OpenSlides.get_full_name instead of OpenSlides.user.get_full_name
2012-08-10 11:18:01 +02:00
Oskar Hahn
153482f32d
first_name, last_name and name_surfix as OpenSlidesUser attributes
2012-08-10 11:14:11 +02:00
Norman Jäckel
3ba04e10b4
Fix typo in default permissions for anonymous-group
2012-08-10 00:37:23 +02:00
Oskar Hahn
b19f6a7d74
Merge branch 'master' into install
...
Conflicts:
openslides/__init__.py
2012-08-08 13:45:32 +02:00
Oskar Hahn
5353053d29
Merge branch 'stable/1.2.x'
...
Conflicts:
openslides/application/views.py
2012-08-08 11:21:36 +02:00
Oskar Hahn
75443808af
fix some errors in participant
2012-08-08 10:52:13 +02:00
Oskar Hahn
d1ab2f2e85
some pep8 corections for the participant app
2012-08-08 10:34:23 +02:00
Oskar Hahn
f22362df9d
made participant-test run again
2012-08-08 10:07:36 +02:00
Oskar Hahn
1719aa588d
rename some user api and participant names
2012-08-07 22:43:57 +02:00
Oskar Hahn
b55ceddb82
append tests for the participant app
2012-08-07 10:15:39 +02:00
Oskar Hahn
ab33b9f05a
fix error in application-supporters an assignment-candidates, for non admin users
2012-08-06 14:58:52 +02:00
Oskar Hahn
f8f6e712a7
added LOCALE_PATHS to openslides_settings to avoid deprication in Django 1.5
2012-08-05 22:35:09 +02:00
Oskar Hahn
c52f8f3ca7
changed application to motion and permitted to authorized in message-strings
2012-08-05 22:31:20 +02:00
Oskar Hahn
008c743650
fixt #334 . Let the anonymous user see the assignments by default
2012-08-05 11:58:11 +02:00
Oskar Hahn
998fb3e1ee
fix #336 . The admin could not edit the supporters from applications
2012-08-05 11:48:03 +02:00
Oskar Hahn
4873cd7163
fixted #330 . Error if the related slide for an Agenda Item does not exists
2012-08-05 11:28:56 +02:00
Oskar Hahn
bcd98301a9
remove mercurial_version from openslides.__init__
2012-08-05 10:59:25 +02:00
Oskar Hahn
feb1aa4138
make start.py script run again
2012-08-05 09:52:00 +02:00
Oskar Hahn
e3f8bfcfd0
update setup.py to make an openslides module
2012-08-04 20:59:27 +02:00
Oskar Hahn
1a1bcb2358
updated some parts of OpenSlides to the new user-api
2012-08-04 15:15:11 +02:00
Oskar Hahn
465497ab30
some pep8 changes for the user-api
2012-08-04 14:47:09 +02:00
Oskar Hahn
72e41fe286
user-api: reorderd the user-api
2012-08-04 13:18:06 +02:00
Oskar Hahn
fe1ebf806a
user-api: Use the right Exception in get_user()
2012-08-04 12:51:07 +02:00
Oskar Hahn
8da09bb985
user-api: fix an error with deactivated supporters in application
2012-08-04 12:46:32 +02:00
Oskar Hahn
14bf6d0a35
user-api: updated the application-supporter system to new user-api
2012-08-04 12:19:31 +02:00
Oskar Hahn
2bc2dad7a5
user-api: small fix for the second poll in assignment
2012-08-03 19:15:14 +02:00
Oskar Hahn
8fcf65e829
user-api: make the assignments work with the new user-api
2012-08-03 18:56:00 +02:00
Oskar Hahn
c16d38d9a3
user-api: Load the User-List from UserFormField on any request
2012-08-03 16:25:04 +02:00
Oskar Hahn
1ae91d1130
changed user-api, so it can be filter the result for the prefix and the id
2012-08-03 14:23:13 +02:00
Oskar Hahn
4f61c763d7
started to rewrite the assignment-code for the new user-api
2012-08-03 13:49:05 +02:00
Oskar Hahn
93020f9ead
mark group to be teated as user
2012-08-03 12:44:34 +02:00
Oskar Hahn
4ffb701397
created new user-api
2012-08-03 00:11:53 +02:00
Oskar Hahn
e34f90aad1
update german translation
2012-07-28 11:09:00 +02:00
Oskar Hahn
47a40150e6
added " befor permitted.
...
This changes a translation string
2012-07-28 11:01:57 +02:00
Oskar Hahn
b2ce59080e
#332 use an specific name for the session cookie
2012-07-27 23:18:31 +02:00
Oskar Hahn
ecfeb170f3
we can not redirect from a poll, that does not exists to an assignment.
2012-07-27 22:49:38 +02:00
Oskar Hahn
9a87db61cc
#329 fix attribute error for anonymous users in the application view
2012-07-27 11:56:20 +02:00
Emanuel Schuetze
feb82bd531
Updated translation.
2012-07-25 23:21:30 +02:00
Emanuel Schuetze
8b39a4dfeb
Hide div container of tabledrag to eleminate space between table and number of items.
2012-07-25 21:37:20 +02:00
Emanuel Schuetze
5d367dd635
Prepared 1.2 release.
2012-07-25 14:10:55 +02:00
Emanuel Schuetze
172b90ea1b
#328 : Translated application status error message.
2012-07-24 07:32:20 +02:00
Emanuel Schuetze
0c0f3d09da
#328 : Show error message if application status is already set.
2012-07-23 23:17:03 +02:00
Emanuel Schuetze
1f3cfaf25a
Added ugettext_lazy for 403 error page.
2012-07-23 23:06:36 +02:00
Emanuel Schuetze
f3d656c98d
#325 : participant/passwords/print/ raises server-error
2012-07-23 23:03:42 +02:00
Emanuel Schuetze
f12d155651
Added linebreak.
2012-07-23 23:00:00 +02:00
Emanuel Schuetze
cdddc00d54
Improved else block.
2012-07-23 22:59:31 +02:00
Emanuel Schuetze
f36ad67bb9
Removed additional <hr> tag from custom slides widget.
2012-07-23 19:21:47 +02:00
Emanuel Schuetze
d58e8f4c84
Fixed filename of assignment poll pdf.
2012-07-23 12:58:46 +02:00
Emanuel Schuetze
bf5181e241
Fixed missing translation in PDF title and filename.
2012-07-23 12:57:47 +02:00
Emanuel Schuetze
219b1e936e
Fixed two PDF build errors.
2012-07-23 12:35:15 +02:00
Oskar Hahn
9d2a011958
update translation
2012-07-23 09:33:19 +02:00
Oskar Hahn
797396d94d
#322 remove the dot at the end of a assignment-model verbose-name
2012-07-23 09:30:34 +02:00
Emanuel Schuetze
0ce6627756
Fixed csv import error.
2012-07-23 08:55:05 +02:00
Norman Jäckel
e74e80299f
Fix application links in the widgets.
2012-07-23 00:41:44 +02:00
Oskar Hahn
fedfe802e3
#315 remove 'application' from agenda/widget.html, too
2012-07-20 13:26:45 +02:00
Oskar Hahn
93f9e2dc97
fix error in the translation of the participant-list
2012-07-20 11:40:36 +02:00
Oskar Hahn
8854f7f9ba
#319 sort participants by there last_name by default
2012-07-20 11:34:37 +02:00
Oskar Hahn
e1a2f18f74
#316 fix translation of the confirm message in the general config page
2012-07-20 11:31:28 +02:00
Oskar Hahn
e2d658b0d8
#321 change assignment string for the comment on the ballot paper
2012-07-20 11:24:34 +02:00
Oskar Hahn
ff4529d8eb
#315 remove application from agenda by appending a new methode get_application_title_supplement
2012-07-20 11:22:09 +02:00
Oskar Hahn
078125a1a2
update translation
2012-07-20 11:05:04 +02:00
Oskar Hahn
0c834532db
#317 change string for the automatic methode of choosind the right assignment-poll-methode
2012-07-20 10:59:34 +02:00
Oskar Hahn
469e93e21d
rm beamer.html from agenda. created by merging the 1.2-dev branch in the default branch
2012-07-20 10:55:57 +02:00
Oskar Hahn
ba783489f2
changle end of line to windows for some files
2012-07-20 10:55:07 +02:00
Emanuel Schuetze
189d0bf5e1
Merged.
2012-07-19 14:55:58 +02:00
Norman Jäckel
fd0f3d68fa
Fix typo in participant/views.py
2012-07-19 12:27:45 +02:00
Oskar Hahn
834c30321b
#310 Redirect to the password-change-page if the admin has not changed his password yet
2012-07-19 11:43:48 +02:00
Oskar Hahn
f928abd006
merge
2012-07-19 11:16:38 +02:00
Oskar Hahn
70b161c539
added name for participant app in __init__
...
removed some files, added though branch merge
2012-07-19 11:11:07 +02:00
Emanuel Schuetze
90905d3e53
Updated jquery from 1.7.1 to 1.7.2.
2012-07-19 08:45:48 +02:00
Emanuel Schuetze
7a9d475dae
Updated css property border-radius.
2012-07-19 08:37:41 +02:00
Emanuel Schuetze
c678b557fa
#311 : Updated first login message and translations.
2012-07-19 08:21:51 +02:00
Emanuel Schuetze
7ff3d1382d
#304 : Added link to projector-view for non-admins
2012-07-19 07:54:49 +02:00
Emanuel Schuetze
4fe77f89d3
Updated translations.
2012-07-18 21:15:12 +02:00
Emanuel Schuetze
9b3103d4a8
#284 : Updated i18n links and added gettext requirement note.
2012-07-18 20:44:02 +02:00
Oskar Hahn
8f4970e16c
merge 1.2-dev with default branch
2012-07-18 10:37:23 +00:00
Oskar Hahn
365f844164
update translation
2012-07-18 10:53:19 +02:00
Oskar Hahn
9b8517faeb
default value for the config value admin_password
2012-07-18 10:46:26 +02:00
Oskar Hahn
b327d41ee6
#306 show admin password if it hasn't changed
2012-07-18 10:46:07 +02:00
Emanuel Schuetze
db22ecfde8
Prepared 1.2-rc1 release.
2012-07-16 22:47:59 +02:00
Emanuel Schuetze
2a0e7ef2c4
Updated translation.
2012-07-16 22:37:59 +02:00
Emanuel Schuetze
0d3dcaf433
Merged.
2012-07-16 22:26:48 +02:00
Emanuel Schuetze
d428841735
Fixed translation.
2012-07-16 22:26:07 +02:00
Emanuel Schuetze
80d16a2852
Fixed missing error/condition ('candidate list already closed') for participants without manager permissions.
2012-07-16 22:21:23 +02:00
Oskar Hahn
fd6961234a
set DEBUG=False in default.settings.py
2012-07-16 18:13:53 +02:00
Oskar Hahn
76e52cf01a
#300 dont show votecast and voteinvalid symbols, if the vote has no votes
2012-07-16 14:29:30 +02:00
Oskar Hahn
4e5884bda4
#298 fix problem with a votecast of 0, -1 and -2
2012-07-16 14:10:56 +02:00
Oskar Hahn
07c4649243
#297 fix error in ApplicationPDF with changes in the poll API
2012-07-16 14:05:51 +02:00
Oskar Hahn
0b033271f8
fix some typos, mostly {%trans to {% trans
2012-07-16 14:00:29 +02:00
Norman Jäckel
5d5e7c10f5
Change strings in agenda overview and agenda widget concerning application items
2012-07-16 00:39:46 +02:00
Norman Jäckel
16e829a05d
Change application widget - Set number behind the title.
...
Fix wrong application title in the beamer template
2012-07-16 00:12:12 +02:00
Norman Jäckel
0279c07b15
Change design of application view and poll view (see #292 )
2012-07-16 00:01:26 +02:00
Norman Jäckel
bd9c609dc0
Change design of assignment poll view (see #292 )
2012-07-15 23:17:10 +02:00
Norman Jäckel
bee6fa7147
Set initial value for posts in assingment.
2012-07-15 22:46:20 +02:00
Oskar Hahn
84a78e8584
#290 fix unicode problem for python 2.5 in strftime
2012-07-14 09:19:45 +02:00
Oskar Hahn
a1152af7ea
#288 fix type error if a poll has no votecast
2012-07-14 08:48:25 +02:00
Emanuel Schuetze
e4250b6ba1
Some style fixes.
2012-07-13 16:04:00 +02:00
Emanuel Schuetze
c8eb4d26d9
#232 : Removed spaces from links via CSS.
2012-07-13 15:59:58 +02:00
Oskar Hahn
88cb44e0c3
#287 fix elected candidate in assignment-slide
2012-07-13 11:33:56 +02:00
Oskar Hahn
1b0a9b27ef
#294 harmonize the name of the passwort settings page.
2012-07-13 11:24:41 +02:00
Oskar Hahn
66b853a10a
redesign the poll api, so it don't creates poll-tables. Also, it is easier to get the poll for a vote object.
...
#288 show percent after the vote results
2012-07-13 11:16:06 +02:00
Emanuel Schuetze
969816be37
Use new close icon to keep old done icon.
2012-07-13 07:58:00 +02:00
Emanuel Schuetze
9c03726bef
#295 : Change link to button.
2012-07-13 07:44:42 +02:00
Emanuel Schuetze
b4ee5dfff4
#293 : Updated translation.
2012-07-13 07:34:15 +02:00
Norman Jäckel
e99e5ab290
Clean up browsertitles ( #282 ) in assignment and participant tab
2012-07-13 01:10:58 +02:00
Norman Jäckel
28d6fb54a7
Clean up browsertitles ( #282 ) in config projector
2012-07-13 00:47:53 +02:00
Norman Jäckel
32c80caa37
Clean up browsertitles ( #282 ) in agenda and application
2012-07-13 00:44:12 +02:00
Emanuel Schuetze
accb329a44
#232 : Removed spaces from links.
2012-07-12 17:24:37 +02:00
Emanuel Schuetze
ed7221e0f0
Changed to other 'done' icon to better defferentiate the projector activate icon.
...
Changed link help text.
2012-07-12 17:17:53 +02:00
Emanuel Schuetze
0c64309c91
Rename summary icon.
2012-07-12 17:11:33 +02:00
Emanuel Schuetze
531f0d9abb
Added link help text.
2012-07-12 17:02:59 +02:00
Emanuel Schuetze
7487cf1601
Set summary icon in agenda widget at the right side to other action
...
icons.
2012-07-12 16:57:23 +02:00
Oskar Hahn
e80b04504f
#194 fix password when importing users via csv
2012-07-12 14:37:01 +02:00
Oskar Hahn
cea2bbbf7d
update translation
2012-07-12 14:19:08 +02:00
Oskar Hahn
8cdcc95fd9
#286 import error in the agenda overview slide
2012-07-12 14:06:58 +02:00
Oskar Hahn
07a0d42577
#285 append tabs to password-change-view
2012-07-11 09:46:15 +02:00
Oskar Hahn
68215e78d6
add Licence for django-jsonfield
2012-07-11 09:45:48 +02:00
Oskar Hahn
aa130ab2da
cleanup openslides base files.
...
Do not manipulate the pythonpath anymore.
2012-07-10 14:00:51 +02:00
Oskar Hahn
5fcef8aba4
cleanup utils
2012-07-10 13:19:12 +02:00
Oskar Hahn
debaa505fb
fix problems with reportlab and ugettext_lazy
2012-07-10 12:11:07 +02:00
Oskar Hahn
e22467b06e
cleanup poll app
2012-07-10 11:48:03 +02:00
Oskar Hahn
01f0823ed7
cleanup the assignment app
2012-07-10 11:27:06 +02:00
Oskar Hahn
81fc7ae560
update translation
2012-07-10 02:53:49 +02:00
Oskar Hahn
85bddf6872
use "forname lastname" as default username, with a space
2012-07-10 02:50:42 +02:00
Oskar Hahn
96aca54f61
update user setting page
2012-07-10 02:46:00 +02:00
Oskar Hahn
403f8e7917
update translation
2012-07-10 02:21:27 +02:00
Norman Jäckel
25df1b8693
Deactivate the projector message overlay by default
2012-07-10 01:44:42 +02:00
Oskar Hahn
8d961f4940
fix translation by using ugettext_lazy
2012-07-10 01:33:03 +02:00
Oskar Hahn
333349a1f2
Only show voteresult-table where there is at least one published poll.
...
Also fix AssignmentPDF-Poll-Table
2012-07-10 00:47:00 +02:00
Andy Kittner
cd245e4605
Convert MEDIA_ROOT to unicode to avoid UnicodeWarning
2012-07-08 18:09:25 +02:00
Andy Kittner
5438b2c318
Add a workaround for django bug 18404 ( fixes #204 )
2012-07-08 18:09:23 +02:00
Oskar Hahn
f074cb5bfd
cleanup the imports of the application app
2012-07-08 09:21:39 +02:00
Oskar Hahn
8feb195067
fix typo
2012-07-08 09:01:01 +02:00
Oskar Hahn
dc9dabff6d
cleaned up the participant app. Sort of...
2012-07-07 15:26:00 +02:00
Oskar Hahn
e01d456e7b
clean up the config app. Use jsonfield to save the config values.
...
Syncdb necessary.
2012-07-07 14:48:21 +02:00
Oskar Hahn
15621b7702
clean up the projector App
2012-07-07 14:01:40 +02:00
Oskar Hahn
eb3adcd8ca
update translation
2012-07-07 11:20:30 +02:00
Oskar Hahn
f8a1c58fff
#277 throw an error, in the invalid-field or the votecast-field is lower -2
2012-07-07 11:14:04 +02:00
Oskar Hahn
1889cff68b
#276 fix unicode Error in html_string() function
2012-07-07 10:35:29 +02:00
Oskar Hahn
b0f561d429
realy fix lineend in assignment/view
2012-07-06 18:00:43 +02:00
Oskar Hahn
719d12e333
fix lineend in assignment/view.py
2012-07-06 17:56:17 +02:00
Norman Jäckel
e29cf868a5
Always hide Group in Assignment PDF vote_results-table
2012-07-06 15:37:22 +02:00
Norman Jäckel
e4367051df
Hide "Reason" in Application PDF if there is none.
2012-07-06 15:30:14 +02:00
Norman Jäckel
59e6218a80
First Draft for Assignment PDF with fixed vote_results table.
2012-07-06 15:02:31 +02:00
Norman Jäckel
c1e9540699
Fix #280
2012-07-05 01:15:04 +02:00
Norman Jäckel
812d7a3c83
Fix #275
2012-07-05 00:23:42 +02:00
Oskar Hahn
ff44439351
#266 fix assignment view on the projector
2012-07-04 16:14:19 +02:00
Oskar Hahn
ef5b9e3281
#253 don't show unpublished polls for nonmanager in assignment view
2012-07-04 16:05:31 +02:00
Oskar Hahn
47ff052c22
fix close and unclose link via ajax
2012-07-04 15:49:33 +02:00
Oskar Hahn
b8a77e5abe
rename passwort change page
2012-07-04 15:48:56 +02:00
Oskar Hahn
4e0f8670f1
update translation
2012-07-04 15:48:40 +02:00
Oskar Hahn
4eb4d2ee8d
use s for sec in projector-control
2012-07-04 15:47:52 +02:00
Oskar Hahn
67426f239b
only refresh the projector, if the content has changed
2012-07-04 15:00:08 +02:00
Oskar Hahn
7f2d10c9ca
fix hide-closed-item function for non-manager
2012-07-04 13:12:07 +02:00
Oskar Hahn
76d2a33fc2
merge
2012-07-04 12:52:09 +02:00
Oskar Hahn
29d25d30d6
cleanup the agenda app
2012-07-04 12:50:33 +02:00
Oskar Hahn
a72832842b
#267 fixt typo.
...
syncdb is required
2012-07-04 11:00:58 +02:00
Norman Jäckel
d654c268f7
Zusammenführen
2012-07-04 03:26:27 +02:00
Oskar Hahn
03fe1f84dd
clear overlay-message via ajax
2012-07-04 03:21:03 +02:00
Norman Jäckel
a149d5a6bc
Ticket #229
2012-07-04 03:19:42 +02:00
Oskar Hahn
ad8d5585f1
merge
2012-07-04 02:43:46 +02:00
Oskar Hahn
198eefbfdd
rewrote projector overlay widget
2012-07-04 02:43:26 +02:00
Norman Jäckel
40c2bf481f
Fix #240
2012-07-04 02:10:06 +02:00
Norman Jäckel
32a5b61da8
Insert type of an related item in the agenda widget as string behind the name
...
of the item
2012-07-04 00:55:37 +02:00
Norman Jäckel
ad02cb05ae
Draft for vote result table on assignment view and projector. Publishing still not working.
2012-07-04 00:40:25 +02:00
Oskar Hahn
2dc0cc83f1
rewrote assignment poll output
2012-07-03 00:05:48 +02:00
Oskar Hahn
a21a96026b
fix yes-no-abstain-poll in assigmnet-projector
2012-07-02 20:32:13 +02:00
Oskar Hahn
ebc81d9236
#255 fixed assignment-poll delete message
2012-07-01 17:38:34 +02:00
Oskar Hahn
8d4df3236b
#243 fixt but, which created a second version for a new application
2012-07-01 17:20:02 +02:00
Oskar Hahn
e1d13e31ae
#214 seperate page for password change
2012-07-01 16:56:01 +02:00
Norman Jäckel
68e26ff8c5
Fix #256
2012-07-01 16:48:44 +02:00
Norman Jäckel
acd9ba1fd1
Zusammenführen
2012-07-01 16:30:56 +02:00
Norman Jäckel
d22118ac72
Fix #252
2012-07-01 16:28:11 +02:00
Oskar Hahn
f903f350b8
insert item-summary link in the widget
2012-07-01 16:13:34 +02:00
Oskar Hahn
ff19e6d2c8
#247 summary of items for the projector
2012-07-01 16:10:26 +02:00
Oskar Hahn
00eb365b91
rewrote active_slide in generic view
...
also reordert some imports
2012-07-01 15:35:05 +02:00
Oskar Hahn
6c206fa740
#246 open activate slide view ajax
2012-07-01 11:07:04 +02:00
Oskar Hahn
ea4da31b0c
rewrite projector_edit view as class based view
2012-07-01 10:52:08 +02:00
Oskar Hahn
2ba1b7e3bc
rewrote countdown view as class based view
2012-07-01 10:44:41 +02:00
Oskar Hahn
0a269ce601
help_text for the application config page
2012-06-30 16:28:15 +02:00
Oskar Hahn
60570ea962
#245 update translation
2012-06-30 15:21:27 +02:00
Oskar Hahn
0f42dd06fd
#234 take 75 chars at maximum
2012-06-30 14:50:52 +02:00
Oskar Hahn
aeb8a40875
fix typo in trivial changes
2012-06-30 14:50:14 +02:00
Norman Jäckel
c19118e774
Fix #230
2012-06-30 14:17:15 +02:00
Oskar Hahn
35e112a7d7
update translation
2012-06-30 12:24:23 +02:00
Oskar Hahn
fe7266097f
#249 improve assignment PDF
2012-06-30 12:07:55 +02:00
Oskar Hahn
a48c63c132
#249 improve application pdf
2012-06-30 12:04:58 +02:00
Oskar Hahn
1b108603ea
#239 don't show supporters in the application PDF, if they are disabled
2012-06-30 11:57:07 +02:00
Oskar Hahn
039446a7ca
#239 don't show supporters in application edit form, if there are not needed
2012-06-30 11:50:46 +02:00
Oskar Hahn
018d53b3df
#236 , #244 make trivial_changes optional, and only in the edit form
2012-06-30 11:31:35 +02:00
Oskar Hahn
b9f783e9f1
#237 translate the related type
2012-06-30 11:06:32 +02:00
Oskar Hahn
e8e664b92e
#237 , #238 only show the first line of a comment in the agenda
2012-06-30 10:39:58 +02:00
Norman Jäckel
818a15aa2b
Cf. #249 but now for assignments.
2012-06-29 11:52:23 +02:00
Norman Jäckel
aa30a1900b
Short message on PDF if there are no applications ( #249 )
2012-06-29 11:42:28 +02:00
Norman Jäckel
cb2a4b9897
Application PDF: Fix #241 and insert version number
2012-06-29 11:22:47 +02:00
Oskar Hahn
09e6eec6f2
fix translation error in professional support
2012-06-29 00:38:34 +02:00
Oskar Hahn
587ce4093d
update translation
2012-06-29 00:27:27 +02:00
Oskar Hahn
6d3061f8af
cleaned poll pdf for assignment and application
2012-06-29 00:19:06 +02:00
Oskar Hahn
a00fe2b241
fix yesnoababstain in views.py
2012-06-28 22:49:02 +02:00
Oskar Hahn
4af19d091b
remove elected users from an election.
2012-06-28 20:12:49 +02:00
Oskar Hahn
2fdbad55f1
rename AssignmentPoll.yesnoababstain in .yesnoabstain
2012-06-28 20:11:16 +02:00
Oskar Hahn
eafff30c49
fixe error in reverse calls
2012-06-28 20:10:48 +02:00
Norman Jäckel
3156c8b4b5
Turn on Yes-No-Abstain Ballot for Assignments/Elections, #108
2012-06-28 18:45:00 +02:00
Norman Jäckel
59fb053283
Fix #260
2012-06-28 01:14:51 +02:00
Norman Jäckel
409bfda353
Fix #257
2012-06-27 23:29:06 +02:00
Oskar Hahn
5311c7ae31
fix problem by the assignment-poll view
2012-06-24 23:31:06 +02:00
Oskar Hahn
6c66e55fc0
show right label for posts in new assignments
2012-06-24 22:38:42 +02:00
Oskar Hahn
4339c3ae8a
allow to save an empty poll
2012-06-24 22:34:11 +02:00
Oskar Hahn
48c53d3cd0
link for creating an application agenda item in the sidebare
2012-06-24 22:21:46 +02:00
Oskar Hahn
3c04f6af82
translate poll options for assignments
2012-06-24 22:21:15 +02:00
Oskar Hahn
3e7e894d62
fix #250 don't allow assignments with not posts.
...
But for the future, see #251
2012-06-24 22:10:14 +02:00
Oskar Hahn
e9c680f5e1
update translation
2012-06-24 21:55:46 +02:00
Oskar Hahn
1a4e164dd2
refresh the projector only ones a second
2012-06-24 21:55:31 +02:00
Oskar Hahn
6a0bdb7aa2
the submitter of an application must not edit the application, after it was accepted
2012-06-24 21:52:21 +02:00
Oskar Hahn
391a10bb03
fix typo in frontpage_title
2012-06-23 15:42:25 +02:00
Oskar Hahn
b963b61385
update german translation
2012-06-23 15:36:02 +02:00
Oskar Hahn
7df1264abf
rearange the userprofile. Only show first line from the user.profile.comment in the overview
2012-06-23 15:02:13 +02:00
Oskar Hahn
442a24ccd8
#222 fix to small db collumns for assignment.status and config.value
...
db-reset necessary
2012-06-23 13:17:50 +02:00
Norman Jäckel
4edc4f503c
Edit Symbol in Application
2012-06-23 13:17:24 +02:00
Norman Jäckel
654388117b
#208 and other symbol things
2012-06-23 13:14:18 +02:00
Oskar Hahn
cc42792a38
#164 call a assignmentpoll by this ballot number
2012-06-23 12:43:18 +02:00
Oskar Hahn
ae8876425a
min value for polls is -2
2012-06-23 12:05:09 +02:00
Oskar Hahn
3d1e4f5489
#216 delete releated agenda-item, if the releated object (application or assignment) is deleted
2012-06-23 11:41:32 +02:00
Norman Jäckel
d110934f62
Insert title tag to Clean Message Button ( #219 )
2012-06-23 11:39:07 +02:00
Norman Jäckel
b1ed56176e
Edit and View Links and Symbols in Widgets fixed ( #206 )
2012-06-23 10:43:01 +02:00
Oskar Hahn
b12ae6b0a0
#191 Create assignment-agenda Items
2012-06-23 10:27:58 +02:00
Oskar Hahn
f13ee5f409
make application tests run again
2012-06-19 10:50:55 +02:00
Norman Jäckel
a439794874
Insert Edit Symbol (Ticket 207)
2012-06-23 09:32:21 +02:00
Oskar Hahn
b6cb4223f2
#217 show agenda text again.
2012-06-19 10:19:43 +02:00
Oskar Hahn
e8bf2fce1a
yes-no-abstain elections in assignments
2012-06-18 09:48:27 +02:00
Oskar Hahn
bf46342d17
#205 show Application number in projector Tab
2012-06-11 14:22:09 +02:00
Oskar Hahn
239f328372
rewrote projector-widget system
2012-06-11 13:43:48 +02:00
Oskar Hahn
960543b64e
load all models in projector.views
2012-06-10 10:43:50 +02:00
Oskar Hahn
53dd1687ca
fixed last commit
2012-06-10 10:11:38 +02:00
Oskar Hahn
cdef473491
fixe last commit
2012-06-10 10:08:04 +02:00
Oskar Hahn
bb816e0999
load config on each request
2012-06-09 19:39:52 +02:00
Emanuel Schuetze
2ce9815218
Prepared 1.2-beta3 release.
2012-06-06 16:40:05 +02:00
Emanuel Schuetze
a2e1b77bd6
#213 fixed (User settings form - remove User groups and active
...
fields).
2012-06-06 14:28:37 +02:00
Emanuel Schuetze
07a682c436
Set is_active for new participants to True.
2012-06-06 13:59:46 +02:00
Emanuel Schuetze
a6c220ca02
Reverted wrong testing code (for participants) from last commit.
2012-06-06 13:51:54 +02:00
Emanuel Schuetze
d8cd0c2b6a
Renamed logo files (typo).
2012-06-04 10:17:56 +02:00
Oskar Hahn
43e30057b3
delete item, not application by releated agenda-items
2012-06-03 10:19:08 +02:00
Oskar Hahn
2e498403cb
#167 fallback slide, if the slide does not exist
2012-06-03 09:43:28 +02:00
Oskar Hahn
965b682abc
edit, delete, slide for releated item in agenda
2012-06-03 09:35:26 +02:00
Oskar Hahn
79893687f3
fixed error by activating a message, if it was only on a specific slide.
2012-06-03 09:05:12 +02:00
Andy Kittner
7e7ab210ab
Set system url on first run ( #211 )
2012-05-31 00:27:47 +02:00
Andy Kittner
29057b8b87
Fix exceptions if project path contains non-utf8 characters ( #204 )
...
Django converts byte strings in various places to unicode by decoding them from
utf-8, which will break if the filesystem encoding uses something else
(e.g. fileystem encoding is latin1 and the path contains german umlauts).
Avoid these problems by explicitly decoding all paths to unicode using an
appropriate encoding.
2012-05-30 23:30:24 +02:00
Emanuel Schuetze
8cdc062628
Set version number back to dev mercurial revision
2012-05-25 09:34:50 +02:00
Emanuel Schuetze
f7eab29ed5
Fixed missing translation in poll_view assignment template (table head).
2012-05-23 14:31:12 +02:00
Emanuel Schuetze
0ab900cb7a
Fixed missing permission of agenda submenu.
2012-05-23 14:30:42 +02:00
Emanuel Schuetze
279dade5c4
Fixed missing SITE_ROOT import.
2012-05-23 14:30:06 +02:00
Emanuel Schuetze
44c4fffc25
Added missing default TIME_ZONE in default.settings.py.
2012-05-23 14:29:11 +02:00
Emanuel Schuetze
0acf6734e9
Updated translations.
2012-05-21 22:02:55 +02:00
Emanuel Schuetze
7933dd2d5c
Minor fixes.
2012-05-21 22:01:09 +02:00
Emanuel Schuetze
58fc689f14
Updated overlay message style in projector template.
2012-05-21 09:21:36 +02:00
Emanuel Schuetze
a737ef7300
Prepared 1.2-beta2 release.
2012-05-21 08:16:40 +02:00
Andy Kittner
0007a1dfa8
Add log messages when poll is updated/deleted ( #187 )
2012-05-20 23:12:50 +02:00
Emanuel Schuetze
37619b0a80
#114 : Set participants tab inactive if usersettings page is active
2012-05-20 22:34:41 +02:00
Emanuel Schuetze
f8137da055
#203 : Fixed highlighting more than one active line.
2012-05-20 22:20:17 +02:00
Emanuel Schuetze
5eb29ba9dd
Fixed width of countdown input field.
2012-05-20 22:06:07 +02:00
Emanuel Schuetze
5581ed1222
#168 : Improved countdown control buttons.
2012-05-20 22:01:44 +02:00
Emanuel Schuetze
92a64d38cf
Add projector view link on front page. Fixed column for can_manage_projector permission.
2012-05-20 20:51:11 +02:00
Emanuel Schuetze
4389f5f548
#89 : Added missing control_customslide.html template.
2012-05-20 20:15:49 +02:00
Emanuel Schuetze
c4450bf14e
Updated translations.
2012-05-20 20:02:48 +02:00
Emanuel Schuetze
97bea50b03
Use single url for toggle publish/unpublish election ballots.
2012-05-20 20:02:36 +02:00
Emanuel Schuetze
9b6640c2ae
Removed unused link var.
2012-05-20 19:44:29 +02:00
Emanuel Schuetze
406a2d18e3
Fixed can_manage_projector permission.
2012-05-20 19:43:38 +02:00
Emanuel Schuetze
189c975137
Use same url to toggle participant status.
2012-05-19 19:22:20 +02:00
Emanuel Schuetze
3a52cd56c6
#165 : Use AJAX instead of page reload to publish assignment polls
2012-05-19 16:25:55 +02:00
Andy Kittner
fbc603b748
Fix initial value for pollform is value is a "special" value ( #135 )
2012-05-19 14:19:32 +02:00
Andy Kittner
182f20308b
Fix exception in polls with special values (fallout from translation fix)
2012-05-19 13:41:30 +02:00
Andy Kittner
e005863336
Changed/ added logmessages for applications ( #184 , #187 )
...
- Added a logmessage when a version is accepted/ rejected
- Made logmessage for trivial changes more explicit and include
the names of the changed fields
- Updated translations
2012-05-19 12:46:54 +02:00
Andy Kittner
5aead54a0c
Improve error message for failed logins ( #199 )
...
While #199 was already closed I think passing on the original
error message is more userfriendly as it gives more details
what the actual error was (generates specific messages for
user inactive and disabled cookies)
2012-05-19 10:48:29 +02:00
Andy Kittner
d3cf5c9311
Correctly handle first time passwords ( #194 )
...
- Save User object after setting the password
- Only generate first time password if none was explicitly specified
2012-05-19 10:33:59 +02:00
Emanuel Schuetze
3f4119f182
#199 : Changed login error message. Updated translation.
2012-05-19 08:44:46 +02:00
Emanuel Schuetze
23fb97c7a2
#170 : Use second submenu for agenda items.
2012-05-19 08:26:59 +02:00
Emanuel Schuetze
188fe4cce5
Fixed missing check for activeline in assignment overview.
2012-05-19 08:15:20 +02:00
Emanuel Schuetze
07c587a025
#186 : Fixed published polls/ballot column on projector template.
2012-05-19 08:09:18 +02:00
Emanuel Schuetze
2dc156ef74
Automated merge with ssh://openslides.org/openslides
2012-05-18 23:25:51 +02:00
Emanuel Schuetze
f2a93c4505
#89 : Delete custom slides.
2012-05-18 23:24:54 +02:00
Emanuel Schuetze
90787b2597
#89 : Edit custom slides.
2012-05-18 23:07:09 +02:00
Andy Kittner
3f722d3b27
Add --insecure to runserver args in order to always server static files
...
See: https://docs.djangoproject.com/en/1.4/ref/contrib/staticfiles/
2012-05-18 22:34:59 +02:00
Emanuel Schuetze
ebe5381439
Automated merge with ssh://openslides.org/openslides
2012-05-18 19:38:26 +02:00
Emanuel Schuetze
b81469703b
#198 : Optimized submenu of application and assignment.
2012-05-18 19:38:21 +02:00
Emanuel Schuetze
c99deb8a2a
Increase max_length of agenda title field.
2012-05-18 10:24:43 +02:00
Emanuel Schuetze
8ec3099620
#197 : Rename the default User Group "Delegierte" to "Delegierter"
2012-05-17 22:03:48 +02:00
Emanuel Schuetze
4cef2762fe
Fixed style in empty agenda overview table.
2012-05-17 21:38:37 +02:00
Emanuel Schuetze
0351627234
Fixed title in assignment projector template.
2012-05-17 21:36:18 +02:00
Emanuel Schuetze
ca2900e9d1
#195 : Fixed unicode string in pdf header.
2012-05-17 21:34:19 +02:00
Emanuel Schuetze
92562aef28
#188 : Fixed projector template style error.
2012-05-15 20:36:49 +02:00
Andy Kittner
298cefcb45
Fix error when creating new applications (introduced by translation fix)
2012-05-15 20:10:54 +02:00
Emanuel Schuetze
61fe84a780
Removed LANGUAGE_CODE and TIME_ZONE from default.settings.py. LANGUAGE_CODE no longer required after fix of rev615.
2012-05-15 19:51:40 +02:00
Andy Kittner
3815ef26af
Fix wrong translations in forms/ models
...
Converted utils.translation_ex.ugettext to use ugettext_lazy and changed
forms modules to import ugettext from there (models where already importing
it from there)
2012-05-15 01:08:08 +02:00
Emanuel Schuetze
c19025ceb3
#190 : Fixed typo in translation.
2012-05-14 23:10:17 +02:00
Emanuel Schuetze
3324ce6131
Removed help text of active form field by overriding.
2012-05-14 23:07:24 +02:00
Emanuel Schuetze
1d6a0bee4e
#174 : Change form field 'groups' to 'user groups'.
2012-05-14 23:04:00 +02:00
Emanuel Schuetze
31ae7c38c9
#192 : i18n-de: Beamer -> Projektor
2012-05-14 22:16:13 +02:00
Emanuel Schuetze
304013649b
Changed default event description. Updated tranlsations.
2012-05-14 22:08:40 +02:00
Emanuel Schuetze
bc9765230c
#185 : Wrong permission to print assignments.
2012-05-14 22:02:45 +02:00
Emanuel Schuetze
bb5fcf4d6d
#183 : Wrong permission to print application.
2012-05-14 22:00:22 +02:00
Emanuel Schuetze
114b719cad
Added comment column in agenda overview.
2012-05-14 21:55:36 +02:00
Emanuel Schuetze
fbf2256493
#182 : Wrong permission for edit button in view template.
2012-05-14 21:55:02 +02:00
Emanuel Schuetze
d8807ba979
#180 : Ballot description. Fixed ballot number function.
2012-05-14 21:34:46 +02:00
Emanuel Schuetze
911b7ebac8
Changed po file header.
2012-05-11 07:38:56 +02:00
Emanuel Schuetze
b65e21e08f
#100 : Fixed wrong permissions.
2012-04-30 08:50:35 +02:00
Emanuel Schuetze
eb7672074e
Some more style work for application projector template.
2012-04-30 08:30:04 +02:00
Emanuel Schuetze
e28c15eff9
Improve projector style of application voting results.
2012-04-30 08:23:50 +02:00
Emanuel Schuetze
3faa91f5a4
Updated translation.
2012-04-30 08:23:06 +02:00
Emanuel Schuetze
1089e61011
Modified support help text.
2012-04-29 21:58:16 +02:00
Emanuel Schuetze
8bdd57cada
Prepare 1.2-beta1 release.
2012-04-29 21:43:21 +02:00
Emanuel Schuetze
616a34e8a9
Changed style: td:hover to tr:hover.
2012-04-29 21:32:29 +02:00
Emanuel Schuetze
412e672ea1
Set default language for model/form translation strings. Have to changed for English installation!
...
(Template strings are translated automatically by selected browser language)
2012-04-29 21:17:15 +02:00
Emanuel Schuetze
8c8a3e9fc2
Updated translations.
2012-04-29 20:48:10 +02:00
Emanuel Schuetze
3a0d243a6c
Added agenda 'edit' button in view template.
2012-04-29 20:47:54 +02:00
Emanuel Schuetze
2186561b6e
Removed LANGUAGE_CODE ('de') because django uses language selected by browser. Default language is 'en'.
2012-04-29 19:33:57 +02:00
Emanuel Schuetze
79605531c5
Some minor style fixes for poll view templates.
2012-04-29 19:12:18 +02:00
Emanuel Schuetze
905d9d546c
Fixe pdf icon path.
2012-04-29 19:01:18 +02:00
Emanuel Schuetze
e1799b4c83
#155 : remove header/footer in first-password-pdf
2012-04-29 18:58:51 +02:00
Emanuel Schuetze
4e8e9b5407
#155 : Remove header/footer in frameless PDF.
2012-04-29 18:54:42 +02:00
Emanuel Schuetze
dd10a59533
#109 : New second submneu for election view.
2012-04-28 23:10:19 +02:00
Emanuel Schuetze
7eaf9899f6
Minor code comment changes.
2012-04-28 22:32:33 +02:00
Emanuel Schuetze
64eed5ff22
#90 : Projector control: Save portlet state in session.
2012-04-28 22:31:30 +02:00
René Köcher
842e8de065
#160 : Wrong scaling of projector live view in IE8/Konqueror
...
IE8 has a scaling bug - check the browser version and resize the iframe 4x bigger if needed..
2012-04-28 09:38:31 +02:00
René Köcher
4f98c0c571
#163 : Sorting by title or creation time returns one entry for each version of an application
2012-04-28 08:45:11 +02:00
Andy Kittner
7b8f882f0d
Fallback to localhost if IP of current hostname can't be determined
2012-04-27 22:54:20 +02:00
Emanuel Schuetze
2c2a99d738
Automated merge with ssh://openslides.org/openslides
2012-04-27 22:47:47 +02:00
Emanuel Schuetze
1a4a748e6c
#112 : Use monotype for printing first time password
2012-04-27 22:47:41 +02:00
René Köcher
537571ec69
#100 Delete applications by admin/superuser only: part2
2012-04-27 22:46:27 +02:00
Emanuel Schuetze
59c342ba8d
#158 : Move 'change tree' notification to correct position (above page title).
2012-04-27 21:53:50 +02:00
Emanuel Schuetze
20ce7579ce
#158 : Added from_invalid error notification for ItemCreate/Update.
2012-04-27 21:40:42 +02:00
Emanuel Schuetze
822264ef7b
#158 : Added success notification for ItemCreate/ItemUpdate View.
2012-04-27 21:36:12 +02:00
René Köcher
81bc19730b
#100 Delete applications by admin/superuser only: part1
2012-04-27 21:22:44 +02:00
Emanuel Schuetze
710882c28a
#96 Countdown: Improve control icons
2012-04-27 17:42:05 +02:00
Emanuel Schuetze
8ed8ca0c58
Automated merge with ssh://openslides.org/openslides
2012-04-27 08:04:53 +02:00
Emanuel Schuetze
f97529518e
Updated translations.
2012-04-27 08:04:16 +02:00
Emanuel Schuetze
804c3da59a
Updated tranlation string.
2012-04-27 08:02:01 +02:00
René Köcher
030ff09ec0
#97 : (Aftermath)
...
Quick cross-browser fix: remove the spin-buttons and use input type=number.
If your browser is HTML5 it should show a spin box, otherwise the fallback
(type=text) will work equally well.
2012-04-27 07:59:23 +02:00
René Köcher
7f54331d0c
Merge r559..
2012-04-27 07:52:53 +02:00
René Köcher
c3c7228ab9
#159 Countdown reset should change 'pause' back to 'play'.
2012-04-27 07:51:42 +02:00
René Köcher
c0b78f52ea
Backout changeset 3dafb78cc57f4ce55b8e4517eb48fd9e9e744e2d
2012-04-27 07:50:20 +02:00
René Köcher
f45eb68fb4
#159 Countdown reset should change 'pause' back to 'play'.
2012-04-27 07:46:47 +02:00
Andy Kittner
8da2f0f041
Fix start script broken by r550
...
Defer importing modules that require the DJANGO_SETTINGS_MODULE
to be available until prepare_openslides() had a chance to set
everything up.
2012-04-27 01:09:12 +02:00
Emanuel Schuetze
3bcf4fd9c3
Added missing 'required' helptext to all forms.
2012-04-26 17:50:46 +02:00
René Köcher
7b7f43b04a
#97 : Countdown: move countdown config input field from config tab to portlet
2012-04-26 12:43:35 +02:00
Emanuel Schuetze
aac48a0b02
Redesign overlays.
2012-04-26 08:52:20 +02:00
Emanuel Schuetze
8a4163b019
Fixed scroll bug in base.css.
2012-04-25 23:07:54 +02:00
Emanuel Schuetze
b0d64c2bcc
Updated jquery ui style.
2012-04-25 22:59:49 +02:00
Emanuel Schuetze
9b6b969f8a
Added missing license header (for js and css).
2012-04-25 22:48:27 +02:00
Emanuel Schuetze
7ef298881d
Updated license header.
2012-04-25 22:29:19 +02:00
Andy Kittner
dda3078fe0
Detect if the database was deleted and run syncdb if necessary ( fixes #156 )
2012-04-25 19:37:51 +02:00
René Köcher
053021a08f
#XX Countdown: Only show valid controls for the active countdown
...
When clicking on 'play' the button will morph into 'stop' and vice-versa.
This is persistent across clients e.g. when A starts the countdown and
then B opens the control page B will see a pause button.
(Updates for all but the local client happen only on page reload)
2012-04-25 18:45:02 +02:00
René Köcher
07b5614fac
#94 Countdown: support for pause/resume / #95 Countdown: show correct time format as mm:ss
2012-04-25 17:17:24 +02:00
Emanuel Schuetze
3cb7417028
Minor CSS fixes.
2012-04-25 09:18:10 +02:00
Emanuel Schuetze
719ea6ec79
#93 : Show application number in header of projector template.
...
Some more projetor style work.
2012-04-24 22:27:16 +02:00
Emanuel Schuetze
20f17d6235
Fixed untranslateable model string.
2012-04-23 22:17:45 +02:00
Emanuel Schuetze
dc863cc3b9
Added custom slides portlet.
2012-04-23 22:07:52 +02:00
Emanuel Schuetze
3d0fe9b565
Updated translations.
2012-04-23 22:07:34 +02:00
Emanuel Schuetze
cfcd2d10d7
Fixed wrong icon filename.
2012-04-23 21:48:20 +02:00
Emanuel Schuetze
d56dcba7d4
#119 : Adjusted icon filenames.
2012-04-23 21:27:22 +02:00
Emanuel Schuetze
81a0c9661e
#119 : Adjusted some icon filenames.
2012-04-23 08:07:21 +02:00
Emanuel Schuetze
61b9d476ab
Set default config values.
2012-04-22 16:55:16 +02:00
Emanuel Schuetze
1b8c1eda91
Updated translations.
2012-04-22 16:51:22 +02:00
Emanuel Schuetze
039bd4121c
Some assignment poll template fixes.
2012-04-21 22:27:11 +02:00
Emanuel Schuetze
99bfd7257b
#120 : Add CSS class for helptext in forms.
2012-04-21 22:23:46 +02:00
Emanuel Schuetze
61d4d1ca2f
#136 : Fixed missing polls in projector view
2012-04-21 21:38:59 +02:00
Emanuel Schuetze
5f3c6c4821
#111 : Move pdf creation code from utils to participant app.
2012-04-20 23:23:50 +02:00
Emanuel Schuetze
f1908bca89
Fixed permissions for action columns.
2012-04-20 22:58:57 +02:00
Emanuel Schuetze
f711f96265
#107 : New actions column for elections.
2012-04-20 22:58:34 +02:00
Emanuel Schuetze
667582cdfb
#106 : add pdf link to actions column
2012-04-20 22:47:44 +02:00
Emanuel Schuetze
3886449b2c
#106 : Action column for applications.
...
#121 (partly): Activate links for agenda and applications table.
2012-04-20 22:43:12 +02:00
Emanuel Schuetze
6125f1d88b
Minor javascript fix.
2012-04-20 22:41:57 +02:00
Emanuel Schuetze
ccc1d2b707
#104 : Updated second submneu for application.
2012-04-20 22:13:47 +02:00
Emanuel Schuetze
7a6eaf2660
Fixed building AssignmentPollPDF.
2012-04-20 14:33:40 +02:00
Emanuel Schuetze
f393789f2d
Show min. 1 application ballot.
2012-04-20 13:41:09 +02:00
Emanuel Schuetze
4ecff16aba
copyright 2011 -> 2012.
2012-04-20 12:44:45 +02:00
Emanuel Schuetze
42a2e44390
Updated translations.
2012-04-20 11:15:15 +02:00
Emanuel Schuetze
ae5efcfa9d
Some minor fixes for agenda, application, participant overview table.
2012-04-20 08:14:23 +02:00
Oskar Hahn
4e904c7356
now it is possible to create a item, witch is realted to another object, for example an application.
2012-04-19 12:46:04 +02:00
Oskar Hahn
e23c195388
show application title in presentation view
2012-04-19 11:10:36 +02:00
Oskar Hahn
74c704641c
fixed yes, no, abstain values in the presentation View of an Application
2012-04-19 11:08:22 +02:00
Oskar Hahn
1d285a1c15
remove print
2012-04-18 23:36:52 +02:00
Emanuel Schuetze
9849140d2e
Remove submenu from static slides.
2012-04-18 22:06:41 +02:00
Emanuel Schuetze
6be853f202
Removed default font from jquery-ui css.
2012-04-18 22:06:18 +02:00
Emanuel Schuetze
236bbfd3bc
Automated merge with ssh://openslides.org/openslides
2012-04-18 22:01:06 +02:00
Emanuel Schuetze
4adb221a9d
#92 : Projector control: Add projector preview icon for all entries.
2012-04-18 22:00:58 +02:00
Oskar Hahn
59225bf822
added default get_filename for PDFView
2012-04-18 20:57:44 +02:00
Oskar Hahn
07e9d8e9f9
rewrote application filters
2012-04-18 19:57:39 +02:00
Emanuel Schuetze
a35e1917a4
Removed unused icons.
2012-04-18 19:52:37 +02:00
Emanuel Schuetze
7eb410f093
#104 : Application submenu.
2012-04-18 19:50:51 +02:00
Emanuel Schuetze
ee4d7da04a
#105 : Show Ballot number for applications. Some application PDF work. Set default config values.
2012-04-18 19:30:32 +02:00
Oskar Hahn
9f70b2ff1c
rename ballout def in application and assignment
2012-04-18 19:02:41 +02:00
Oskar Hahn
a77038fbf4
removed some old countdown code, defined some default values
2012-04-18 18:55:33 +02:00
Emanuel Schuetze
4b2211d59f
Automated merge with ssh://openslides.org/openslides
2012-04-18 18:54:52 +02:00
Emanuel Schuetze
3812b5ebd1
#103 : Set application filename.
2012-04-18 18:54:48 +02:00
Oskar Hahn
23df763b1f
fix message issus: #134 , also defined some default config-values
2012-04-18 18:35:02 +02:00
Emanuel Schuetze
67db762575
Automated merge with ssh://openslides.org/openslides
2012-04-18 18:29:34 +02:00
Emanuel Schuetze
4ce8facd1a
#98 : Add new filter for active/inactive items.
2012-04-18 18:29:31 +02:00
Oskar Hahn
0dde1738cf
fixed active line #88
2012-04-18 18:07:24 +02:00
Oskar Hahn
e9e9fa54b2
fixed problem with deleting the default permissions
2012-04-18 16:57:33 +02:00
Oskar Hahn
49e2f73df4
#92 preview for slides
2012-04-18 15:47:51 +02:00
Oskar Hahn
6798050ded
added help_message
2012-04-18 15:04:16 +02:00
Oskar Hahn
67384d0644
indent items in control view
2012-04-18 14:53:19 +02:00
Andy Kittner
aa54ac6d7d
Fix settings.py creation on python-2.5 ( Closes #133 )
...
dir() was not overrideable on python2.5 so it doesn't trigger an import
of the real settings module. Use getattr() instead, this works accross all
versions.
2012-04-18 16:41:12 +02:00
Oskar Hahn
fbaa88c23a
#99 fixed problem with agenda-items and mptt
2012-04-18 14:36:03 +02:00
Oskar Hahn
be6a63e48c
show version from plugins
2012-04-18 09:33:09 +02:00
Emanuel Schuetze
040b5ffb45
Fixed #125 : Assignment PDF: Invalid votes and votes cast doesn't support special values '-1' and '-2'.
2012-04-17 21:16:55 +02:00
Oskar Hahn
a3d7cc98a9
#110 error in application pdf printing
2012-04-17 17:47:37 +02:00
Oskar Hahn
189cfa1309
translate poll values
2012-04-17 17:35:50 +02:00
Oskar Hahn
0a8d40e2ac
slideUp read messages
2012-04-17 14:45:25 +02:00
Oskar Hahn
56f1a15cac
added function to set messages in JavaScript
2012-04-17 13:41:43 +02:00
Oskar Hahn
6aa241b268
fixed error in get_active_slide()
2012-04-17 12:07:32 +02:00
Emanuel Schuetze
131d84bee4
Reduced custom jquery.ui to minimum (ui core, widget, mouse and sortable).
...
Changed jquery.ui style to humanity.
Some layout things in control template.
2012-04-17 09:13:02 +02:00
Oskar Hahn
da8c3c0bba
show pollresults in application projector
2012-04-16 17:21:41 +02:00
Oskar Hahn
03792c0b05
put projector message in the center of the presentation
2012-04-16 17:14:39 +02:00
Oskar Hahn
7d16717ca8
clean button for message
2012-04-16 16:38:47 +02:00
Oskar Hahn
534a81c46c
rewrote projector_messages system. Recalled it projector_overlay and added a special overlay for unique messages
2012-04-16 16:35:30 +02:00
Oskar Hahn
3bceca2359
use plugin.NAME for submenu-title in config-tab
2012-04-16 11:36:50 +02:00
Oskar Hahn
80c5bfbba9
translation in JS-files
2012-04-16 11:12:21 +02:00
Oskar Hahn
c1cd0a2805
send class, not object, for template_manipulation
2012-04-16 11:11:45 +02:00
Emanuel Schuetze
81f4a8c5d5
Automated merge with ssh://openslides.org/openslides
2012-04-15 16:13:32 +02:00
Emanuel Schuetze
84731a07d5
Updated application view submenu.
2012-04-15 16:13:26 +02:00
Andy Kittner
beaa3e341a
Create portable win32 binary distribution
2012-04-15 16:04:08 +02:00
Oskar Hahn
92305bf363
use item for item sid
2012-04-15 16:02:13 +02:00
Oskar Hahn
d2d3725eb6
fix agenda.test
2012-04-15 16:00:25 +02:00
Emanuel Schuetze
bc31a2df1a
Automated merge with ssh://openslides.org/openslides
2012-04-15 15:53:10 +02:00
Emanuel Schuetze
f44f2723dc
Added link to activate agenda item in overview table.
2012-04-15 15:53:05 +02:00
Oskar Hahn
90038c1ad2
fix error by activating the Agenda
2012-04-15 15:46:32 +02:00
Emanuel Schuetze
8b7fdc7a5c
Automated merge with ssh://openslides.org/openslides
2012-04-15 15:21:23 +02:00
Emanuel Schuetze
4967b2b358
New agenda view template.
2012-04-15 15:21:19 +02:00
Oskar Hahn
a3808c7b30
fixed problem in assignment poll
2012-04-15 14:58:05 +02:00
René Köcher
b620c0afb7
Add 'zoom' css attribute if we detect MSIE.
2012-04-15 14:51:50 +02:00
Emanuel Schuetze
da9861b9f7
Automated merge with ssh://openslides.org/openslides
2012-04-15 14:28:34 +02:00
Emanuel Schuetze
0657ff340d
Show clickable done action in first column in agenda overview.
2012-04-15 14:28:01 +02:00
René Köcher
82d4a2de4b
Try to get a working beamer preview for more browsers.
2012-04-15 14:27:27 +02:00
Emanuel Schuetze
ddeaea88c4
Moved agenda pdf link to submenu.
2012-04-15 14:16:00 +02:00
Emanuel Schuetze
abf7721f3f
Filled frontpage with config values.
2012-04-15 13:26:01 +02:00
Oskar Hahn
91c9e1e9ab
some fixes
2012-04-15 13:10:24 +02:00
Oskar Hahn
6f0fd91ec2
some permission problems
2012-04-15 12:52:59 +02:00
Oskar Hahn
ae5c6b84a8
fixed webkit error be disable a button
2012-04-15 12:40:35 +02:00
Emanuel Schuetze
4d7940cb12
Automated merge with ssh://openslides.org/openslides
2012-04-15 12:39:35 +02:00
Emanuel Schuetze
95d5929449
Added participant and version config page. Moved system settings to general. Some style work.
2012-04-15 12:39:28 +02:00
Oskar Hahn
d4d91c8194
fixed printing applications
2012-04-15 12:11:03 +02:00
Oskar Hahn
f4ed79b68d
Application view: added link to edit a poll
2012-04-15 11:48:31 +02:00
Oskar Hahn
bf5ae10552
remove Application.poll. projector slide
2012-04-15 11:39:38 +02:00
Oskar Hahn
5678d9dd5e
deactivate supporters by default
2012-04-15 11:35:06 +02:00
Oskar Hahn
a46e96841b
remove AgendaSummary
2012-04-15 11:33:26 +02:00
Oskar Hahn
1d5455f8f9
frontpage
2012-04-15 11:24:40 +02:00
René Köcher
82993e3da8
Allow clicking on the beamer preview to open the real beamer view.
2012-04-15 10:44:15 +02:00
Emanuel Schuetze
195ddddf7e
Automated merge with ssh://openslides.org/openslides
2012-04-15 10:36:51 +02:00
Emanuel Schuetze
c07c2ac853
Print openslides version number in separat config template.
2012-04-15 10:36:37 +02:00
Oskar Hahn
3222e75ab5
debounds from buttons
2012-04-15 10:30:34 +02:00
Emanuel Schuetze
5f2c778880
Automated merge with ssh://openslides.org/openslides
2012-04-15 10:10:35 +02:00
Oskar Hahn
48558504c4
only ask to delete children from agenda-items, if there are some
2012-04-15 10:08:10 +02:00
Emanuel Schuetze
b1c86d4c19
Import template pages: Link to wiki page.
2012-04-15 10:07:45 +02:00
Oskar Hahn
e752ddf3ee
fixe error with tabs in DetailView
2012-04-15 10:02:53 +02:00
Oskar Hahn
361bc40821
view for Agenda.item
2012-04-15 09:55:21 +02:00
Emanuel Schuetze
8149686a04
Updated German translation from "Benutzergruppe" to "Benutzerrolle". Some translation fixes.
2012-04-15 09:48:01 +02:00
Oskar Hahn
785bd7c9a4
rename agenda.item.transcript in agenda.item.comment for Version 1.2
2012-04-15 09:41:17 +02:00
Emanuel Schuetze
36ca264931
Remove superuser function.
2012-04-15 09:35:51 +02:00
Emanuel Schuetze
bd3bf9fb6f
Updated translation.
2012-04-15 09:27:57 +02:00
René Köcher
e9ad4de11f
Minor template fix..
2012-04-14 22:45:33 +02:00
René Köcher
aef2a08666
Minor template fixes.
2012-04-14 22:41:02 +02:00
Oskar Hahn
500b418f91
Automated merge with ssh://openslides.de/openslides
2012-04-14 20:10:56 +02:00
Oskar Hahn
3a849880fb
code for control view in apps
2012-04-14 20:10:49 +02:00
Emanuel Schuetze
6df95a23f6
Updated translations.
2012-04-14 19:33:50 +02:00
Emanuel Schuetze
df7883deeb
Merged.
2012-04-14 19:18:36 +02:00
Emanuel Schuetze
09d2c3112d
Minor fixes.
2012-04-14 19:14:51 +02:00
René Köcher
07f81f56f5
Use natural_keys for initial_data.json / fix auto selected permissions in group editor (lost in 409).
2012-04-14 18:53:18 +02:00
Emanuel Schuetze
41899c02f4
Enlarged permissions select field.
2012-04-14 18:41:04 +02:00
Emanuel Schuetze
a73b548032
Minor changes.
2012-04-14 18:13:55 +02:00
Emanuel Schuetze
50df804010
Automated merge with ssh://openslides.org/openslides
2012-04-14 17:50:48 +02:00
Emanuel Schuetze
ad1e87cd99
Some style work. Move countdown to message portlet.
2012-04-14 17:50:31 +02:00
Oskar Hahn
d94baf9760
Automated merge with ssh://openslides.de/openslides
2012-04-14 17:09:23 +02:00
Oskar Hahn
92d2b1db60
ballot methode for AssignmentPoll and ApplicationPoll
2012-04-14 17:09:15 +02:00
Emanuel Schuetze
fc5b738b87
Automated merge with ssh://openslides.org/openslides
2012-04-14 16:17:30 +02:00
Emanuel Schuetze
3ba6f9c26d
Projector control: Moved MessagesView to ControlView. Removed messages template.
2012-04-14 16:17:26 +02:00
Oskar Hahn
75b9d6c63d
set message id in JS
2012-04-14 16:01:36 +02:00
René Köcher
7e56911aca
Ich will meine Anführungszeichen zurück!!!
2012-04-14 15:00:24 +02:00
René Köcher
f674897505
Split static files in application specific directories and use django 1.4 staticfiles app.
2012-04-14 14:51:56 +02:00
Oskar Hahn
fbdcc5e0b4
Automated merge with ssh://openslides.de/openslides
2012-04-14 14:31:15 +02:00
Oskar Hahn
535795391d
remove default permission after syncdb
2012-04-14 14:31:09 +02:00
Emanuel Schuetze
1528ab90c6
Merged.
2012-04-14 14:27:31 +02:00
Emanuel Schuetze
d192ac4952
Added AssignmentPollDelete View. Moved Assignment pdf functions to assignment's views.py
2012-04-14 14:24:13 +02:00
Oskar Hahn
6f377453bc
rename system in config. Add default config in each apps
2012-04-14 12:52:56 +02:00
Oskar Hahn
15a34fda97
project ProjectorSlide
2012-04-14 11:37:12 +02:00
Oskar Hahn
c0bf5ba822
Automated merge with ssh://openslides.de/openslides
2012-04-14 11:18:54 +02:00
Oskar Hahn
491c65cf24
use app name for projector category
2012-04-14 11:18:47 +02:00
Emanuel Schuetze
a4db8a49dd
Automated merge with ssh://openslides.org/openslides
2012-04-14 10:54:31 +02:00
Emanuel Schuetze
4abd79e7b5
Added PDF document title.
2012-04-14 10:54:22 +02:00
René Köcher
d2f9f630c7
Move AnonymousAuth from system to utils.
2012-04-14 09:49:37 +02:00
Oskar Hahn
e8337278a1
Automated merge with ssh://openslides.de/openslides
2012-04-14 09:47:41 +02:00
Oskar Hahn
0de8228537
rewrote message api and countdown
2012-04-14 09:47:34 +02:00
Emanuel Schuetze
e84861211a
Fixed login/logout urls.
2012-04-14 09:42:30 +02:00
René Köcher
a792cd4c15
Support for localized permissions on top of the static django model.
2012-04-14 09:34:31 +02:00
René Köcher
7e12e1d5e2
Support for localized permissions on top of the untranslated django model.
2012-04-14 09:28:28 +02:00
Oskar Hahn
d870b988e9
try to reload the beamer, if the server is down
2012-04-14 09:04:37 +02:00
Emanuel Schuetze
3817a03aa8
Automated merge with ssh://openslides.org/openslides
2012-04-13 23:52:48 +02:00
Emanuel Schuetze
698697a75c
Applications: Moved pdf functions from pdf.py to new PDF view in views.py.
2012-04-13 23:52:34 +02:00
René Köcher
cdf3628e8b
Check input files for UTF-8 encoding and display an appropriate error if not.
2012-04-13 22:33:47 +02:00
René Köcher
3bea7f1234
Ignore malformed lines in import file (ported from application import).
2012-04-13 22:02:14 +02:00
René Köcher
113d258b3d
#85 : New import option: set status of all imported applications to 'permit'
2012-04-13 21:55:13 +02:00
Emanuel Schuetze
a1c5766e7a
Adjusted app prefix in urls.py (outsource in global urls.py). Some code formatting.
2012-04-13 21:43:16 +02:00
Oskar Hahn
639397028e
removed some admin stuff. Fixed version-info, if no mercurial is installed
2012-04-13 16:47:40 +02:00
Oskar Hahn
bb430fd2a7
remove admin, add plugin system for openslides
2012-04-13 14:05:51 +02:00
Oskar Hahn
f889c49c1b
some clean up in participant app
2012-04-13 11:35:53 +02:00
Oskar Hahn
f1261ae2a7
merge
2012-04-12 20:13:39 +02:00
Oskar Hahn
d187f341b3
DeleteView in utils.views
2012-04-12 20:11:05 +02:00
René Köcher
733d78373e
#84 : Participants CSV import deletes applications
2012-04-12 19:11:07 +02:00
Oskar Hahn
9e6aa796ab
fixed error in emty poll in assignment
2012-04-12 16:37:04 +02:00
Oskar Hahn
fc95d01d07
some fixes
2012-04-12 16:21:30 +02:00
Oskar Hahn
497a8cdb70
added AjaxView
2012-04-12 14:20:05 +02:00
René Köcher
07a83f142b
#84 : Participants CSV import deletes applications
2012-04-11 14:49:24 +02:00
Oskar Hahn
3eeae673c0
some small fixes
2012-04-11 10:58:59 +02:00
Emanuel Schuetze
5e6180a465
Some style changes for projector and agenda template.
2012-04-10 21:11:50 +02:00
Emanuel Schuetze
fdc83048f4
More AJAX for projector control template. Moved projector stuff from agenda overview to new control page.
2012-04-10 20:09:10 +02:00
Emanuel Schuetze
83ba0cbcf9
Fixed projector portlet style.
2012-04-02 20:59:17 +02:00
Emanuel Schuetze
c3ada0abdd
Updated translation.
2012-04-02 08:44:17 +02:00
Emanuel Schuetze
42820c1254
#83 : Merged fix of r365 from default branch into 1.2-dev branch.
2012-04-02 08:37:34 +02:00
Emanuel Schuetze
84e5b3d061
#82 : Merged fix of r364 from default branch into 1.2-dev branch.
2012-04-02 08:36:22 +02:00
Emanuel Schuetze
9c13667ff0
#81 : Merged fix of r363 from default branch into 1.2-dev branch.
2012-04-02 08:35:10 +02:00
Emanuel Schuetze
4045c79a17
#80 : Merged fix of r362 from default branch into 1.2-dev branch.
2012-04-02 08:31:26 +02:00
Emanuel Schuetze
c2ec9e958f
#79 : Merged fix of r361 from default branch into 1.2-dev branch.
2012-04-02 08:30:28 +02:00
Emanuel Schuetze
bf6a3d2d81
Updated translation
2012-04-02 07:53:32 +02:00
Emanuel Schuetze
95bf4c1cc8
#83 : Show total number and percent value of filtered participants.
2012-04-02 07:47:38 +02:00
Emanuel Schuetze
a8fcba0f69
#82 : New comment field for participant form (database changes: syncdb required)
2012-04-02 07:38:55 +02:00
Emanuel Schuetze
beb8694cdc
#81 : Use AJAX code for participant status and superuser links in overview
2012-04-02 07:34:34 +02:00
Emanuel Schuetze
ebbacfd443
#80 : New participant status filter
2012-04-02 07:32:42 +02:00
Emanuel Schuetze
e5ef0ac424
#79 : Replaced winner cup icon of elected candidates into green check.
2012-04-02 07:30:52 +02:00
Emanuel Schuetze
0406966e55
Removed new file from changeset r279 to clean up Default branch
...
(because file already in 1.2-dev branch).
2012-03-28 15:37:18 +02:00
Emanuel Schuetze
0976206eb4
Reverted changset r279 from Default branch (because it's for
...
1.2-dev-branch only).
2012-03-28 15:20:43 +02:00
Emanuel Schuetze
ac9d31d7d4
Reverted changset r280 from Default branch (because it's for
...
1.2-dev-branch only).
2012-03-28 15:18:18 +02:00
Emanuel Schuetze
c6a40f4dcb
Reverted changset r281 from Default branch (because it's for
...
1.2-dev-branch only).
2012-03-28 15:17:50 +02:00
Emanuel Schuetze
a06d20a8d8
Reverted changset r282 from Default branch (because it's for
...
1.2-dev-branch only).
2012-03-28 15:17:29 +02:00
Emanuel Schuetze
a11ed6cfdb
Minor template fixes.
2012-03-22 17:30:02 +01:00
Emanuel Schuetze
d4b86574e9
Updated translation.
2012-03-22 17:29:39 +01:00
Emanuel Schuetze
7e48dc737f
Scaled Live View. Added active slide icon.
2012-03-21 22:21:23 +01:00
Emanuel Schuetze
d65b20a7fd
Fixed tab string.
2012-03-19 09:34:13 +01:00
Oskar Hahn
c4c42611b4
generate tab liste by app list
2012-03-18 17:11:58 +01:00
Oskar Hahn
ad38a8eead
put some lines in agenda template in seperate File
2012-03-18 15:11:01 +01:00
Oskar Hahn
f5414b18d2
fixed error in projector Control
2012-03-18 14:35:01 +01:00
Oskar Hahn
282778c8a0
fixed error with permission Mixin
2012-03-18 14:33:53 +01:00
Oskar Hahn
f54cf05fc6
bug in signals
2012-03-17 00:22:46 +01:00
Oskar Hahn
0b137e72cd
remove some unused lines from base_system.html
2012-03-16 14:33:19 +01:00
Oskar Hahn
fb17b16fae
config pages in apps
2012-03-16 14:31:59 +01:00
Oskar Hahn
ccdce52caa
start a way to send messages to the projector. Start to use this api for the countdown
2012-03-16 12:28:42 +01:00
Oskar Hahn
bf6d5fc798
decode config Vars with base64 befor saveing them in the db
2012-03-13 13:03:03 +01:00
Oskar Hahn
2947fff9f6
commit mailinglist test
2012-03-12 18:27:13 +01:00
Oskar Hahn
7a63ec6f10
created model for pojector slides
2012-03-12 18:22:18 +01:00
Emanuel Schuetze
2ab6ff4143
Projector control template: Used portlets instead of accordion.
2012-03-07 06:44:43 +01:00
Emanuel Schuetze
687f5ea710
Automated merge with ssh://openslides.org/openslides
2012-03-06 19:55:26 +01:00
Emanuel Schuetze
8d514e9fcf
Renamed SettingView to ControlView.
2012-03-06 19:55:19 +01:00
Oskar Hahn
027655270e
Automated merge with ssh://openslides.de/openslides
2012-03-06 12:16:21 +01:00
Oskar Hahn
062e9bd4cb
added signals for template-context-manipulation
2012-03-06 12:16:03 +01:00
Emanuel Schuetze
55c4299a7f
Updated projector control template. Fixed some slidemodel strings and urls.
...
Updated jquery to 1.7.1. Added jquery-ui.
2012-03-06 08:19:49 +01:00
Oskar Hahn
50360dde96
side-menu for projector
2012-03-03 11:19:58 +01:00
Oskar Hahn
a25d980f92
publish assignment polls
2012-03-03 11:16:10 +01:00
Oskar Hahn
a69ddffea5
put links in projector settings in categories
2012-03-03 10:47:32 +01:00
Oskar Hahn
654b101dac
beamer setting page
2012-03-03 09:11:56 +01:00
Oskar Hahn
a2230c9077
fixed error when deleting item without the children
2012-02-21 13:36:00 +01:00
Oskar Hahn
281450341d
some fixes to pdf.py
2012-02-21 13:32:39 +01:00
Oskar Hahn
e9299625ae
Automated merge with ssh://openslides.de/openslides
2012-02-21 13:17:58 +01:00
Oskar Hahn
898cab4aa8
Generate Agenda-PDF in a generic View. Added PDFView in utils.views.py
2012-02-21 13:17:42 +01:00
Emanuel Schuetze
c14dcb1679
Added missing template tags (i18n).
2012-02-21 08:21:59 +01:00
Emanuel Schuetze
0cc5d6478d
Changed config_get() to config[].
2012-02-21 08:07:56 +01:00
Oskar Hahn
c55f240e84
some bug fixes
2012-02-20 20:35:12 +01:00
Oskar Hahn
e85822ebc9
updated agenda unittests
2012-02-20 19:39:53 +01:00
Oskar Hahn
4e16c6639b
some minor bug fixes
2012-02-20 19:39:26 +01:00
Oskar Hahn
1e7d420485
added utils.forms.py
2012-02-20 18:44:38 +01:00
Oskar Hahn
8c597a2eb3
load form-css-classes from utils.forms.py instead to define it on every form
2012-02-20 18:44:02 +01:00
Oskar Hahn
8c52ecd669
generic views for the Agenda-App
2012-02-20 17:46:45 +01:00
Oskar Hahn
159e799a22
fixed error when saving a new config-value
2012-02-20 14:51:05 +01:00
Oskar Hahn
fb63d64d02
insert a / between agenda and agenda-url
2012-02-20 14:50:42 +01:00
Oskar Hahn
7e076dc6c4
removed some unneedet dependencies
2012-02-20 00:39:52 +01:00
Oskar Hahn
ab99f791f1
we don't need the item-sort-def anymore
2012-02-20 00:15:44 +01:00
Oskar Hahn
22ef402a50
use django-mptt to ordner the Agenda
...
http://django-mptt.github.com
you have to run:
pip install django-mptt
2012-02-20 00:14:54 +01:00
Oskar Hahn
a404c3fe89
load config at once
2012-02-19 22:20:29 +01:00
Oskar Hahn
70f1cb8b3e
use the new poll-api in assignments
2012-02-19 19:27:00 +01:00
Oskar Hahn
5aaa1a53fa
addet votes cast and votes invalid to new poll-api
2012-02-19 17:31:17 +01:00
Oskar Hahn
7174e93988
pickle config-values to save complex data
2012-02-18 00:00:56 +01:00
Oskar Hahn
114a68b120
some additions in poll and application-poll
2012-02-15 13:44:55 +01:00
Oskar Hahn
c4874ae6a0
present a poll
2012-02-15 12:36:50 +01:00
Oskar Hahn
bc05b78648
rewrote the config api
2012-02-15 12:04:11 +01:00
Oskar Hahn
77b11d8edf
forgot to add some files
2012-02-15 10:46:55 +01:00
Oskar Hahn
9c367509dd
reorder poll
2012-02-15 10:43:08 +01:00
Oskar Hahn
0957de83a9
start to rewrite the poll-api
2012-02-14 16:31:21 +01:00
Oskar Hahn
a54ff100d1
cleand the setting-file
2012-02-09 17:35:18 +01:00
Oskar Hahn
6498095e2b
create setup.py to install openslides
2012-02-09 16:57:10 +01:00
Oskar Hahn
21a13b4d1a
The Version of openslides can be written in openslides/__init__.py
2012-02-09 13:43:39 +01:00
Oskar Hahn
28170becb3
cleand the apenda-app
2012-02-09 02:29:38 +01:00
Oskar Hahn
7808783145
register functions als slide
2012-02-09 01:46:58 +01:00
Oskar Hahn
8c27c731f8
rename Element to Slide
2012-02-06 22:22:16 +01:00
Oskar Hahn
16c37661f7
renamed beamer in projector
2012-02-06 22:08:08 +01:00
Oskar Hahn
8275484d84
some errors occured with the new beamer app in agenda
2012-02-06 10:10:20 +01:00
Oskar Hahn
5f6c96b3e8
assignment and application can be beamt without a item-element
2012-02-03 23:12:28 +01:00
Oskar Hahn
fe2efb03fa
import some functions from beamer.api
2012-02-03 20:57:08 +01:00
Oskar Hahn
6273f0ff44
beamer zeug in extra app ausgelagert
2012-02-03 20:49:16 +01:00
Emanuel Schuetze
3992b04dc2
#69 : Added missing config option to publish voting results for selected
...
winners only.
2012-01-27 08:51:05 +01:00
Emanuel Schuetze
ff45f48144
Updated website.
2011-12-01 23:23:18 +01:00
Emanuel Schuetze
8ed81db9f2
Application import: Added propper_unicode function to handle
...
unicode/ascii mix. Thanks to Rene Koecher!
2011-11-29 12:10:06 +01:00
Emanuel Schuetze
e91df2b67b
Fixed CSV changes: Added support for python 2.5.x.
2011-11-29 11:02:31 +01:00
Emanuel Schuetze
7942de0370
Prepared application template style for using html tags (with 'version.text|safe|linebreaks').
2011-11-24 21:06:39 +01:00
rene
a2db589272
Automated merge with ssh://openslides.org/openslides
2011-11-24 20:24:27 +01:00
rene
03bca90511
Extend patchup for builtin excel dialect
2011-11-24 20:24:13 +01:00
Emanuel Schuetze
8ef0b0ad81
Merged.
2011-11-24 19:53:03 +01:00
Emanuel Schuetze
8d21b8d831
Participant edit/new form: Changed default value of gender and type to blank/not specified.
2011-11-24 19:51:16 +01:00
Emanuel Schuetze
72de1dce74
Fixed missing form invalid error message.
2011-11-24 19:42:32 +01:00
rene
d75e736be7
Add patchup-helper to assist csv.Sniffer()
2011-11-24 19:38:25 +01:00
rene
c448ce95bd
Switch to python-provided CSV module - implements #66
2011-11-22 18:49:36 +01:00
Emanuel Schuetze
bbb61a9091
Fixed #65 : Set default value for config options: 'Number of ballot papers (selection)'
2011-11-21 18:00:58 +01:00
Emanuel Schuetze
3679dbdf52
Fixed #64 : Reorder election settings form fields.
2011-11-17 18:16:51 +01:00
Emanuel Schuetze
52dc3f2a1a
Fixed #63 : First password is always generated after saving participant edit form.
2011-11-17 18:14:41 +01:00
Emanuel Schuetze
c9b9eafbb2
Fixed #62 : General event settings are not displayed in settings form.
2011-11-17 18:06:41 +01:00
Emanuel Schuetze
69befddc90
Added incompleted unit tests from changeset 247 for ongoing work of next release.
2011-11-17 17:06:39 +01:00
Emanuel Schuetze
c88ff41805
Reordered config tab subpages.
2011-11-14 23:40:19 +01:00
Emanuel Schuetze
49d2b57a66
Added initial welcome text.
2011-11-14 23:12:52 +01:00
Emanuel Schuetze
dd85f07d66
Updated translation.
2011-11-14 23:01:43 +01:00
Emanuel Schuetze
3ae853f082
Removed incompleted unit tests for 1.1 release.
2011-11-14 22:54:31 +01:00
Emanuel Schuetze
470684b199
Automated merge with ssh://openslides.org/openslides
2011-11-14 21:58:16 +01:00
rene
528b49da99
Use gen_password() for new user objects created via user or application import.
2011-11-14 21:54:42 +01:00
Emanuel Schuetze
763b8c15e1
Improve confirm agenda item delete message dependent on childrens available or not.
2011-11-14 21:52:33 +01:00
Emanuel Schuetze
d54afd7ad6
Removed generate passwords function/link. Now passwords will be generated after creating participants.
2011-11-14 21:25:20 +01:00
Emanuel Schuetze
e7d8b8a5ee
#58 : Generate password after user createion automatically.
2011-11-14 21:13:13 +01:00
rene
d9d2692ffc
Filter permissions displayed in the group editor (as requested by #59 ).
2011-11-14 20:45:04 +01:00
Emanuel Schuetze
9b1a6388a7
Added css cursur attribute for notification div.
2011-11-14 20:40:13 +01:00
Emanuel Schuetze
e156625975
Fixed permission.
2011-11-14 20:23:06 +01:00
Emanuel Schuetze
b0f9ab09d5
Added link to countdown timer config option.
2011-11-14 20:17:48 +01:00
Emanuel Schuetze
9feca83bb3
Fixed IE CSS issues (with white-space: nowrap).
2011-11-14 20:14:56 +01:00
Emanuel Schuetze
eb35289e4e
Fixed #57 : <button> inside <a> tag not working in IE.; Added new icon for anonymous login.
2011-11-14 19:33:45 +01:00
rene
9f50863439
Implement rights for anonymous as requested by #45
2011-11-14 16:37:12 +01:00
Emanuel Schuetze
40dc6f56df
Updated jquery.js to version 1.7.
2011-11-09 23:36:33 +01:00
Emanuel Schuetze
2a192e2dea
Added missing tabledrag images.
2011-11-09 23:17:03 +01:00
Emanuel Schuetze
ecc788f47d
Updated translations.
2011-11-09 23:06:39 +01:00
Emanuel Schuetze
de62241dc7
Application: Added import ( #55 ) and trivial changes ( #56 ) function. Thanks to Rene Koecher!
2011-11-09 22:53:10 +01:00
Emanuel Schuetze
aad0d2f02b
Added missing icons for countdown control.
2011-11-09 21:55:35 +01:00
Emanuel Schuetze
8f3590fb9c
Fixed typo.
2011-11-09 21:42:23 +01:00
Emanuel Schuetze
bc9326e567
Removed knockout.js (no longer required).
2011-11-09 21:26:05 +01:00
Emanuel Schuetze
076699ff45
#52 : Added countdown on projector view with control unit (agenda overview) and time variable (general settings).
2011-11-09 21:16:02 +01:00
Emanuel Schuetze
52c24d6a48
Removed old background image (no longer required).
2011-11-07 21:16:04 +01:00
Emanuel Schuetze
f26a19036b
Added new button in assignment view template to show agenda item of selected assignment (for manager only).
2011-11-01 14:45:24 +01:00
Emanuel Schuetze
6d7736d10d
Added new button in application view template to show agenda item of selected appliation (for manager only).
2011-11-01 14:35:58 +01:00
Emanuel Schuetze
e64e91c52d
Updated translations.
2011-11-01 08:26:47 +01:00
Emanuel Schuetze
f757b44f70
Fixed error if PDF preamble is empty.
2011-11-01 08:26:37 +01:00
Emanuel Schuetze
15f872b6e2
Fixed permissions to delete own applications (if they have no number).
2011-11-01 08:07:27 +01:00
Emanuel Schuetze
a23164a906
Order submitter and supporter fields by full name in ApplicationManagerForm.
2011-11-01 06:47:10 +01:00
Emanuel Schuetze
66c078b333
Typo.
2011-10-31 20:21:19 +01:00
Emanuel Schuetze
0ea6e3d2a3
Revert: Set DEBUG to True (using True for development and False for release only)
2011-10-31 20:21:03 +01:00
Emanuel Schuetze
2730d32bf9
Set DEBUG to False.
2011-10-25 22:29:52 +02:00
Emanuel Schuetze
b6ccb357d1
#26 : Added new config options to set numbers of ballot pdf papers for application and assignment
2011-10-25 22:03:21 +02:00
Emanuel Schuetze
424fe34325
Minor style changes.
2011-10-24 21:05:18 +02:00
Emanuel Schuetze
82613c5490
Updated translation (new: gender-sensitive)
2011-10-24 21:05:06 +02:00
Emanuel Schuetze
4a3564aed8
#48 (election): Added percentage for voting results (view, projector, pdf).
2011-10-20 22:56:22 +02:00
Emanuel Schuetze
34f76c8c28
#27 : Added default sort for assignments and participants.
2011-10-05 21:35:20 +02:00
Emanuel Schuetze
fa5918e951
New config option to set title and preamble text for application and assignment pdf.
2011-10-05 21:18:28 +02:00
Emanuel Schuetze
b76c4d8ecf
Opened add-user-url in new tab.
2011-09-29 22:36:21 +02:00
Emanuel Schuetze
d2295cb93b
Mark elected candidates in assignment pdf.
2011-09-29 22:14:46 +02:00
Emanuel Schuetze
91ff36e19a
Fixed: Show "undocumented" for -2 in assignment pdf.
2011-09-21 21:28:27 +02:00
Emanuel Schuetze
bfadbce541
Fixed: Show "undocumented" for -2 in application pdf.
2011-09-21 21:28:01 +02:00
Emanuel Schuetze
6c008488cf
Application: Check enough supports in status "pub" only.
2011-09-21 21:27:23 +02:00
Emanuel Schuetze
cea2992ca0
Application: Show profile instead of submitter username.
2011-09-21 21:26:44 +02:00
Emanuel Schuetze
af240bb788
Fixed: Print available candidates at assignment pdf.
2011-09-21 21:24:56 +02:00
Emanuel Schuetze
045c09577a
Updated translation.
2011-09-21 21:24:21 +02:00
Emanuel Schuetze
54b148a704
Splitted up hidden agenda items in new table section.
2011-09-21 21:23:22 +02:00
Emanuel Schuetze
042eae9ecc
Allowed HTML for Item Text.
2011-09-21 21:23:00 +02:00
Emanuel Schuetze
bd9891fe5e
Show results for elected candidates only (assignment beamer view).
2011-09-21 21:21:01 +02:00
Emanuel Schuetze
28d7d17587
Removed empty character for no results cell.
2011-09-21 21:17:22 +02:00
Emanuel Schuetze
2f027663ed
Improved assignment projector view.
2011-09-21 21:14:19 +02:00
Emanuel Schuetze
d671d2b153
Fixed wrong line break in assignment ballot pdf (used split in
...
stead of rsplit).
2011-09-21 21:13:54 +02:00
Emanuel Schuetze
10e8b95b1b
Show 'hidden' information in agenda item type column for hidden items (visible for managers only).
2011-09-21 21:13:33 +02:00
Emanuel Schuetze
d85b9e11fa
Added new item-done-column for all non-manager.
2011-09-21 21:12:15 +02:00
Emanuel Schuetze
947d54b8dd
Show blue elected line for beamer ajax view.
2011-09-21 21:10:23 +02:00
Emanuel Schuetze
206ed7bd8b
Fixed zoom problem for sidebar div in beamer view.
2011-09-21 21:02:29 +02:00
Emanuel Schuetze
e09388fd6e
Use get_type_display for profiles.
2011-09-21 21:01:56 +02:00
Emanuel Schuetze
d70219e757
Updated translation.
2011-09-21 21:01:27 +02:00
Emanuel Schuetze
3c2cfe508a
Show participants pdf for users with see-particiants-permissions
2011-09-21 21:01:00 +02:00
Emanuel Schuetze
d53c4ea5ba
fix scalling from beamer
2011-09-21 20:58:15 +02:00
Emanuel Schuetze
7aed6ac354
encoding error
...
HGr Bitte gib eine Versions-Meldung ein. Zeilen beginnend mit 'HG:' werden entfernt.
2011-09-21 20:56:58 +02:00
Emanuel Schuetze
f85ebbfab9
Fixed active submenu class. Added submenu icon for generate passwords. Updated translation.
2011-09-12 09:06:24 +02:00
Emanuel Schuetze
c6fd0beae6
Import parse_qs from cgi instead from urlparse for old python versions.
2011-09-12 08:32:05 +02:00
Emanuel Schuetze
1dc631d82d
Automated merge with ssh://openslides.org/openslides
2011-09-12 08:06:44 +02:00
Emanuel Schuetze
e640241154
Updated translations. Fixed style and display of votes invalid, votes cast.
2011-09-11 22:43:15 +02:00
Oskar Hahn
5cbef3a735
show revsion tag, if any
2011-09-11 21:06:03 +02:00
Emanuel Schuetze
9917e2f545
Fixed index error while generating assignment pdf.
2011-09-11 18:37:20 +02:00
Emanuel Schuetze
7ef4013b4b
Fixed agenda pdf layout of subitems.
2011-09-11 17:06:32 +02:00
Oskar Hahn
f673233a18
fixt encoding-error
...
the new filter-sort-function take use of urllib.urlencode. This function
does not encode unicode-strings. So we have to decode every value in the
sortfilter-dict
2011-09-10 09:40:39 +02:00
Oskar Hahn
97327a3b17
rewrote the filter and sort system for participant
2011-09-10 00:16:57 +02:00
Oskar Hahn
2973ec1f33
set cookie in @template decorator
...
if the dict has the value cookie, set a cookie with dict['cookie'][0] as Name and ['cookie'][1] as value
2011-09-10 00:16:39 +02:00
Oskar Hahn
2fe4a0ce29
last changes for application, too
2011-09-09 22:40:38 +02:00
Oskar Hahn
10c3d624fe
replace -2 with undocumented in beamer view of polls
2011-09-09 22:34:55 +02:00
Oskar Hahn
d32fe2902d
Automated merge with ssh://oshahn.de/openslides
2011-09-09 22:25:23 +02:00
Oskar Hahn
08a3cf8490
allow undocumented votecast and voteinvalid
...
the poll-class has two new properties. voteinvalidf and votescastf. They show
undocumented if the value is -2, else the value
2011-09-09 22:23:42 +02:00
Emanuel Schuetze
9de5e25ae1
Automated merge with ssh://openslides.org/openslides
2011-09-09 16:34:33 +02:00
Emanuel Schuetze
1e248ebf23
Only show published polls for normal users.
2011-09-09 16:34:01 +02:00
Oskar Hahn
7fc12e51f9
type in last commit, template update, form update
...
info in template, that -1 is majority and -2 in undocumentet
update option_form. -2 is a valide value
2011-09-09 16:26:34 +02:00
Oskar Hahn
7be90c89c7
undocumentet poll results
2011-09-09 16:18:17 +02:00
Emanuel Schuetze
91049155a6
Print election results in pdf. Fixed redirect.
2011-09-09 16:18:11 +02:00
Emanuel Schuetze
72a2b824fd
Added error messeage for import function if you are not superuser.
2011-09-09 10:55:33 +02:00
Emanuel Schuetze
475b7a1ffe
Updated application projector view.
2011-09-08 18:57:11 +02:00
Emanuel Schuetze
88447db814
Added log after adding/removing supporters as manager.
2011-09-08 17:39:57 +02:00
Emanuel Schuetze
85d61d38e5
Added publish/unpublish icon.
2011-09-08 16:39:41 +02:00
Emanuel Schuetze
adebbf4125
Automated merge with ssh://openslides.org/openslides
2011-09-08 12:30:40 +02:00
Emanuel Schuetze
5a3f336cdf
Added "published" attribute for poll object. Adjusted assignment
...
views and templates.
2011-09-08 12:30:34 +02:00
Emanuel Schuetze
ab96b32790
Fixed: cast to string required.
2011-09-08 09:37:19 +02:00
Oskar Hahn
508be2f4eb
beamer clean link
2011-09-08 09:23:21 +02:00
Emanuel Schuetze
1f5d86a0fc
Show assignment vote results on projector view.
2011-09-07 23:25:59 +02:00
Emanuel Schuetze
c53e5267c5
Updated translations.
2011-09-07 22:46:47 +02:00
Emanuel Schuetze
096b4c4cb0
Changed default value for participant type from delegate to guest.
2011-09-07 22:20:07 +02:00
Emanuel Schuetze
f5f220417a
Fixed manage permission. Updated message translation.
2011-09-07 22:17:19 +02:00
Emanuel Schuetze
3001b9f474
Layout fix for pdf assignment icon.
2011-09-07 22:03:04 +02:00
Emanuel Schuetze
123426329d
Print also applications without a number.
2011-09-07 20:37:56 +02:00
Emanuel Schuetze
fa71a1236d
Count numbers of application, assignments and participants. Some minor style fixes.
2011-09-07 19:35:06 +02:00
Emanuel Schuetze
dc782739cc
Translation updated.
2011-09-07 19:32:26 +02:00
Emanuel Schuetze
57e966a97b
Updated application pdf.
2011-09-07 18:43:25 +02:00
Emanuel Schuetze
f185b2e63c
Show type field for non-manager.
2011-09-07 18:06:11 +02:00
Oskar Hahn
7d46574498
realy realy save password...
2011-09-07 14:27:36 +02:00
Oskar Hahn
8ad6ebfeee
realy save password with the user_reset_password function
2011-09-07 14:21:42 +02:00
Oskar Hahn
a42e352d2a
Automated merge with ssh://oshahn.de/openslides
2011-09-07 09:56:30 +02:00
Oskar Hahn
e42030b1ba
count users in partition overview
2011-09-07 09:56:19 +02:00
Emanuel Schuetze
5fd31f6ca6
Added assignment pdf.
2011-09-07 07:52:44 +02:00
Emanuel Schuetze
d8a880105a
Some minor renames (applications # -> no., beamer -> projector etc.)
2011-09-06 23:23:05 +02:00
Emanuel Schuetze
1708c148ad
Updated translations.
2011-09-06 23:22:13 +02:00
Emanuel Schuetze
288133b551
Application PDF: Added signature field for submitter.
2011-09-06 23:01:21 +02:00
Emanuel Schuetze
bb38d8b85e
Updated application PDF. Added vote results.
2011-09-06 22:22:29 +02:00
Emanuel Schuetze
ecc728c8e9
Some agenda style changes.
2011-09-06 18:45:34 +02:00
Oskar Hahn
08a1e88e12
newest version link for application
2011-09-06 10:41:06 +02:00
Oskar Hahn
f6b335245d
set more then one firstpassword
2011-09-06 10:15:23 +02:00
Oskar Hahn
31550a4ca7
database way for the last commit
2011-09-06 10:07:51 +02:00
Oskar Hahn
b14742205b
unique candidates in assignments if there are more then one ballot
2011-09-06 09:40:48 +02:00
Oskar Hahn
3c42b26d6f
Automated merge with ssh://oshahn.de/openslides
2011-09-06 09:27:11 +02:00
Oskar Hahn
0727b1d72a
permission_required is only allowds in views with request as first argument
2011-09-06 09:17:39 +02:00
Emanuel Schuetze
cdfb6b24e3
Mark elected candidates in beamer view.
2011-09-06 07:33:13 +02:00
Emanuel Schuetze
8cd0ac8778
Added icon and style information for elected/not elected candidates.
2011-09-05 23:13:18 +02:00
Emanuel Schuetze
4fb4691f14
Added counter and message for password generation.
2011-09-05 22:26:19 +02:00
Emanuel Schuetze
7eac8cda5d
Beamer: Display election status finished.
2011-09-05 21:53:15 +02:00
Emanuel Schuetze
f412e9065a
Needs fix to group candidates by user.
2011-09-05 21:40:56 +02:00
Emanuel Schuetze
0b17ab10fe
Fixed candidates order in beamer view. Some style changes.
2011-09-05 20:47:55 +02:00
Emanuel Schuetze
fec269e4a7
Fixed alphabetical order of candidates.
2011-09-05 20:27:47 +02:00
Emanuel Schuetze
9275acf029
Show full profile name of supmitter and supports.
2011-09-05 20:05:23 +02:00
Emanuel Schuetze
35c0b50940
Fix redirect for user group overview.
2011-09-05 19:53:40 +02:00
Oskar Hahn
41fbd456d2
add group by user-import
2011-09-05 10:11:47 +02:00
Oskar Hahn
450190e603
show group in passwordlist
2011-09-05 09:14:38 +02:00
Oskar Hahn
90991f62e7
Automated merge with ssh://oshahn.de/openslides
2011-09-05 09:08:20 +02:00
Oskar Hahn
510cbf8374
reorder user-import csv data
2011-09-05 09:08:12 +02:00
Oskar Hahn
c6259d83bb
set first password by users with None or '' firstpassword
2011-09-05 09:08:00 +02:00
Emanuel Schuetze
b8ff9696b4
Minor.
2011-09-04 19:28:06 +02:00
Emanuel Schuetze
b7a1afd3a2
Changed url 'item' to 'agenda'.
2011-09-04 19:22:30 +02:00
Emanuel Schuetze
e85f5b4f1e
Minor style changes.
2011-09-04 19:22:08 +02:00
Emanuel Schuetze
d3adc382b8
Updated translations.
2011-09-04 19:08:38 +02:00
Emanuel Schuetze
53ee9c598d
Added icons for controling beamer view (pan,zoom)
2011-09-04 19:08:20 +02:00
Emanuel Schuetze
30afe96fc0
AVersion fixes: Added reject confirm message. Style changes.
2011-09-04 19:07:45 +02:00
Emanuel Schuetze
3b2763e2dc
PDF: Fixed items in layer 3+
2011-09-04 19:06:48 +02:00
Emanuel Schuetze
6b7697a5b2
Changed translation string: revision -> version.
2011-09-04 12:35:46 +02:00
Emanuel Schuetze
57ea883d51
Updated permissions.
2011-09-04 12:33:06 +02:00
Emanuel Schuetze
d1d0e7e9b4
Updated permissions.
2011-09-04 12:21:58 +02:00
Emanuel Schuetze
85d74683e8
Updated translations.
2011-09-04 12:21:38 +02:00
Oskar Hahn
f4f7aa4e57
Automated merge with ssh://oshahn.de/openslides
2011-09-04 10:49:21 +02:00
Oskar Hahn
8089c3c8a9
do not create a new aversion, if only the permission has changed
2011-09-04 10:49:17 +02:00
Emanuel Schuetze
3fc42c6488
Added revision confirm dialog.
2011-09-04 10:43:25 +02:00
Oskar Hahn
da14eca296
application.aid is the permitted aid, or the last aid
2011-09-04 10:34:30 +02:00
Oskar Hahn
89386a4ac7
Automated merge with ssh://oshahn.de/openslides
2011-09-04 10:21:58 +02:00
Oskar Hahn
572782befa
default version is the accepted Version
2011-09-04 10:21:54 +02:00
Emanuel Schuetze
9f2929df6b
Automated merge with ssh://openslides.org/openslides
2011-09-04 10:21:11 +02:00
Emanuel Schuetze
7271964f59
View aversion accept/reject icons and revision number.
2011-09-04 10:21:06 +02:00
Oskar Hahn
2c6c9b55ee
accept old application versions
2011-09-04 10:02:54 +02:00
Oskar Hahn
a89bf9f49b
Automated merge with ssh://oshahn.de/openslides
2011-09-04 09:57:30 +02:00
Oskar Hahn
a1d92dc1bb
generate username with first and lastname
2011-09-04 09:57:23 +02:00
Emanuel Schuetze
6a1a57efca
Added permissions for pdf access.
2011-09-04 09:34:52 +02:00
Emanuel Schuetze
a6652e3fb4
Updated participants list with permissions.
2011-09-04 09:12:15 +02:00
Emanuel Schuetze
262304d1e5
Updated event header.
2011-09-04 08:39:36 +02:00
Emanuel Schuetze
c34cc79a84
Updated circle img path with SITE_ROOT.
2011-09-04 08:31:44 +02:00
Emanuel Schuetze
5e4ba42de3
Imported SITE_ROOT for font path.
2011-09-04 08:23:03 +02:00
Emanuel Schuetze
63c68c9714
Automated merge with ssh://openslides.org/openslides
2011-09-04 00:54:52 +02:00
Emanuel Schuetze
a05b576f9e
Print password pdf with url and welcometext.
2011-09-04 00:54:45 +02:00
Oskar Hahn
bd4504b40e
typo in agenda
2011-09-04 00:29:23 +02:00
Oskar Hahn
5fc2549fd3
Automated merge with ssh://oshahn.de/openslides
2011-09-04 00:18:17 +02:00
Oskar Hahn
c22d35cd43
scroll and scall the beamer
2011-09-04 00:18:11 +02:00
Emanuel Schuetze
ceb9a3b4c3
PDF: Optimized ballot description for 2 lines.
2011-09-03 23:38:14 +02:00
Emanuel Schuetze
6a991dba0d
Removed language selector. Should be used via settings.py now.
2011-09-03 23:37:15 +02:00
Emanuel Schuetze
1b81cfee27
Automated merge with ssh://openslides.org/openslides
2011-09-03 19:49:35 +02:00
Emanuel Schuetze
d0363d7ad9
Added icon for accept/reject application versions.
2011-09-03 19:49:32 +02:00
Oskar Hahn
31e663d274
Automated merge with ssh://oshahn.de/openslides
2011-09-03 19:43:31 +02:00
Oskar Hahn
67f650aee8
error by password reset function
2011-09-03 19:42:43 +02:00
Emanuel Schuetze
1bce678a03
Automated merge with ssh://openslides.org/openslides
2011-09-03 19:25:16 +02:00
Emanuel Schuetze
2ad0754f88
Added and fixed apply buttons. Updated translation.
2011-09-03 19:25:05 +02:00
Oskar Hahn
3c38a02896
requestcontext by error-pages
2011-09-03 19:16:43 +02:00
Oskar Hahn
a7fc2c2b88
show a discreet error when there is an ajax-error on the beamer
2011-09-03 18:50:47 +02:00
Oskar Hahn
4639e77549
apply link redirect to edit-form, if it was a new form
2011-09-03 18:35:19 +02:00
Emanuel Schuetze
ad263ea6a0
Automated merge with ssh://openslides.org/openslides
2011-09-03 18:11:54 +02:00
Oskar Hahn
5543320e0d
accept and reject links for applications
2011-09-03 18:11:42 +02:00
Emanuel Schuetze
452d23a16b
Automated merge with ssh://openslides.org/openslides
2011-09-03 18:11:15 +02:00
Emanuel Schuetze
ba28afdc49
Added icons to hide/show hidden agenda items. Some style changes.
2011-09-03 18:11:05 +02:00
Oskar Hahn
e849716ee4
default password and reset function
2011-09-03 17:17:29 +02:00
Emanuel Schuetze
762f09197d
Updated translations.
2011-09-03 16:36:49 +02:00
Emanuel Schuetze
e23a498b83
Merged.
2011-09-03 16:22:43 +02:00
Emanuel Schuetze
021fb27833
Added apply buttons. Some style changes. Fix permissions.
2011-09-03 16:20:10 +02:00
Oskar Hahn
28785c0ed4
Automated merge with ssh://oshahn.de/openslides
2011-09-03 15:08:26 +02:00
Oskar Hahn
aab2916d6d
hide closed elements in the agenda
2011-09-03 15:08:20 +02:00
Emanuel Schuetze
7c866e11e4
Removed ItemPoll and ItemFormPoll.
2011-09-03 14:36:01 +02:00
Emanuel Schuetze
a874e327ac
Fixed style.
2011-09-03 14:31:33 +02:00
Emanuel Schuetze
8ef3d485fe
Exluded weight field from item forms.
2011-09-03 14:30:56 +02:00
Emanuel Schuetze
444cb5d23f
Automated merge with ssh://openslides.org/openslides
2011-09-03 13:53:45 +02:00
Emanuel Schuetze
cc10d5042b
Show invalid votes and votes cast for application and assignment results.
2011-09-03 13:53:37 +02:00
Oskar Hahn
b626d049fe
ask, if by deleting an item, if the childen shoud be deleted as well
2011-09-03 12:45:19 +02:00
Oskar Hahn
e81de0fa48
Automated merge with ssh://oshahn.de/openslides
2011-09-03 12:26:22 +02:00
Oskar Hahn
a32ed1d059
do not show the elected box in assignment edit form
2011-09-03 12:26:14 +02:00
Emanuel Schuetze
a9fd09951b
Automated merge with ssh://openslides.org/openslides
2011-09-03 12:16:52 +02:00
Emanuel Schuetze
97228f6558
Show invalid votes in application view.
2011-09-03 12:16:47 +02:00
Oskar Hahn
0c931559a0
apply button in agenda edit form
2011-09-03 12:14:17 +02:00
Oskar Hahn
eaee6f9154
remove the obligation to change the password
2011-09-03 12:14:04 +02:00
Oskar Hahn
98ee433cd3
merge error
2011-09-03 11:56:35 +02:00
Oskar Hahn
f5d2a503d0
Automated merge with ssh://oshahn.de/openslides
2011-09-03 11:46:22 +02:00
Oskar Hahn
dcbeb452fb
canidate in assignment can be marked as elected
2011-09-03 11:42:44 +02:00
Emanuel Schuetze
689b6e1706
Automated merge with ssh://openslides.org/openslides
2011-09-03 10:52:36 +02:00
Emanuel Schuetze
ca0c50caef
Many improvements for application and assignment poll system.
2011-09-03 10:52:29 +02:00
Emanuel Schuetze
b1b5d9cb70
Removed old poll permissions.
2011-09-03 01:46:56 +02:00
Emanuel Schuetze
e752e05b0f
Removed unnecessary parts from poll system. Needs new development in future.
2011-09-03 01:40:06 +02:00
Emanuel Schuetze
ed40977403
Removed reduced agenda pdf. Not useable.
2011-09-03 01:24:50 +02:00
Emanuel Schuetze
2278ddca54
DB change: Changed voteinvalid to votesinvalid.
2011-09-03 00:43:09 +02:00
Emanuel Schuetze
f24cc7c0c1
Minor fixes
2011-09-03 00:42:37 +02:00
Oskar Hahn
2a89ccca5a
merge
2011-09-02 20:46:52 +02:00
Oskar Hahn
a9775bdd73
api for ajax requests
2011-09-02 20:46:24 +02:00
Emanuel Schuetze
6458a69324
Reduced application poll title.
2011-09-02 17:40:02 +02:00
Emanuel Schuetze
1811f0108c
PDF: Restructured ballot stylesheets.
2011-09-02 17:39:32 +02:00
Emanuel Schuetze
590d56a80e
PDF: Optimized application print function.
2011-09-02 16:34:12 +02:00
Emanuel Schuetze
8e325e5361
Restructured pdf stylesheets.
2011-09-02 15:54:13 +02:00
Oskar Hahn
462cba2416
close and open a slide with ajax
2011-08-31 23:47:31 +02:00
Oskar Hahn
4e03fe90bc
active Item by ajax and prepared other ajax features
2011-08-31 18:25:03 +02:00
Oskar Hahn
628de1f954
typo
2011-08-31 14:32:02 +02:00
Oskar Hahn
78bd65a700
add knockout api
2011-08-31 14:26:46 +02:00
Oskar Hahn
67c6fdba29
use a-tag instead of onclick for nojs use
2011-08-31 14:17:11 +02:00
Emanuel Schuetze
b2cd48d971
View event date and location if not empty.
2011-08-03 22:52:45 +02:00
Emanuel Schuetze
d41a1c4791
Fixed: parent form field is not required.
2011-08-02 21:40:08 +02:00
Oskar Hahn
3db6a12024
Add code
2011-07-31 10:46:29 +02:00