ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,711 Commits 6 Branches 42 Tags 64 MiB
945a832e61
Commit Graph

2711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
945a832e61 Merge pull request #1494 from normanjaeckel/UpdateChangelog 
Updated Changelog.
 2015-02-27 09:22:56 +01:00
Norman Jäckel
0bf486bca4 Updated Changelog. 2015-02-25 19:40:18 +01:00
Norman Jäckel
35d522d452 Merge pull request #1493 from normanjaeckel/UserCreate 
Added 'id' to user creation response.
 2015-02-25 19:38:16 +01:00
Norman Jäckel
2ef7c7cf29 Added 'id' to user creation response. 2015-02-25 17:16:36 +01:00
Norman Jäckel
17afca4568 Merge pull request #1487 from normanjaeckel/CleanUp2 
Cleaned up urls.py. Fixed #1472.
 2015-02-25 17:15:40 +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
74fa2e12f5 Merge pull request #1486 from normanjaeckel/CleanUp 
Cleaned up users.signals. Fixed #1483.
 2015-02-25 16:54:50 +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
7ddd66b593 Merge pull request #1480 from ostcar/csrf_mixin 
Added utils.views.CSRFMixin to append the csrf token to a view.
 2015-02-18 15:10:46 +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
7f8ad4bfcc Merge pull request #1416 from ostcar/isort 
add isort
 2015-02-17 07:44:29 +01:00
Oskar Hahn
8ad6accaa6 Add isort1 
Do not do any travis checks, but append the commands, so that we can use isort to clean up the code
 2015-02-17 07:41:24 +01:00
Norman Jäckel
816fe3c846 Merge pull request #1478 from normanjaeckel/Release_1.7.0 
Release 1.7
 2015-02-16 14:35:05 +01:00
Norman Jäckel
00a9709bf8 Merge pull request #1479 from normanjaeckel/FixCommitAngularAuth 
Implemented auth via AngularJS.
 2015-02-16 11:47:14 +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
a6d0c88730 Merge pull request #1463 from normanjaeckel/UpdateChangelog 
Updated CHANGELOG.
 2015-02-14 03:26:22 +01:00
Norman Jäckel
f9ca8d1df1 Updated CHANGELOG. 2015-02-14 02:43:19 +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
Oskar Hahn
48c4f8dcf5 Merge pull request #1456 from normanjaeckel/fix1450 
Updated ViewSets to Django REST Framework 3.0.5.
 2015-02-12 21:10:13 +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
2859980922 Merge pull request #1446 from ostcar/assignments 
rework of assignment
 2015-02-12 10:17:24 +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
85dfbb185f Merge pull request #1447 from ostcar/ui-router 
use ui router for more generic url routing
 2015-02-12 10:09:38 +01:00
Oskar Hahn
ac6f3de60d Used AngularUI Router for more generic URL routing. 2015-02-12 09:52:07 +01:00
Oskar Hahn
9d8c85be68 Merge pull request #1445 from ostcar/agenda-small-rework 
small agenda improvments
 2015-02-09 20:33:11 +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
Norman Jäckel
89e5434508 Merge pull request #1438 from ostcar/angular 
Used AngularJS.

(Pull request merged as first draft for refactoring OpenSlides as single page app. Details have to be discussed later.)
 2015-02-06 21:46:35 +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
Oskar Hahn
e92666d473 Merge pull request #1442 from normanjaeckel/TornadoAutoupdate 
Rework of tornado autoupdate functionality
 2015-02-05 20:05:12 +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
c6705e687a Merge pull request #1436 from ostcar/travis_cache 
Speed up travis with cache for pip and npm.
 2015-02-05 14:59:28 +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
117c34c5f0 Merge pull request #1427 from normanjaeckel/DjangoRESTFrameworkConfigMediafile 
Django REST framework: Motion, mediafile, config app and rework.
 2015-01-31 14:25:53 +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
2e9b05eb5a Speed up travis with cache for pip and node 2015-01-26 02:05:14 +01:00
Norman Jäckel
79577c9b8e Merge pull request #1435 from ostcar/fix_assignment_poll_view 
Fixed AssignmentPollUpdateView.
 2015-01-25 19:04:47 +01:00