Norman Jäckel
d816e0c045
Merge pull request #1513 from emanuelschuetze/angular-templates
...
New angular templates (part 1)
2015-05-12 14:12:10 +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
Emanuel Schütze
ccbe93c10f
Merge pull request #1514 from emanuelschuetze/new-logo
...
New OpenSlides logo.
2015-05-06 09:18:39 +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
Emanuel Schuetze
e6c3e18144
New OpenSlides logo. (Thanks to Rene!)
2015-04-17 20:34:54 +02:00
Oskar Hahn
26655f3200
Merge pull request #1511 from ostcar/agenda_rest
...
Send seperat tree for agenda items
2015-04-17 17:16:36 +02:00
Oskar Hahn
505e587d6f
Send tree for agenda items
2015-04-17 16:46:13 +02:00
Norman Jäckel
1bc6aef205
Merge pull request #1510 from ostcar/rename-apps
...
Rename apps.
2015-03-29 23:15:30 +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
Oskar Hahn
c66c0c738b
Merge pull request #1507 from normanjaeckel/DevDir
...
Changed development settings path.
2015-03-15 11:59:37 +01: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
Norman Jäckel
146548a309
Merge pull request #1466 from ostcar/django_urls
...
Use django url patterns in angular
2015-03-03 11:27:05 +01:00
Oskar Hahn
80ca3f2484
Use ui-router to handle django urls
...
See: #1453
2015-03-02 19:03:19 +01:00
Oskar Hahn
962dd209f5
Merge pull request #1449 from emanuelschuetze/angularjs
...
User templates with angularjs
2015-03-02 18:55:34 +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
Norman Jäckel
acc01bd2b6
Merge pull request #1498 from ostcar/ui-router-pattern
...
Altered ui-router definitions
2015-03-01 14:47:34 +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
Norman Jäckel
d0d01ed71c
Merge pull request #1497 from ostcar/users-password-pdf
...
Fixed users password pdf view.
2015-02-27 12:53:18 +01:00
Oskar Hahn
787343d651
Fixes users password PDF view.
...
Fixes : #1496
2015-02-27 11:56:31 +01:00
Norman Jäckel
abe4d32859
Merge pull request #1481 from normanjaeckel/Tools
...
Added coverage and flake8 configuration to setup.cfg.
2015-02-27 11:32:25 +01:00
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
cf11e85f9a
Added coverage and flake8 configuration to setup.cfg. Cleaned up these tools.
2015-02-25 19:39:57 +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