8d1c351c9a
Squished all migrations.
2016-01-09 19:10:57 +01:00
544efdb06e
Merge pull request #1806 from ostcar/fix_autoupdate_after_reload
...
Fix autoupdate after auth
2016-01-09 18:55:24 +01:00
5069649e14
Fix autoupdate after auth
...
Remove data after logout
2016-01-09 18:25:18 +01:00
ae315d388b
Merge pull request #1804 from ostcar/remove_old_search
...
Remove old haystack files
2016-01-09 17:01:42 +01:00
4a9f265b68
Used is_hidden instead of item.typ. Improve hidden filter.
...
Fixed JS error in users and assignments.
2016-01-09 16:55:21 +01:00
b7d63afc91
Remove old haystack files
2016-01-09 16:50:39 +01:00
68ec516e6f
Merge pull request #1799 from emanuelschuetze/loginText
...
Show info text in login form (Fixes #1754 )
2016-01-09 16:07:55 +01:00
363c928517
Show info text in login form ( Fixes #1754 )
2016-01-09 14:22:32 +01:00
e406b92745
Remove model field verbose names. Move help texts.
2016-01-09 14:17:51 +01:00
4b69c57c78
Merge pull request #1789 from ostcar/update_requirements
...
Update requirements
2016-01-09 12:22:41 +01:00
552998b067
Update requirements, fixt a lot of warnings
...
Set python 3.4 as minimal supported python version
2016-01-09 12:19:46 +01:00
cad252cd2b
Merge pull request #1794 from normanjaeckel/LockoutProtextion
...
Added lockout protection, see #1452 .
2016-01-09 12:19:28 +01:00
cb22071886
Added lockout protection, see #1452 .
2016-01-09 12:07:31 +01:00
308f55bb3f
Merge pull request #1782 from ostcar/search
...
Added a search on the server side.
2016-01-09 11:44:08 +01:00
75dcbab5d1
Add search on the server side.
2016-01-09 11:35:57 +01:00
6c33c60600
Merge pull request #1786 from normanjaeckel/LoginInfoView
...
Added login info text in config and view.
2016-01-09 10:24:56 +01:00
ecf561e305
Added login info text in config and view.
2016-01-09 10:01:17 +01:00
7843cc2ec0
Merge pull request #1785 from emanuelschuetze/fix-template-bugs
...
Fix template bugs
2016-01-09 01:12:51 +01:00
de77cfc38c
Fixed zooming/scrolling on slides.
2016-01-08 21:31:58 +01:00
9b78b5992b
Fix typo
2015-12-30 23:19:53 +01:00
98cd4301a6
Generate example csv import files ( Fixes #1761 )
...
- agenda csv file
- motions csv file
- users csv file
2015-12-30 23:02:20 +01:00
99b4e8c494
Merge pull request #1771 from emanuelschuetze/fix1729
...
Added whitespace before triple dots in template (Fixes #1729 )
2015-12-12 11:05:58 +01:00
63d4351c9a
Merge pull request #1773 from emanuelschuetze/csv-import
...
Improved agenda and users csv import (Fixes #1748 )
2015-12-12 11:05:03 +01:00
f5efca1d1e
Added whitespace before triple dots in template ( Fixes #1729 )
2015-12-12 10:16:44 +01:00
31c320f9ef
Improved csv import for agenda and users.
...
- Fix users list.
2015-12-12 10:12:22 +01:00
66e0fe272b
Merge pull request #1764 from normanjaeckel/DefaultPermissions
...
Deleted Django's default permissions.
2015-12-12 09:32:40 +01:00
fae3747da6
Merge pull request #1769 from normanjaeckel/LoginLogout
...
Fixed login and logout view.
2015-12-12 09:30:00 +01:00
fd90b15a0e
Merge pull request #1770 from emanuelschuetze/fix1728
...
Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728 )
2015-12-12 09:28:20 +01:00
e0e74d6c3c
Fixed login, logout and password change view.
2015-12-11 23:58:59 +01:00
041b01afe5
Login dialog behavior if guest mode enabled/disabled ( Fixes #1750 )
2015-12-11 21:18:45 +01:00
ca94a4e720
Rename template variable 'isFilter' to 'isFilterOpen' ( Fixes #1728 )
2015-12-11 19:50:50 +01:00
5d29af5f52
Improved login form.
...
- Add redirect after aborting login. (Fixes #1762 )
- Use new state paramater 'guest_enabled' for login form.
2015-12-11 13:45:53 +01:00
24cb58dc12
Added guest enabled info to WhoAmI view.
2015-12-11 13:44:58 +01:00
9001456d19
Fix user.id in password reset request ( Fixes #1752 )
2015-12-10 15:03:18 +01:00
114a38e4ee
Deleted Django's default permissions.
2015-12-10 00:31:27 +01:00
f050e04f0a
Redirect to login dialog if user is not logged in ( Fixes #1750 )
2015-12-09 20:45:52 +01:00
5c6977c46d
Template fixes
2015-12-06 17:26:10 +01:00
d987a1138d
Added motion csv import ( Fixes #1675 )
...
using pre-import checks and preview table.
2015-12-05 21:44:19 +01:00
bf940b177c
Fixed gettext strings in JavaScript.
...
- Added browser lanugage detection.
- Use gettextCatalog.getString(..) instead of gettext(..) in JS code.
- updated pot file
2015-11-30 23:52:42 +01:00
f84b8f29ac
Template and translation changes. Updated English language files.
2015-11-30 21:06:31 +01:00
fa267b68c2
New template design
...
- Great thanks to Jörn Bensch (from triagonale.de) for new base
template!
- A lot of adaptations in all templates for new design.
2015-11-30 20:36:33 +01:00
2b5c9c09b2
Template improvements
...
- use modal dialogs for new/edit views of customslide/motions/assigments
- use hover actions in all list views
- Show assignment candidate names
- support yesnoabstain/vote assignment poll
- Generic solution for open edit dialog.
2015-11-29 22:26:59 +01:00
968083e9e5
Improved related agenda items
...
- Added QuickEdit mode for related agenda items
- show/hide hidden agenda items
- Added ng-dialog for modal create/update dialogs of customslides
- use generic links for list of speakers, edit, delete, project
- Moved projector elements to sidebar of index template (In progress!
It will be improved with new base template design).
- Fixed error if chat messages is empty.
- Moved ngSanitize to base.js to use ng-bind-html in projector slides.
2015-11-25 12:18:14 +01:00
9af302ce36
Fix 'operator' error in projector view.
...
Move operator factory from users/site.js to users/base.js.
The Motion factory uses 'operator' in motions/base.js which is also
loaded on projector. So operator is required in users/base.js.
2015-11-23 22:06:54 +01:00
c5f5fbf203
Remove translations for projector exception messages.
2015-11-21 00:01:48 +01:00
1016af3c52
Updated English language files.
2015-11-20 23:23:01 +01:00
cdd1813c02
Merge pull request #1691 from emanuelschuetze/motions-permissions
...
Updated motion permission checks
2015-11-20 23:18:54 +01:00
02a67097e4
Merge pull request #1690 from emanuelschuetze/rest-password
...
Reset default password of an user in UserUpdateCtrl. (Fixes #412 )
2015-11-20 10:26:04 +01:00
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
b1e7259ce5
AngularClient: Fix operator.pasPerms() after a reload
2015-11-19 21:49:51 +01:00
e9cf2fb591
Reset default password of an user in UserUpdateCtrl. ( Fixes #412 )
2015-11-19 21:49:28 +01:00
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
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
8154b0324b
Added possibility to reset password. Work on user app in general.
2015-11-08 22:10:24 +01:00
12a08b9732
New Agenda Item
...
Changed agenda item, so it can not be manualy created, but is always created
when a custom slide, motion or assignment is created.
2015-10-29 15:44:43 +01:00
32b23df763
Split and cleaned up JS files. Added test.
2015-10-22 00:28:01 +02:00
f8cf279d82
Added JSHint to Gulp. Split up JS-Code in users app.
2015-10-21 22:44:07 +02:00
1f0ab173d3
Fix os-perms-lite to make it compatible to ng-show and ng-hide
2015-10-21 21:21:48 +02:00
fac45fbf2a
Added multiselection delete mode for users list view.
...
Fix users import: Allows multiple groups.
2015-10-15 21:09:49 +02:00
1e08e9411a
Cleaned up users app.
2015-09-21 16:23:47 +02:00
c8dfb9437b
Removed imports from openslides.users in other apps: Cleaned up agenda, assignments and motions.
2015-09-14 21:13:56 +02:00
8c48d67df0
Fixed projector.
2015-09-14 20:30:37 +02:00
5fc215c359
Fix docstrings.
2015-09-06 11:48:37 +02:00
c8bf754646
Added possibility to update your own user object. Hide default password for non admins.
2015-09-06 11:26:48 +02:00
bd51c6a52c
Added osPermLite as alternative to osPerm
2015-09-05 19:17:41 +02:00
d8e9ef5575
Merge pull request #1616 from ostcar/main_menu
...
Autogenerate the main menu.
2015-09-05 18:19:59 +02:00
2da2177c49
Autogenerate the main menu.
2015-09-05 17:23:47 +02:00
60002d9111
Added user profile view.
2015-09-05 17:22:37 +02:00
6674ea85b7
Updated js-data to 2.0
...
Added js-data relation for the motion and agenda app
Added improved load function
2015-09-04 21:05:49 +02:00
965206e1fc
Set permissions for OPTIONS requests. Fixed js-data dependency. Fixed blank in some motion model fields. Fixed error handling in agenda and core views.
2015-09-04 15:44:28 +02:00
7e404946e4
Refactored view permissions.
...
Refactored permission check for REST API viewsets.
Removed old PermissionMixin.
Cleaned up several views.py files.
2015-07-05 22:17:58 +02:00
f31925387f
Updated python requirements.
...
This included django 1.8
2015-07-02 14:51:08 +02:00
291f60ee9f
Added a way to load angular apps dynamical
2015-07-01 20:10:40 +02:00
1dbe07c041
Fix osPerms to use groups registered and anonymous
...
Fixes #1586
2015-07-01 00:32:37 +02:00
ec1d676ed9
Added initial migrations for all apps
2015-06-29 15:38:15 +02:00
16fa6bfffc
Removed the projector App
2015-06-29 15:20:28 +02:00
e042c668d5
Moved config app into the core app
2015-06-29 15:15:33 +02:00
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
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
6b5ce5ae2f
Added motion and assignment detail slide.
2015-06-24 22:12:06 +02:00
367404b20d
Added projector methods to user model
2015-06-24 13:07:49 +02:00
8075b0adbb
List of speakers with angularjs.
...
- Add/remove user to/from list
- Open/close list
2015-06-22 14:34:23 +02:00
2d6cdfa168
Merge pull request #1557 from emanuelschuetze/angular-motions
...
Updated motion list, form and detail views.
2015-06-22 14:18:09 +02:00
c4e23daccf
Fixed bug in users/projector.py.
2015-06-21 22:36:21 +02:00
9a117999ef
Updated motion list, form and detail views.
2015-06-20 10:44:00 +02:00
a0f4506c35
Merge pull request #1549 from normanjaeckel/ConfigRefactoring
...
Refactored config API. Removed form_fields. Added extra fields for HT…
2015-06-18 23:40:23 +02:00
a4c00d5ee3
Angular Client
...
* Split angular app into a site- and a projector app
* Created client slide api and slides for customslide and user
* JS-function to activate a slide
2015-06-18 23:23:34 +02:00
466fab8752
Added view to reset user's password.
2015-06-18 22:45:23 +02:00
c5fbe2e9ee
Refactored config API.
...
Removed form_field attributes.
Added extra fields for HTML rendering like label and help text.
Added fields for sorting and grouping. Removed old collection system.
Added config groups to config view via OPTIONS requests.
Regrouped all variables.
Added validation. Changed internal handling.
2015-06-18 21:13:30 +02:00
632ca2bd9a
Renamed config variables. Fixed error in settings.
2015-06-17 12:07:09 +02:00
b7abf770c7
Added two agenda import ways.
...
Note: CSV example file was updated because English csv header strings are
required now.
2015-06-16 20:29:09 +02:00
fbf7d0e43d
Remove old thinks not needed for the 2.0 release:
...
* django templates
* widgets
* views
* mppt
* main_menu
* projector 1.x api
Sorted all imports
Add a ending slash to each url with a redirect view
2015-06-16 17:07:39 +02:00
5813b8341c
Added permission check for objects required for active projector elements.
2015-06-15 18:22:15 +02:00
cb1b262c92
Fix anonymous user for rest requests
2015-06-15 15:54:39 +02:00
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
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
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
80ca3f2484
Use ui-router to handle django urls
...
See: #1453
2015-03-02 19:03:19 +01:00
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
787343d651
Fixes users password PDF view.
...
Fixes : #1496
2015-02-27 11:56:31 +01:00
2ef7c7cf29
Added 'id' to user creation response.
2015-02-25 17:16:36 +01:00
acbfd84fc5
Cleaned up users.signals. Fixed #1483 .
2015-02-25 16:12:20 +01:00
fd34055611
Updated REST API for group create, update and delete.
2015-02-17 21:24:33 +01:00
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
411213b1ce
Merge pull request #1458 from normanjaeckel/feature/rest-api/users
...
Refactoring users app.
2015-02-14 02:35:56 +01:00
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
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
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
87cd31f6a5
Updated ViewSets to Django REST Framework 3.0.5. Refactored imports from openslides/utils/rest_api.py for better overriding them later.
...
Fixed #1450 . Updated requirements.
2015-02-12 19:19:44 +01:00
c4c9322321
Rework of assignment
...
fixes : #1429 , #1345
A database recreation is needed
2015-02-12 10:14:10 +01:00
ac6f3de60d
Used AngularUI Router for more generic URL routing.
2015-02-12 09:52:07 +01:00
7171a71919
angular single page application
2015-02-05 23:06:09 +01:00
eed5c59013
Refactored serializers and autoupdate.
...
Added api for groups.
Refactored serializers now using 'id' instead of 'url'.
Rework of tornado autoupdate functionality.
Implemented extra data in SockJS messages.
2015-02-05 19:49:54 +01:00
7238b8159a
Added REST api for motion, mediafile and config app. Refactor REST api in other apps.
2015-01-31 14:15:10 +01:00
e7230b7391
New Test order.
...
* seperate unittests and integration tests
* moved old tests in seperat folder 'old'
* created a testrunner that does not create a testdatabase, if only unittests are run
* wrote some unit- and integration tests as examples
* fixed user.get_short_name() to use the sort order from config
* fixed wrong url_pattern in the user app
2015-01-24 18:00:03 +01:00
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
35024764cf
Rework of management command
2015-01-23 15:40:12 +01:00
285d8c2cfb
Use a real anonymous user object, instadt of a authentification backend
2015-01-23 15:38:14 +01:00
8b88d38ac5
Merge branch 'stable/1.7.x'
...
Conflicts:
openslides/__init__.py
openslides/assignment/views.py
openslides/motion/pdf.py
openslides/users/pdf.py
2015-01-23 02:33:17 +01:00
18fe7e2d89
Update to bootstrap 3.3.1.
2015-01-21 12:23:32 +01:00
4821a3b59b
Added api for assignments.
...
Also small changes in agenda REST api.
2015-01-17 22:46:23 +01:00
0d56424c90
Refactored REST api in agenda, core and users app.
2015-01-17 15:58:51 +01:00
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
8cb70017da
Added api viewset for users.
2015-01-17 08:51:57 +01:00
06919fa543
Fixed bug in ResetPasswordView. Fixed #1391 .
2015-01-06 16:27:50 +01:00
34b6ca80f3
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
openslides/users/signals.py
2015-01-06 13:04:07 +01:00
dcd8b7a639
Merge branch 'stable/1.6.x' into 'master'.
...
Conflicts:
CHANGELOG
openslides/agenda/views.py
openslides/assignment/views.py
openslides/mediafile/views.py
openslides/users/views.py
openslides/utils/views.py
tests/motion/test_pdf.py
tests/settings.py
2015-01-02 22:11:56 +01:00
4f04223e08
Added Django's application configuration.
...
Used customized AppConfig classes in openslides.core, openslides.account,
openslides.projector, openslides.agenda, openslides.motion, openslides.assignment,
openslides.users, openslides.mediafile, openslides.config.
Refactored loading of signals, template signals and slides.
2014-12-10 17:16:58 +01:00
88222857bb
Use the new django transaction API
...
fixes #1027
2014-10-19 10:52:48 +02:00
5c6f7a41a8
Merge branch 'stable/1.6.x'
...
Conflicts:
tests/assignment/test_views.py
2014-10-18 08:53:51 +02:00
c454faef94
Updated Django to 1.7.x
2014-10-14 17:14:52 +02:00
3527b0a75b
Refactory of the participant app
...
* New user model (used Django's AbstractBaseUser)
* Renamed the app to users
* removed person api
See #861
Fixed #576 #478
2014-10-12 10:06:54 +02:00
Norman Jäckel