8cb74c5e7a
Simplified installing of JS and CSS libs. Fixed #1906 .
2016-02-05 23:27:15 +01:00
eef82d7e72
Merge pull request #1936 from emanuelschuetze/pagination
...
Add Pagination and improve import.
2016-02-03 15:24:21 +01:00
59294b1fcb
Merge pull request #1937 from emanuelschuetze/mediafileImprovements
...
Mediafile: Improvements for pdf presentaiton and list view.
2016-02-03 15:11:41 +01:00
af023f30bc
Mediafile: Improvements for pdf presentaiton and list view.
2016-02-03 00:46:17 +01:00
8ae3e1d468
Add Pagination and improve import.
...
- Use Pagination for users and item list and users import table.
- Improve agenda import: Allow to define agenda item stuff like
duration, comment, type.
2016-02-02 22:48:06 +01:00
09cbe8c9e4
Fix the autoupdate
2016-02-01 23:21:50 +01:00
7d6c202200
Merge pull request #1927 from emanuelschuetze/autoconnect
...
Refactor reconnect function of autoupdate.
2016-02-01 21:25:58 +01:00
1216ea99d3
Refactor reconnect function of autoupdate.
2016-01-29 16:30:00 +01:00
3cd49704fc
Use correct special html character for projector template title.
2016-01-29 09:14:26 +01:00
da30be5184
Merge pull request #1919 from emanuelschuetze/fix1904
...
Fixed TypeError caused by #1904 .
2016-01-27 23:40:53 +01:00
587f397171
Fixed TypeError caused by #1904 .
...
"Resource.relationList is undefinded" after activating a slide.
2016-01-27 23:35:24 +01:00
1b1d41b9b8
Updated angular-gettext language file.
2016-01-27 22:33:05 +01:00
70d32f1e47
Merge pull request #1914 from emanuelschuetze/fixGulp
...
Fixed gulp 'pot' task. Fixed typos in translation strings.
2016-01-27 22:23:29 +01:00
fea0287a20
Updated translations.
2016-01-27 22:16:54 +01:00
0ce0b9cd18
Fixed gulp 'pot' task. Fixed typos in translation strings.
2016-01-27 22:11:24 +01:00
352e32334e
Merge pull request #1901 from emanuelschuetze/fix1895
...
Translate permission strings. (Fixes #1895 )
2016-01-27 20:42:07 +01:00
e041656115
Merge pull request #1903 from emanuelschuetze/pdfMediafilePresentation
...
Mediafile pdf presentation with angular-pdf and pdf.js (Fixes #1664 ).
2016-01-27 20:40:23 +01:00
d3ed15db29
Mediafile pdf presentation with angular-pdf and pdf.js ( Fixes #1664 ).
...
Thanks to André Böhlke for contribution core functionality!
Some additional template improvements by Emanuel.
2016-01-27 20:36:21 +01:00
f12a1425c0
Merge pull request #1908 from emanuelschuetze/unconnectBar
...
Show red bar on top if server is offline (Fixes #1853 )
2016-01-27 20:25:33 +01:00
deea222434
Translate permission strings. ( Fixes #1895 )
...
Remove unused gettextCatalog content provider.
2016-01-27 20:23:53 +01:00
3ba93c2352
Merge pull request #1904 from ostcar/remove-ds-dependencies
...
Remove DS dependencies
2016-01-27 20:17:44 +01:00
14e2fedd6b
Show red bar on top if server is offline ( Fixes #1853 )
2016-01-27 20:14:10 +01:00
3b508303a1
Reconnect at once. Do not wait 5 seconds. Add a connected flag to the root scope
...
Fixes #1854
See also #1853
2016-01-27 17:55:28 +01:00
bd4c8920e9
Remove DS dependencies
2016-01-27 17:28:41 +01:00
23503eb4ba
Several template fixes and clean up
...
- Use ng-cloak for hide template parts while loading.
- Set html lang attribute dynamically (Fixes #1546 )
- Clean up: Rename 'dashboard' to 'home'.
- Show duration of speech in minutes. (Fixes #1882 )
- Save agenda specific stuff for customslides. (Fixes #1887 )
- Remove title from QuickEdit from.
- Checkbox for item.closed is now visible for manager only.
- Agenda list view: Show list of speakers link also for normal users.
- Improve slide templates: Show agenda item number and subtitle.
- Fixed agenda title for motions and assignments.
(Don't load motions and assignmetn in agenda app.)
- Added missing seach template.
2016-01-27 12:10:40 +01:00
2a9e0b4b81
Implement full text search (client side) Fixes #1699
2016-01-27 00:16:30 +01:00
87e3c536da
Deleted Django default permission of some apps. Fixed #1643 .
2016-01-25 14:48:54 +01:00
0d1a8aa174
Merge pull request #1878 from emanuelschuetze/fix1783
...
Add checkbox 'show as agenda item'. (Fixes #1783 )
2016-01-24 22:16:43 +01:00
9ddc558085
Add checkbox 'show as agenda item'. ( Fixes #1783 )
...
Used for customslide, motion and assignment forms.
Changed default value of agenda.type to HIDDEN_ITEM (=2) in model.py.
2016-01-23 20:22:56 +01:00
4d6aade16a
Send option request for config page just once ( Fixes #1813 )
...
Add permission check in config template.
2016-01-23 01:02:05 +01:00
94366f35ab
Use os-perms instead of os-perms-lite. Removed os-perms-lite. ( Fixes #1826 )
2016-01-21 22:26:11 +01:00
646bf52ea7
Show countdown in red if negative (projector and control panel).
...
Show 00:00 instead of --:--
2016-01-21 21:43:02 +01:00
b291473c61
Set guest_enabled in rootScope to use it in login form after reload. ( Fixes #1849 )
...
- Justified login form elements (same width).
2016-01-21 21:14:55 +01:00
42f9cfdf45
List views: show number of filtered AND total rows.
...
Improve css animation for ng-enter/ng-leave.
2016-01-21 20:43:04 +01:00
76dc29cddf
Use uib-alert instead of deprecated alert tag.
2016-01-18 21:09:28 +01:00
851252dfe8
Format all JavaScript functions in same syntax.
...
Required for use minified js code in production mode.
2016-01-17 22:32:48 +01:00
0e24d9b632
Modify motion/assignment/customslide in form dialog without updating list/detail view.
2016-01-17 21:19:32 +01:00
440a38b387
Merge pull request #1843 from emanuelschuetze/motionsTemplate
...
Motion template fixes
2016-01-14 08:49:48 +01:00
bc60b7e7ca
Several template improvements
...
- Move Languages services from site.js to base.js
Now the detected browser language is used as projector language.
- Use verboseName instead of agendaSupplement.
- Show submitters on projector (load Users on Controller).
- Improve list of speakers (slide and item detail).
2016-01-14 00:14:48 +01:00
3fc82a596c
Fixed server error in config update view. Fixed #1828 .
2016-01-13 15:04:47 +01:00
2f8c894104
Motion template fixes
...
- Fix missing workflows in Motion create form.
- redesign motion meta box
- use table format for motion voting results
2016-01-13 14:32:15 +01:00
007a92a96b
Merge pull request #1841 from emanuelschuetze/ProjectorRedesign
...
Redesign projector template (Fixes #1787 )
2016-01-13 11:28:06 +01:00
aa6a099840
Merge pull request #1809 from emanuelschuetze/CustomSlideAttachment
...
Custom slide attachment
2016-01-13 11:26:46 +01:00
d0b9b2a492
Added reduced projector logo.
...
Added openslides blue color value to logo README.
2016-01-13 10:47:27 +01:00
09b88fb4a6
Redesign projector template.
2016-01-13 10:28:49 +01:00
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
f2375008d8
Added attachments for customslide views. ( Fixes #1681 )
2016-01-10 11:55:37 +01:00
8a6ca904dc
Added attachments to custom slides.
2016-01-10 11:51:00 +01:00
ca659351eb
Merge pull request #1825 from emanuelschuetze/fixTemplates
...
Fixed permissions in list views.
2016-01-10 01:07:51 +01:00
87d647ac4d
Merge pull request #1824 from ostcar/fix_tornado
...
Fix tornado
2016-01-10 01:03:16 +01:00
071b0a76be
Fixed permissions in list views.
2016-01-10 01:02:13 +01:00
7005ab7f64
Disabled autocomplete for chat box.
2016-01-10 00:46:23 +01:00
4bc0b1d19c
fix autoupdate and hide some groups in user edit form
2016-01-10 00:44:02 +01:00
c30116f5c1
Merge pull request #1815 from emanuelschuetze/candidateElected
...
Mark candidate as elected. Updated assignment detail.
2016-01-09 22:37:39 +01:00
2c46d3ae0a
Mark candidate as elected. Updated assignment detail.
2016-01-09 22:35:04 +01:00
3ae6482863
Fix autoupdate of config
2016-01-09 22:13:55 +01:00
2f8138f672
Merge pull request #1811 from normanjaeckel/SquishMigrations
...
Squished all migrations.
2016-01-09 21:04:54 +01:00
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
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
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
e3b6fd8d6d
Add osFilter that filters for an explicit text
2016-01-09 16:45:47 +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
11470d3b57
Move welcome config values to general section.
...
Use textarea for welcome text.
2016-01-09 16:05:06 +01:00
b035ee7d7c
Improved legal notice page ( Fixes #267 )
2016-01-09 14:44:49 +01:00
c2041dca6f
Merge pull request #1796 from normanjaeckel/MoveTranslations
...
Remove model field verbose names. Move help texts.
2016-01-09 14:25:42 +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
54b1c8e350
Show agenda titles with correct numbering
2016-01-09 14:01:30 +01:00
622dadd4ef
Merge pull request #1795 from normanjaeckel/StaticImpressumPage
...
Added config field for legal notes.
2016-01-09 13:22:54 +01:00
d7e39be708
Added config field for legal notes.
2016-01-09 13:01:18 +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
091c08dabd
Merge pull request #1788 from emanuelschuetze/fixSlides
...
Fix slide templates
2016-01-09 12:01:11 +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
5cab3bf3dc
Added indentation of subitems on agenda slide ( Fixes #1716 )
2016-01-09 10:34:34 +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
de77cfc38c
Fixed zooming/scrolling on slides.
2016-01-08 21:31:58 +01:00
d3e8c68a51
Merge pull request #1775 from emanuelschuetze/templateStuff
...
Fixed some template bugs (#1727 )
2015-12-19 11:53:53 +01:00
66e0fe272b
Merge pull request #1764 from normanjaeckel/DefaultPermissions
...
Deleted Django's default permissions.
2015-12-12 09:32:40 +01:00
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
041b01afe5
Login dialog behavior if guest mode enabled/disabled ( Fixes #1750 )
2015-12-11 21:18:45 +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
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
1b1e8f8ba2
Used our own repository for Open Sans font.
2015-12-06 23:55:30 +01:00
5c6977c46d
Template fixes
2015-12-06 17:26:10 +01:00
37cd431aa9
Merge pull request #1737 from emanuelschuetze/motion-csv-import
...
Add motion csv import (Fixes #1675 )
2015-12-05 23:53:08 +01:00
d987a1138d
Added motion csv import ( Fixes #1675 )
...
using pre-import checks and preview table.
2015-12-05 21:44:19 +01:00
f5452082f0
Use transparent favicon.
...
- Added favicon to projector template.
2015-12-02 14:20:59 +01:00
696bfb0883
Fixed comment.
2015-12-01 15:45:35 +01:00
b81704a88f
Fixed translations in agendaSupplement.
2015-12-01 13:45:54 +01:00
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
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
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
9a7dea26e0
Angular: Eject assignment related users before a assignment is updated
2015-11-27 22:26:30 +01:00
35a8042759
Assignments template improvements
...
- list view with quickview
- ngDialog for create/update view
- candidates
- polls
2015-11-27 00:19:37 +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
3c0fcfebac
Reworked on chatbox in base template.
2015-11-22 22:46:18 +01:00
b1dfd2a4e9
Added first chatbox draft on client side.
2015-11-22 22:45:59 +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
e3f57a250c
Use custom ckeditor options
2015-11-17 23:25:09 +01:00
d299579f16
Added CKEditor to custom slide create and edit form.
2015-11-17 23:25:09 +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
c379544e97
Fixed motion states, handled workflow field.
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
03fcf950ff
Updated logo help text.
2015-11-06 17:25:25 +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
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
30e390dcfb
Added API view for server time.
2015-09-24 21:28:30 +02:00
e646cce91e
Added scale and scroll, up, down and reset. Fixed #1633 .
2015-09-18 10:31:22 +02:00
264895b773
Configure js-data for projector elements to "replace" on inject.
...
fixes #1632
2015-09-17 12:04:45 +02:00
187cb0c42f
Fixed blue line for active projector elements.
2015-09-16 23:59:20 +02:00
7f9c8b6a38
Agenda item list: new multiselect delete mode
...
Remove action column.
2015-09-14 20:35:24 +02:00
8c48d67df0
Fixed projector.
2015-09-14 20:30:37 +02:00
6d76454925
Added model, serializer and viewset for chat messages.
2015-09-07 17:13:42 +02:00
5c4c0367a1
Updated Projector config field and control views.
2015-09-06 14:59:33 +02:00
2c64a161ac
fix projector
2015-09-06 10:24:15 +02:00
973d3fa653
Merge pull request #1618 from normanjaeckel/Projector
...
Added UUID to projector elements. Added update view.
2015-09-05 21:23:00 +02:00
47a151c71e
Added UUID to projector elements. Added update view.
2015-09-05 21:19:53 +02:00
d8e9ef5575
Merge pull request #1616 from ostcar/main_menu
...
Autogenerate the main menu.
2015-09-05 18:19:59 +02:00
c54b00c5f4
Merge pull request #1613 from emanuelschuetze/user-profile
...
User settings profile view
2015-09-05 18:19:17 +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
f802fde7de
Merge pull request #1614 from normanjaeckel/BundleCountDown
...
Bundle countdown with list of speakers. Fixed #1541 .
2015-09-05 17:12:22 +02:00
8691608c5d
Fix javascript syntax
2015-09-05 16:15:25 +02:00
719b5ffedd
Bundle countdown with list of speakers. Fixed #1541 .
2015-09-05 15:07:03 +02:00
fbc57cc23a
Reload config after login
...
Fix errors by saving tags to motions
2015-09-05 11:26:41 +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
291f60ee9f
Added a way to load angular apps dynamical
2015-07-01 20:10:40 +02:00
bc74a2983c
Fixed typo. Removed unused config.js.
2015-06-29 20:23:10 +02:00
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
6f985ef483
Use item-detail and item-list slides for agenda app.
2015-06-29 16:45:46 +02:00
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
e042c668d5
Moved config app into the core app
2015-06-29 15:15:33 +02:00
c22791d6c9
Merge pull request #1573 from emanuelschuetze/slides
...
Agenda item slide template. Some template improvements.
2015-06-27 09:48:02 +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
6ea14cd2c6
Angular template for config app.
...
Added directive for config fields
2015-06-25 10:52:28 +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
367404b20d
Added projector methods to user model
2015-06-24 13:07:49 +02:00
95b7b16992
Merge pull request #1555 from emanuelschuetze/speakers
...
List of speakers with angularjs
2015-06-22 21:37:39 +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
f006b99caf
Added style to projector slide.
...
Added Customslide views.
2015-06-22 14:27:19 +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
211e39be2c
Added version view via REST API.
2015-06-18 21:48:20 +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
dc675e173b
Removed old static files
2015-06-18 18:24:54 +02:00
632ca2bd9a
Renamed config variables. Fixed error in settings.
2015-06-17 12:07: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
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
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
681d1115c9
Merge pull request #1499 from ostcar/autoupdate_delete
...
Autoupdate for delete views.
2015-03-01 16:52:37 +01:00
86c189c964
Autoupdate for delete views
...
Fixes : #1495
Also fixed the (example) assignment angular code
2015-03-01 08:42:47 +01:00
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
1777ac48b6
Cleaned up urls.py. Fixed #1472 . Removed use of 'django.views.i18n.javascript_catalog'.
2015-02-25 16:55:44 +01:00
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
cfdabfbb40
Added utils.views.CSRFMixin to append the csrf token to a view
...
Fixes : #1476
2015-02-17 20:09:09 +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
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
35024764cf
Rework of management command
2015-01-23 15:40:12 +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
afc2b246db
Fixed bug in chatbox.
2015-01-21 17:24:39 +01:00
18fe7e2d89
Update to bootstrap 3.3.1.
2015-01-21 12:23:32 +01:00
c5a7cc889e
Merge pull request #1411 from boehlke/master
...
Fix #1352 and fix order in motion form.
2015-01-18 09:07:24 +01:00
591d230cbb
Fix field order in motion forms.
...
Add documentation for new attribute.
Added .idea to .gitignore.
2015-01-18 01:01:38 +01:00
4821a3b59b
Added api for assignments.
...
Also small changes in agenda REST api.
2015-01-17 22:46:23 +01:00
e2e16a4c34
explicitly define fields attribute to fix deprecation warnings
2015-01-17 22:28:32 +01:00
0d56424c90
Refactored REST api in agenda, core and users app.
2015-01-17 15:58:51 +01:00
1a1d072454
remove update_projector and add inform_changed_data
2015-01-17 15:16:49 +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
7644cb9a09
Added api viewset for custom slides.
2015-01-17 08:51:54 +01:00
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
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
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
34b6ca80f3
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
openslides/users/signals.py
2015-01-06 13:04:07 +01:00
3cfb9b739b
Template improvements for tags of agenda items, motions and
...
assignments.
2015-01-05 13:57:37 +01:00
bcb1ee1213
Tags for motions, agenda items and assignments
2015-01-03 17:00:48 +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
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
32137b6523
Use python3
...
python3.3 and python3.4 are supported
2014-08-24 21:21:11 +02:00
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
2bfa5f3a72
Prepared for release.
...
Small style changes, CHANGELOG and README.rst update.
2014-05-19 22:55:54 +02:00
bf8bb31cdb
Merge pull request #1298 from emanuelschuetze/fix-995
...
Improved html templates for mobile devices (responsive).
2014-05-19 22:17:26 +02:00
16a6ad4a9e
Merge pull request #1278 from rolandgeider/ckeditor
...
Replace own CKeditor with dedicated app
2014-05-19 15:15:54 +02:00
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
e9d52245cb
Replace own CKeditor with dedicated app
2014-05-19 00:00:18 +02:00
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
6cb99d9128
Fixed #1104 (Enable copy/paste in dashboard widgets)
2014-05-18 20:42:29 +02:00
f0572551b3
Fix default-slide-preview-url
...
Fix #1246
2014-05-17 13:30:37 +02:00
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
ecf0e8b0d7
Cleaned up some widgets and the base.css. Removed icon definitions.
2014-05-15 17:23:46 +02:00
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
921e4ab2bd
Merge pull request #1268 from emanuelschuetze/translationstrings
...
Updated translation strings.
2014-05-05 16:15:44 +02:00
9c43523f06
Updated translation strings.
...
Improved shortcut countdown layout.
2014-05-04 20:49:05 +02:00
4af6fe1c9a
Fix #1253 data table in motion overview displayed incorrectly
2014-05-04 16:40:50 +02:00
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
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
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
42796f6118
Added global chatbox for managers.
2014-04-27 20:58:22 +02:00
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
3d092f6dcc
countdown shortcuts
2014-04-27 19:48:57 +02:00
78077e4ab1
Fix syntax and style errors and errors after deficient merge conflic
...
resolving after branch merging.
2014-04-08 21:02:09 +02:00
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
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
e7f67457db
Regrouped config collections and pages. Fixed #1201 .
2014-03-13 00:41:57 +01:00
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
ce8274fb53
Inserted command line option to translate config strings during database setup. Fixed #460 .
2014-01-31 02:03:43 +01:00
2392c1ab36
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-28 08:32:26 +01:00
cfa35241e1
Fixed #1138 : Wrong file for projectors logo
2014-01-27 21:15:53 +01:00
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
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
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
bdf1679eb0
Rename classes in the config api.
...
Also change attributes for config collection without view.
2013-12-06 10:47:20 +01:00
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
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
c34b407945
Fix templatetag, #1077 .
2013-11-19 17:57:03 +01:00
06b91b89bb
Fixed typo (titel->title).
2013-11-12 10:57:07 +01:00
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
cc8b573b62
Update projector when the title of the default slide changes
2013-11-06 17:28:17 +01:00
0752d476e4
Change to MIT Licence
...
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
a513477033
Fixed #948 : Use DIN A4 format and wlan ssid qrcode on access data PDF.
2013-10-25 20:51:48 +02:00
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
c63b7f995f
Clean up main.py and move code to __main__.py and utils/main.py.
2013-10-19 14:44:20 +02:00
e277b8babf
Full text search with haystack and whoosh.
...
Updated THANKS file.
Portable: Added haystack and whoosh.
2013-10-16 08:58:35 +02:00
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
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
20cf960c82
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/core/templatetags/tags.py
2013-08-19 17:54:50 +02:00
1113b6d861
Added template filter 'absolute_url'
2013-08-19 11:21:29 +02:00
967c199a56
Removed utils from INSTALLED_APPS.
...
Moved utils.management and utils.templatetags to core
2013-08-11 09:40:14 +02:00
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
d5becd5c18
Fixed #431 : Template improvements (removed unused loaded tags and check of all html template files)
2013-05-30 23:25:49 +02:00
76d7409830
Change version view. New way to get name and version from plugins.
2013-05-11 14:27:46 +02:00
b6f2176cc8
Move Version page out of config menu. Insert Link into the footer.
2013-04-25 12:37:44 +02:00
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
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
514577f7c6
Built-in Workflows are created by listening to a signal which is sent after syncdb.
2013-03-11 21:32:09 +01:00
Norman Jäckel