ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,525 Commits 6 Branches 42 Tags 64 MiB
fe64941aab
Commit Graph

319 Commits

Author SHA1 Message Date
Emanuel Schuetze
d0b9b2a492 Added reduced projector logo. 
Added openslides blue color value to logo README.
 2016-01-13 10:47:27 +01:00
Emanuel Schuetze
09b88fb4a6 Redesign projector template. 2016-01-13 10:28:49 +01:00
Emanuel Schuetze
93e2296bdc A lot of template fixes 
- Reset password from current (unsaved) value of default_password.
- MotionForm, AssignmentForm and UserForm factory for open ngDialog.
  Fixes edit url redirect problem.
- Added back-to-detail-view-button to list of speakers view.
- Add translation context.
- Fixed (missing) translation strings.
- Fixed tags and category list views.
- motion detail: Use select box for changing state.
- motion slide updated
 2016-01-13 10:22:24 +01:00
Emanuel Schuetze
f2375008d8 Added attachments for customslide views. (Fixes #1681) 2016-01-10 11:55:37 +01:00
Norman Jäckel
8a6ca904dc Added attachments to custom slides. 2016-01-10 11:51:00 +01:00
Norman Jäckel
ca659351eb Merge pull request #1825 from emanuelschuetze/fixTemplates 
Fixed permissions in list views.
 2016-01-10 01:07:51 +01:00
Oskar Hahn
87d647ac4d Merge pull request #1824 from ostcar/fix_tornado 
Fix tornado
 2016-01-10 01:03:16 +01:00
Emanuel Schuetze
071b0a76be Fixed permissions in list views. 2016-01-10 01:02:13 +01:00
Norman Jäckel
7005ab7f64 Disabled autocomplete for chat box. 2016-01-10 00:46:23 +01:00
Oskar Hahn
4bc0b1d19c fix autoupdate and hide some groups in user edit form 2016-01-10 00:44:02 +01:00
Oskar Hahn
c30116f5c1 Merge pull request #1815 from emanuelschuetze/candidateElected 
Mark candidate as elected. Updated assignment detail.
 2016-01-09 22:37:39 +01:00
Emanuel Schuetze
2c46d3ae0a Mark candidate as elected. Updated assignment detail. 2016-01-09 22:35:04 +01:00
Oskar Hahn
3ae6482863 Fix autoupdate of config 2016-01-09 22:13:55 +01:00
Oskar Hahn
2f8138f672 Merge pull request #1811 from normanjaeckel/SquishMigrations 
Squished all migrations.
 2016-01-09 21:04:54 +01:00
Norman Jäckel
8d1c351c9a Squished all migrations. 2016-01-09 19:10:57 +01:00
Norman Jäckel
544efdb06e Merge pull request #1806 from ostcar/fix_autoupdate_after_reload 
Fix autoupdate after auth
 2016-01-09 18:55:24 +01:00
Oskar Hahn
5069649e14 Fix autoupdate after auth 
Remove data after logout
 2016-01-09 18:25:18 +01:00
Norman Jäckel
193d318bc9 Merge pull request #1803 from ostcar/os_filter 
Add osFilter that filters for an explicit text
 2016-01-09 17:07:31 +01:00
Emanuel Schuetze
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
Oskar Hahn
e3b6fd8d6d Add osFilter that filters for an explicit text 2016-01-09 16:45:47 +01:00
Norman Jäckel
68ec516e6f Merge pull request #1799 from emanuelschuetze/loginText 
Show info text in login form (Fixes #1754)
 2016-01-09 16:07:55 +01:00
Emanuel Schuetze
11470d3b57 Move welcome config values to general section. 
Use textarea for welcome text.
 2016-01-09 16:05:06 +01:00
Emanuel Schuetze
b035ee7d7c Improved legal notice page (Fixes #267) 2016-01-09 14:44:49 +01:00
Oskar Hahn
c2041dca6f Merge pull request #1796 from normanjaeckel/MoveTranslations 
Remove model field verbose names. Move help texts.
 2016-01-09 14:25:42 +01:00
Emanuel Schuetze
363c928517 Show info text in login form (Fixes #1754) 2016-01-09 14:22:32 +01:00
Norman Jäckel
e406b92745 Remove model field verbose names. Move help texts. 2016-01-09 14:17:51 +01:00
Emanuel Schuetze
54b1c8e350 Show agenda titles with correct numbering 2016-01-09 14:01:30 +01:00
Oskar Hahn
622dadd4ef Merge pull request #1795 from normanjaeckel/StaticImpressumPage 
Added config field for legal notes.
 2016-01-09 13:22:54 +01:00
Norman Jäckel
d7e39be708 Added config field for legal notes. 2016-01-09 13:01:18 +01:00
Oskar Hahn
4b69c57c78 Merge pull request #1789 from ostcar/update_requirements 
Update requirements
 2016-01-09 12:22:41 +01:00
Oskar Hahn
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
Oskar Hahn
091c08dabd Merge pull request #1788 from emanuelschuetze/fixSlides 
Fix slide templates
 2016-01-09 12:01:11 +01:00
Oskar Hahn
308f55bb3f Merge pull request #1782 from ostcar/search 
Added a search on the server side.
 2016-01-09 11:44:08 +01:00
Oskar Hahn
75dcbab5d1 Add search on the server side. 2016-01-09 11:35:57 +01:00
Emanuel Schuetze
5cab3bf3dc Added indentation of subitems on agenda slide (Fixes #1716) 2016-01-09 10:34:34 +01:00
Norman Jäckel
6c33c60600 Merge pull request #1786 from normanjaeckel/LoginInfoView 
Added login info text in config and view.
 2016-01-09 10:24:56 +01:00
Norman Jäckel
ecf561e305 Added login info text in config and view. 2016-01-09 10:01:17 +01:00
Emanuel Schuetze
de77cfc38c Fixed zooming/scrolling on slides. 2016-01-08 21:31:58 +01:00
Norman Jäckel
d3e8c68a51 Merge pull request #1775 from emanuelschuetze/templateStuff 
Fixed some template bugs (#1727)
 2015-12-19 11:53:53 +01:00
Oskar Hahn
66e0fe272b Merge pull request #1764 from normanjaeckel/DefaultPermissions 
Deleted Django's default permissions.
 2015-12-12 09:32:40 +01:00
Emanuel Schuetze
c275b08178 Fixed some template bugs (#1727) 
- Fixed z-index of messages and countdowns.
- Sidebar: Live view open by default. Improve section style.
- Set default value for open_posts in assignments create form.
- Redefine default values in motions create form.
 2015-12-12 00:30:05 +01:00
Emanuel Schuetze
041b01afe5 Login dialog behavior if guest mode enabled/disabled (Fixes #1750) 2015-12-11 21:18:45 +01:00
Emanuel Schuetze
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
Norman Jäckel
24cb58dc12 Added guest enabled info to WhoAmI view. 2015-12-11 13:44:58 +01:00
Norman Jäckel
114a38e4ee Deleted Django's default permissions. 2015-12-10 00:31:27 +01:00
Emanuel Schuetze
f050e04f0a Redirect to login dialog if user is not logged in (Fixes #1750) 2015-12-09 20:45:52 +01:00
Norman Jäckel
1b1e8f8ba2 Used our own repository for Open Sans font. 2015-12-06 23:55:30 +01:00
Emanuel Schuetze
5c6977c46d Template fixes 2015-12-06 17:26:10 +01:00
Oskar Hahn
37cd431aa9 Merge pull request #1737 from emanuelschuetze/motion-csv-import 
Add motion csv import (Fixes #1675)
 2015-12-05 23:53:08 +01:00
Emanuel Schuetze
d987a1138d Added motion csv import (Fixes #1675) 
using pre-import checks and preview table.
 2015-12-05 21:44:19 +01:00
Emanuel Schuetze
f5452082f0 Use transparent favicon. 
- Added favicon to projector template.
 2015-12-02 14:20:59 +01:00
Norman Jäckel
696bfb0883 Fixed comment. 2015-12-01 15:45:35 +01:00
Emanuel Schuetze
b81704a88f Fixed translations in agendaSupplement. 2015-12-01 13:45:54 +01:00
Emanuel Schuetze
e23121ed0f Updated language menu. 
- improved header menu style
- define new Languages factory
- make it easier to define new languages
 2015-12-01 12:06:15 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
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
Emanuel Schuetze
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
Oskar Hahn
9a7dea26e0 Angular: Eject assignment related users before a assignment is updated 2015-11-27 22:26:30 +01:00
Emanuel Schuetze
35a8042759 Assignments template improvements 
- list view with quickview
- ngDialog for create/update view
- candidates
- polls
 2015-11-27 00:19:37 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
3c0fcfebac Reworked on chatbox in base template. 2015-11-22 22:46:18 +01:00
Norman Jäckel
b1dfd2a4e9 Added first chatbox draft on client side. 2015-11-22 22:45:59 +01:00
Norman Jäckel
c5f5fbf203 Remove translations for projector exception messages. 2015-11-21 00:01:48 +01:00
Norman Jäckel
1016af3c52 Updated English language files. 2015-11-20 23:23:01 +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
Norman Jäckel
8154b0324b Added possibility to reset password. Work on user app in general. 2015-11-08 22:10:24 +01:00
Norman Jäckel
03fcf950ff Updated logo help text. 2015-11-06 17:25:25 +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
Norman Jäckel
f8cf279d82 Added JSHint to Gulp. Split up JS-Code in users app. 2015-10-21 22:44:07 +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
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
Norman Jäckel
30e390dcfb Added API view for server time. 2015-09-24 21:28:30 +02:00
Norman Jäckel
e646cce91e Added scale and scroll, up, down and reset. Fixed #1633. 2015-09-18 10:31:22 +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
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
Norman Jäckel
5c4c0367a1 Updated Projector config field and control views. 2015-09-06 14:59:33 +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
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
fbc57cc23a Reload config after login 
Fix errors by saving tags to motions
 2015-09-05 11:26:41 +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
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
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
291f60ee9f Added a way to load angular apps dynamical 2015-07-01 20:10:40 +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
e042c668d5 Moved config app into the core app 2015-06-29 15:15:33 +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
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
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
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
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
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
5813b8341c Added permission check for objects required for active projector elements. 2015-06-15 18:22:15 +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
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
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
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
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
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
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
ac6f3de60d Used AngularUI Router for more generic URL routing. 2015-02-12 09:52:07 +01:00
Oskar Hahn
7171a71919 angular single page application 2015-02-05 23:06:09 +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
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
35024764cf Rework of management command 2015-01-23 15:40:12 +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
afc2b246db Fixed bug in chatbox. 2015-01-21 17:24:39 +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
Oskar Hahn
1a1d072454 remove update_projector and add inform_changed_data 2015-01-17 15:16:49 +01:00