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

2750 Commits

Author SHA1 Message Date
Norman Jäckel
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
Emanuel Schuetze
deea222434 Translate permission strings. (Fixes #1895) 
Remove unused gettextCatalog content provider.
 2016-01-27 20:23:53 +01:00
Norman Jäckel
3ba93c2352 Merge pull request #1904 from ostcar/remove-ds-dependencies 
Remove DS dependencies
 2016-01-27 20:17:44 +01:00
Emanuel Schuetze
14e2fedd6b Show red bar on top if server is offline (Fixes #1853) 2016-01-27 20:14:10 +01:00
Norman Jäckel
b133ef2556 Merge pull request #1909 from emanuelschuetze/remarks1898 
Fixed remarks from #1898.
 2016-01-27 20:09:01 +01:00
Emanuel Schuetze
09b397f3b1 Fixed remarks from #1898. 2016-01-27 20:03:53 +01:00
Oskar Hahn
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
Oskar Hahn
bd4c8920e9 Remove DS dependencies 2016-01-27 17:28:41 +01:00
Oskar Hahn
6970235f23 Revert "Add upload feature to mediafiles module" 2016-01-27 15:28:59 +01:00
André Böhlke
3c691b9937 work on pdf presenter support 2016-01-27 19:33:30 +07:00
Emanuel Schuetze
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
Norman Jäckel
741cae028c Merge pull request #1896 from normanjaeckel/AgendaNumbering 
Fixed agenda numbering. Fixed #1892.
 2016-01-27 10:39:12 +01:00
Emanuel Schuetze
2a9e0b4b81 Implement full text search (client side) Fixes #1699 2016-01-27 00:16:30 +01:00
Norman Jäckel
fdd62cb342 Fixed agenda numbering. Fixed #1892. 2016-01-26 16:13:33 +01:00
Oskar Hahn
23ad11d232 Merge pull request #1897 from normanjaeckel/PermDisplayName 
Changed display name of permissions in GroupViewSet. Fixed #1895.
 2016-01-26 10:02:48 +01:00
Norman Jäckel
61a8c31ff5 Changed display name of permissions in GroupViewSet. Fixed #1895. 2016-01-25 22:35:23 +01:00
Norman Jäckel
87ba8fe4a5 Merge pull request #1894 from ostcar/fix_search 
Fix Search on server side
 2016-01-25 22:10:52 +01:00
Oskar Hahn
339b3891da Fix Search on server side 2016-01-25 21:12:34 +01:00
Norman Jäckel
87e3c536da Deleted Django default permission of some apps. Fixed #1643. 2016-01-25 14:48:54 +01:00
Emanuel Schuetze
f4e4166e24 Refactoring mediafile templates. (Fixes #1839, #1818, #1833) 
- uploader not visible/loaded after reload list view
- use same list view style as in other apps
- use dialog for create/edit form
- show error message in form
- edit form: remove file upload form element, add uploader form element
- create form: add uploader form element (only if user has manager permissions)
- Refactor mediafile upload method
- show not-implemented message for project pdf
- use pdf filter in list view
 2016-01-25 10:11:16 +01:00
Norman Jäckel
fecaad844b Fixed mediaifle app. 2016-01-24 22:58:45 +01:00
Norman Jäckel
673a761f6d Merge pull request #1877 from emanuelschuetze/translationFix 
Add Translation strings and updated po files
 2016-01-24 22:17:56 +01:00
Oskar Hahn
0d1a8aa174 Merge pull request #1878 from emanuelschuetze/fix1783 
Add checkbox 'show as agenda item'. (Fixes #1783)
 2016-01-24 22:16:43 +01:00
Emanuel Schuetze
4616f38fd5 Updated EN translation files. 2016-01-24 00:37:58 +01:00
Emanuel Schuetze
a8544f016d Mark all motion state names as translatable in JS. (Fixes #1864) 
Updated README for how to update translations.
 2016-01-24 00:37:54 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
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
Emanuel Schuetze
7bc1851a09 Use osFilter for motions, assignments and mediafiles. (Fixes #1784) 2016-01-21 23:20:14 +01:00
Emanuel Schuetze
b4482afa38 Show username in UserUpdateForm (Fixes #1781) 2016-01-21 22:34:18 +01:00
Emanuel Schuetze
94366f35ab Use os-perms instead of os-perms-lite. Removed os-perms-lite. (Fixes #1826) 2016-01-21 22:26:11 +01:00
Emanuel Schuetze
646bf52ea7 Show countdown in red if negative (projector and control panel). 
Show 00:00 instead of --:--
 2016-01-21 21:43:02 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
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
Emanuel Schuetze
23e7b3aaf5 Fixed translation string. 2016-01-21 19:58:50 +01:00
Emanuel Schuetze
4125efbfe6 Added agendaSupplement for agenda item title. 
Added padding-left for child item cells.
 2016-01-18 21:40:50 +01:00
Emanuel Schuetze
76dc29cddf Use uib-alert instead of deprecated alert tag. 2016-01-18 21:09:28 +01:00
Emanuel Schuetze
c4468f93ac Format timestamp in mediafile list view. 2016-01-18 21:02:37 +01:00
Emanuel Schuetze
620d0121c8 Do not show group "Registered" in users list/detail view. 2016-01-18 20:51:44 +01:00
Emanuel Schuetze
6986db5e69 Set default of use is_present/is_active to true. 2016-01-18 16:29:15 +01:00
Emanuel Schuetze
8ac3254d04 Show title in participant names. 2016-01-18 16:28:48 +01:00
Emanuel Schuetze
d083309a30 Show candidates on assignments slide. 2016-01-18 16:27:50 +01:00
Emanuel Schuetze
59a7a02cfe Added version history (Fixes #1676) 2016-01-18 00:15:28 +01:00
Emanuel Schuetze
7967da0b4e Allow 'trivial changes' in motion update (Fixes #1863) 2016-01-17 22:32:52 +01:00
Emanuel Schuetze
8bf82a0306 Added meta box in assignment detail view (Fixes #1866) 2016-01-17 22:32:52 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
0e24d9b632 Modify motion/assignment/customslide in form dialog without updating list/detail view. 2016-01-17 21:19:32 +01:00
Oskar Hahn
3ed5b2bb1b Merge pull request #1862 from emanuelschuetze/injectUser 
Modify user in form dialog without updating list/detail view.
 2016-01-15 16:02:53 +01:00
Emanuel Schuetze
e6cf28cbeb Modify user in form dialog without updating list/detail view. 
Create deep copy of user object before modify user in form dialog.
So list/detail view is not updated while editing.
Before saving inject the changed user (copy) object back into DS
store. Refresh user from DB is save request fails.
 2016-01-15 13:50:05 +01:00
Emanuel Schuetze
d8aee16fec Added missing motionpoll-form template. Fix remark in motion-detail. 2016-01-15 09:46:55 +01:00
Oskar Hahn
ffe80e8da3 Merge pull request #1852 from normanjaeckel/AssignmentFixes 
Fixed several things in assignment app. See #1838.
 2016-01-15 09:37:18 +01:00
Oskar Hahn
bac4e2c21f Merge pull request #1865 from normanjaeckel/MediafileFix 
Added possibility for non staff users to upload new files. See #1856.
 2016-01-15 09:33:06 +01:00
Oskar Hahn
4ffbd8be29 Merge pull request #1868 from normanjaeckel/TrivialChanges 
Enabled the option to disabled version for motion update requests.
 2016-01-15 09:31:30 +01:00
Oskar Hahn
00610d9a63 Merge pull request #1870 from normanjaeckel/DelegateMotionEdit 
Add quick fix to motion update view.
 2016-01-15 09:26:05 +01:00
Emanuel Schuetze
694ed6f1cc Motion template fixes 
- Add has_votes to motion serializer and add poll.has_votes check in motion detail view.
- Fix motion meta box 3 column layout.
- Added missing intents
- Show motionPoll edit form in dialog. Moved into new template.
- Clean up assignmentpoll form (like motionPoll)
 2016-01-15 00:03:29 +01:00
Norman Jäckel
1eeed1fde9 Add quick fix to motion update view. 2016-01-15 00:03:17 +01:00
Norman Jäckel
01ee197eb6 Enabled the option to disabled version for motion update requests. 2016-01-14 23:23:15 +01:00
Norman Jäckel
ae6875aa93 Added possibility for non staff users to upload new files. See #1856. 2016-01-14 22:55:43 +01:00
Oskar Hahn
440a38b387 Merge pull request #1843 from emanuelschuetze/motionsTemplate 
Motion template fixes
 2016-01-14 08:49:48 +01:00
Emanuel Schuetze
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
Norman Jäckel
441c297986 Fixed several things in assignment app. See #1838. 
Fixed "Add Me" and "Remove Me" button.

Show poll results for normal users.

Reverse ballot tab order.
 2016-01-13 16:11:01 +01:00
Norman Jäckel
3fc82a596c Fixed server error in config update view. Fixed #1828. 2016-01-13 15:04:47 +01:00
Emanuel Schuetze
cffed7aa3e Updated German translations. 2016-01-13 14:47:45 +01:00
Emanuel Schuetze
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
Emanuel Schuetze
a2721f9589 Updated translation pot files 2016-01-13 11:44:53 +01:00
Oskar Hahn
007a92a96b Merge pull request #1841 from emanuelschuetze/ProjectorRedesign 
Redesign projector template (Fixes #1787)
 2016-01-13 11:28:06 +01:00
Oskar Hahn
aa6a099840 Merge pull request #1809 from emanuelschuetze/CustomSlideAttachment 
Custom slide attachment
 2016-01-13 11:26:46 +01:00
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
Oskar Hahn
4a3cefadb1 Merge pull request #1834 from normanjaeckel/Assignment 
Assignment
 2016-01-12 14:58:07 +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
e2145f9777 Fixed candidate button. 2016-01-10 11:27:17 +01:00
Norman Jäckel
8bdbdd0b07 Merge pull request #1832 from ostcar/fix_agenda_title 
Always use item.getTitle() instead of item.title
 2016-01-10 11:26:44 +01:00
Oskar Hahn
dd120bbf91 Merge pull request #1831 from emanuelschuetze/templateFixes2 
Several fixes for 2.0b2
 2016-01-10 11:26:37 +01:00
Emanuel Schuetze
f9f3af245e Template fixes. 
- Use PATCH request for user profile update.
 2016-01-10 11:18:13 +01:00
Oskar Hahn
b6f4c3cc15 Always use item.getTitle() instead of item.title 2016-01-10 11:10:14 +01:00
Oskar Hahn
fd6190b7a7 Change the speaker management buttons in the speaker page 2016-01-10 10:26:20 +01:00
Norman Jäckel
896ac28c30 Added number of candidates to assignment list view. 2016-01-10 10:23:55 +01:00
Oskar Hahn
dc80efeee9 Fix syntaxerror in python 2016-01-10 09:47:08 +01:00
Oskar Hahn
78640a27f1 Remove item id from error message "{user} is already on the list of speakers." 2016-01-10 09:32:06 +01:00
Norman Jäckel
7dd9edec8b Merge pull request #1819 from normanjaeckel/Attachment 
Fixed mediafile model. Fixed #1808.
 2016-01-10 01:08:24 +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
Norman Jäckel
2cfa7517a8 Fixed mediafile model. Fixed #1808. 2016-01-10 01:05:57 +01:00
Oskar Hahn
87d647ac4d Merge pull request #1824 from ostcar/fix_tornado 
Fix tornado
 2016-01-10 01:03:16 +01:00
Oskar Hahn
ccf88ec4d5 Switch host and port 2016-01-10 01:02:18 +01:00
Emanuel Schuetze
071b0a76be Fixed permissions in list views. 2016-01-10 01:02:13 +01:00
Oskar Hahn
4ee2b85b76 Merge pull request #1821 from normanjaeckel/LoginView 
Fixed alerts on login form.
 2016-01-10 00:59:03 +01:00
Oskar Hahn
f4e91caeaf Merge pull request #1822 from normanjaeckel/ChatBox 
Disabled autocomplete for chat box.
 2016-01-10 00:58:45 +01:00
Oskar Hahn
ffa60e8d06 show user about me as html 2016-01-10 00:57:09 +01:00
Norman Jäckel
83ac20a704 Fixed strange empty field for sorting list of speakers. 2016-01-10 00:56:04 +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
Norman Jäckel
5a1317eb19 Fixed alerts on login form. 2016-01-10 00:38:59 +01:00
Oskar Hahn
b968a92630 fix autoupdate when openslides runs on a other port then 8000 2016-01-10 00:17:00 +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
2e104d07b7 Removed possibility to block candidates. Fixes #1708. 2016-01-09 18:05:41 +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
Norman Jäckel
ae315d388b Merge pull request #1804 from ostcar/remove_old_search 
Remove old haystack files
 2016-01-09 17:01:42 +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
b7d63afc91 Remove old haystack files 2016-01-09 16:50:39 +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
cad252cd2b Merge pull request #1794 from normanjaeckel/LockoutProtextion 
Added lockout protection, see #1452.
 2016-01-09 12:19:28 +01:00
Norman Jäckel
cb22071886 Added lockout protection, see #1452. 2016-01-09 12:07:31 +01:00
Oskar Hahn
96328f033b Merge pull request #1793 from emanuelschuetze/fixAssignmentPhasesRequest 
Send assignments OPTION request for phases once only.
 2016-01-09 12:05:57 +01:00
Oskar Hahn
db22d1f7dc Merge pull request #1777 from emanuelschuetze/fix1662 
Sort list of speakers (Fixes#1662)
 2016-01-09 12:04:38 +01:00
Oskar Hahn
091c08dabd Merge pull request #1788 from emanuelschuetze/fixSlides 
Fix slide templates
 2016-01-09 12:01:11 +01:00
Emanuel Schuetze
4faf3dd2c0 Send assignments OPTION request for phases once only. 2016-01-09 11:45:25 +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
74110453c8 Rename ItemDetailSlide to ListOfSpeakersSlide (Fixes #1576) 2016-01-09 10:55:12 +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
3304cf48c5 Sort list of speakers (Fixes #1662) 2016-01-09 09:44:01 +01:00
Norman Jäckel
7843cc2ec0 Merge pull request #1785 from emanuelschuetze/fix-template-bugs 
Fix template bugs
 2016-01-09 01:12:51 +01:00
Norman Jäckel
241d3dbc20 Sorted list of speakers. 2016-01-08 23:32:29 +01:00
Emanuel Schuetze
de77cfc38c Fixed zooming/scrolling on slides. 2016-01-08 21:31:58 +01:00
Emanuel Schuetze
9b78b5992b Fix typo 2015-12-30 23:19:53 +01:00
Emanuel Schuetze
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
Oskar Hahn
c63bd31db0 Merge pull request #1778 from emanuelschuetze/fix1718 
Fix publish assignment poll function. (Fixes#1718)
 2015-12-22 00:02:44 +01:00
Oskar Hahn
701d3ce228 Merge pull request #1776 from emanuelschuetze/fix1717 
Upgrade angular-ui-tree
 2015-12-22 00:01:50 +01:00
Emanuel Schuetze
b863c7ae13 Upgrade to angular-ui-tree 2.5.0 
With >=2.10.0 there is an error "context is null" if start dragging.
With >=2.6.0 there is a missing angular 1.4 dependency.
 2015-12-19 12:46:53 +01:00
Emanuel Schuetze
6b8aa56e87 Fix publish assignment poll function. 
Set 'votes' to required=False in AssignmentAllPollSerializer.
 2015-12-19 12:38:07 +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
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
Oskar Hahn
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
Emanuel Schuetze
f5efca1d1e Added whitespace before triple dots in template (Fixes #1729) 2015-12-12 10:16:44 +01:00
Emanuel Schuetze
31c320f9ef Improved csv import for agenda and users. 
- Fix users list.
 2015-12-12 10:12:22 +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
Oskar Hahn
9402d25f4f Merge pull request #1767 from normanjaeckel/ItemDetailSlide 
Removed item detail slide on server and client side.
 2015-12-12 09:31:36 +01:00
Oskar Hahn
fae3747da6 Merge pull request #1769 from normanjaeckel/LoginLogout 
Fixed login and logout view.
 2015-12-12 09:30:00 +01:00
Oskar Hahn
fd90b15a0e Merge pull request #1770 from emanuelschuetze/fix1728 
Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728)
 2015-12-12 09:28:20 +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
Norman Jäckel
e0e74d6c3c Fixed login, logout and password change view. 2015-12-11 23:58:59 +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
ca94a4e720 Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728) 2015-12-11 19:50:50 +01:00
Norman Jäckel
0701838bc8 Merge pull request #1765 from emanuelschuetze/WhoAmI 
Login form
 2015-12-11 15:44:02 +01:00
Norman Jäckel
da37f3a441 Removed item detail slide on server and client side. 
There is now only a list of speakers slide.
 2015-12-11 15:37:13 +01:00
Norman Jäckel
c73671805e Merge pull request #1753 from emanuelschuetze/fix1704 
Project related object (Fixes #1704)
 2015-12-11 15:25:56 +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
Emanuel Schuetze
9001456d19 Fix user.id in password reset request (Fixes #1752) 2015-12-10 15:03:18 +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
Emanuel Schuetze
7bffeba93e Project related object (Fixes #1704) 
- Override generic project and isProjected function in agenda.
- Fix project and isProjected function for list of speakers and move
  to jsDataModel of Agenda.
 2015-12-09 20:02:08 +01:00
Norman Jäckel
1f63f84fde Update version to 2.0b2-dev 2015-12-07 21:55:56 +01:00
Norman Jäckel
c5e3a14a82 Release 2.0b1 2015-12-07 21:55:17 +01:00
Norman Jäckel
2f4b7c192c Updated French translation. 2015-12-07 20:11:46 +01:00
Norman Jäckel
00dd0b419a Updated German translation. 2015-12-07 20:06:05 +01:00
Norman Jäckel
075c00ac4f Updated English language file. 2015-12-07 15:43:45 +01:00
Emanuel Schuetze
3c5f49a127 Updated English translation strings. 2015-12-07 15:15:12 +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
Emanuel Schuetze
232ce522fe Updated translation strings and pot file. 2015-12-06 07:25:07 +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
Norman Jäckel
139a5173b8 Added German translation. 2015-11-30 21:30:37 +01:00
Norman Jäckel
f84b8f29ac Template and translation changes. Updated English language files. 2015-11-30 21:06:31 +01:00
Emanuel Schuetze
5cf2134e95 Fix translation tags. 2015-11-30 20:52:02 +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
Oskar Hahn
aab8b28393 Merge pull request #1724 from emanuelschuetze/project-item-fix 
Added own isProjected function for Agenda factory (Fixes #1704)
 2015-11-30 14:49:17 +01:00
Oskar Hahn
ca201758e8 Merge pull request #1715 from emanuelschuetze/template-improvements 
Template improvements
 2015-11-29 22:32:08 +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
Norman Jäckel
91174afa99 Added error message if a new candidate is already nominated. 2015-11-28 21:34:24 +01:00
Norman Jäckel
6f924e6686 Merge pull request #1714 from ostcar/assignment_poll_candidate 
AngularJS: Added js-data models for assignment poll candidates
 2015-11-28 13:26:56 +01:00
Norman Jäckel
262964cbea Merge pull request #1713 from ostcar/fix_delete_speaker 
AngularJS: Fix deletion of speakers.
 2015-11-28 13:24:58 +01:00
Oskar Hahn
99ef185502 Angular: Added js-data models for assignment poll candidates 2015-11-28 00:27:14 +01:00
Oskar Hahn
5ddedf94e1 angular: Fix deletion of speakers 2015-11-27 23:59:04 +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
Oskar Hahn
e67897941e Added assignment poll and assignment related user to js 2015-11-25 19:28:35 +01:00
Emanuel Schuetze
92719f2b31 Added own isProjected function for Agenda factory 
Allow to check if an related content object item is projected.
 2015-11-25 14:50:23 +01:00
Norman Jäckel
7bff79b377 Added manager to number all agenda items. 2015-11-25 13:05:39 +01:00
Emanuel Schuetze
28df416ec7 Added auto numbering button on agenda list view. 2015-11-25 13:05:39 +01:00
Norman Jäckel
f0080865e6 Added REST API viewpoint to number the agenda. 2015-11-25 13:05:39 +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
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
Emanuel Schuetze
f26188e0ff Split motions.js into base, site and projector 2015-11-23 22:06:50 +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
Norman Jäckel
cdd1813c02 Merge pull request #1691 from emanuelschuetze/motions-permissions 
Updated motion permission checks
 2015-11-20 23:18:54 +01:00
Oskar Hahn
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
Emanuel Schuetze
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
Oskar Hahn
b1e7259ce5 AngularClient: Fix operator.pasPerms() after a reload 2015-11-19 21:49:51 +01:00
Emanuel Schuetze
e9cf2fb591 Reset default password of an user in UserUpdateCtrl. (Fixes #412) 2015-11-19 21:49:28 +01:00
Norman Jäckel
19df7c82a2 Enabled possibility to send null for motion poll votes vote value fields. 2015-11-19 19:56:01 +01:00
Oskar Hahn
0cce7f967b Merge pull request #1661 from normanjaeckel/CKEditor 
Added CKEditor to custom slide create and edit form.
 2015-11-18 12:21:39 +01:00
Oskar Hahn
051c98ad88 Merge pull request #1684 from normanjaeckel/MotionFix 
Fixed create view for non staff users, fixed #1670.
 2015-11-18 12:20:08 +01:00
Norman Jäckel
69a6cb7c47 Return strings for special motion vote values. See #1669. 2015-11-18 01:46:58 +01:00
Norman Jäckel
2063dcff51 Fixed create view for non staff users, fixed #1670. 2015-11-18 01:20:49 +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
Oskar Hahn
2495ba609b create MotionPoll in JS 2015-11-11 10:50:49 +01:00
Emanuel Schuetze
798126551b Motions template improvements. 
- Added quickedit form for 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
Oskar Hahn
08c31a6b09 Merge pull request #1666 from normanjaeckel/Mediafile 
Fixed serializer and template. Fixed #1650.
 2015-11-07 07:14:39 +01:00
Norman Jäckel
03fcf950ff Updated logo help text. 2015-11-06 17:25:25 +01:00
Norman Jäckel
cc21b3d015 Fixed mediafile serializer and template. Fixed #1650. 2015-11-06 17:17:27 +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
Oskar Hahn
0e3688fc33 Merge pull request #1653 from normanjaeckel/FixMotionPoll 
Fixed changes in motion poll serializer.
 2015-10-21 23:15:28 +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
Norman Jäckel
0fc915ec35 Fixed changes in motion poll serializer. 2015-10-21 22:24:11 +02:00
Oskar Hahn
17973bae3d Merge pull request #1652 from ostcar/make_os-perms-lite_and_ng-show_compatible 
Fix os-perms-lite to make it compatible to ng-show and ng-hide
 2015-10-21 21:25:29 +02:00
Oskar Hahn
bf3e125786 Merge pull request #1651 from normanjaeckel/MotionPoll 
Changed Motion Poll REST fields.
 2015-10-21 21:25:06 +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
Norman Jäckel
817e15b01a Changed Motion Poll REST fields. 2015-10-21 21:20:38 +02:00
Emanuel Schuetze
fac45fbf2a Added multiselection delete mode for users list view. 
Fix users import: Allows multiple groups.
 2015-10-15 21:09:49 +02:00
Oskar Hahn
69268f0cc7 Merge pull request #1634 from emanuelschuetze/countdown-controls 
Projector elements controls
 2015-10-08 22:27:35 +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
Emanuel Schuetze
4559ffb882 Fix agenda slide and agendaIsProjected function. 2015-09-24 21:43:37 +02:00
Norman Jäckel
30e390dcfb Added API view for server time. 2015-09-24 21:28:30 +02:00
Norman Jäckel
1e08e9411a Cleaned up users app. 2015-09-21 16:23:47 +02:00
Norman Jäckel
e646cce91e Added scale and scroll, up, down and reset. Fixed #1633. 2015-09-18 10:31:22 +02:00
Norman Jäckel
4ad99f2bc9 Cleaned up mediafiles app. Fixed #1629. 2015-09-17 22:58:24 +02:00
Norman Jäckel
4600fd9b02 Merge pull request #1625 from boehlke/master 
Add upload feature to mediafiles module.
 2015-09-17 12:41:10 +02:00
André Böhlke
10b8a1d838 Add upload feature to mediafiles module 2015-09-17 12:35:40 +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
Norman Jäckel
2a23150b78 Fixed agenda tree, fixed #1635. 2015-09-14 22:18:55 +02:00
Norman Jäckel
c8dfb9437b Removed imports from openslides.users in other apps: Cleaned up agenda, assignments and motions. 2015-09-14 21:13:56 +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
Oskar Hahn
f0803f1c03 Merge pull request #1624 from ostcar/agendaTree 
Calculate agenda tree on the client side.
 2015-09-06 15:04:38 +02:00
Oskar Hahn
85be9f23cc Merge pull request #1623 from normanjaeckel/ProjektorElementsOutput 
Updated Projector config field and control views.
 2015-09-06 15:04:26 +02:00
Oskar Hahn
e22b9984e3 Calculate agenda tree on the client side. 
Update changed agenda tree via autoupdate.
 2015-09-06 15:01:41 +02:00
Norman Jäckel
5c4c0367a1 Updated Projector config field and control views. 2015-09-06 14:59:33 +02:00
Norman Jäckel
5fc215c359 Fix docstrings. 2015-09-06 11:48:37 +02:00
Oskar Hahn
1fc7a361eb Merge pull request #1621 from normanjaeckel/User 
Added possibility to update your own user object.
 2015-09-06 11:37:52 +02:00
Norman Jäckel
c8bf754646 Added possibility to update your own user object. Hide default password for non admins. 2015-09-06 11:26:48 +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
bd51c6a52c Added osPermLite as alternative to osPerm 2015-09-05 19:17:41 +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
948e776d33 Merge pull request #1612 from ostcar/motion_tag_save 
Reload config after login
 2015-09-05 11:32:52 +02:00
Oskar Hahn
fbc57cc23a Reload config after login 
Fix errors by saving tags to motions
 2015-09-05 11:26:41 +02:00
Emanuel Schuetze
77d027c1cc Agenda templates 
- Added manage controls for list of speakers of agenda items.
- New slide for list of speakers.
- Fixed typo (speach -> speech)
 2015-09-05 11:23:32 +02:00
Emanuel Schuetze
0e124dbbae Use tags in agenda. Fix motions.js. 2015-09-05 10:07:53 +02:00
Oskar Hahn
026f4d45cb Merge pull request #1607 from normanjaeckel/PollNumber 
Removed poll_number field in MotionPoll model.
 2015-09-05 09:58:57 +02:00
Norman Jäckel
80efae4980 Start browser at 'localhost:8000' in start script. Fixed #1534. 2015-09-05 09:32:56 +02:00
Norman Jäckel
5e5ab61612 Removed poll_number field in MotionPoll model. 2015-09-05 09:29:06 +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
a1f1cfed1f Added views to create, update and delete MotionPoll objects. 2015-09-04 19:55:47 +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
aaadfbf78e Merge pull request #1600 from normanjaeckel/Plugins 
Updated plugin utils. Enabled plugins to override urlpatterns.
 2015-07-25 22:29:45 +02:00
Norman Jäckel
1cf8a1f222 Updated plugin utils. Enabled plugins to override urlpatterns. 2015-07-25 21:37:03 +02:00
Oskar Hahn
89a6d5b451 Appended an _id suffix to all related field names in the rest api 
Fixes #1597
 2015-07-25 19:17:33 +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
f31925387f Updated python requirements. 
This included django 1.8
 2015-07-02 14:51:08 +02:00
Oskar Hahn
291f60ee9f Added a way to load angular apps dynamical 2015-07-01 20:10:40 +02:00
Oskar Hahn
1dbe07c041 Fix osPerms to use groups registered and anonymous 
Fixes #1586
 2015-07-01 00:32:37 +02:00
Emanuel Schuetze
c6800bc8f5 Update version to 2.0b1-dev 2015-06-29 21:58:58 +02:00
Emanuel Schuetze
d50d771014 Release 2.0a1 2015-06-29 21:58:58 +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
ec1d676ed9 Added initial migrations for all apps 2015-06-29 15:38:15 +02:00
Oskar Hahn
16fa6bfffc Removed the projector App 2015-06-29 15:20:28 +02:00
Oskar Hahn
e042c668d5 Moved config app into the core app 2015-06-29 15:15:33 +02:00
Norman Jäckel
bcfe72fa8c Merge pull request #1578 from ostcar/remove_mptt_again 
Realy removed mptt
 2015-06-28 20:18:09 +02:00
Norman Jäckel
025c9c0b2a Merge pull request #1577 from ostcar/fix_mediafile_download_link 
Fixed link to download a file from the mediafileapp.
 2015-06-28 20:17:30 +02:00
Oskar Hahn
4dac4d1ca8 Realy removed mptt 2015-06-28 19:55:48 +02:00
Oskar Hahn
60e890a04e Fixed link to download a file from the mediafileapp 
Fixes #1575
 2015-06-28 19:44:25 +02:00
Norman Jäckel
06ead753dc Added and updated several projector elements (slides). 
Added list slides for motions and assignments.
Added detail slide for presentable files.
Updated list and detail slides for agenda items including slides for list of speakers.
 2015-06-28 19:22:57 +02:00
Oskar Hahn
8aab8388b3 Moved agenda tree code to the Item-Manager and used it at the AgendaPDFView. 
fixed #1561
 2015-06-28 18:26:05 +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
Oskar Hahn
f5654837e1 Merge pull request #1569 from normanjaeckel/Slides 
Added agenda slides.
 2015-06-25 08:12:47 +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
Norman Jäckel
6da0d41e50 Added agenda slides. 2015-06-24 23:45:21 +02:00
Norman Jäckel
6b5ce5ae2f Added motion and assignment detail slide. 2015-06-24 22:12:06 +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
35aa36f88e Revert "Added view to create related assignment and motion items. Updated ser…" 2015-06-22 14:23:42 +02:00
Oskar Hahn
2d6cdfa168 Merge pull request #1557 from emanuelschuetze/angular-motions 
Updated motion list, form and detail views.
 2015-06-22 14:18:09 +02:00
Oskar Hahn
3f321051c5 Merge pull request #1562 from emanuelschuetze/chromium-fixes 
Fix JavaScript errors in chromium (Fixed #1530)
 2015-06-22 14:12:12 +02:00
Oskar Hahn
bb2da91204 Merge pull request #1563 from normanjaeckel/Fix 
Fixed bug in users/projector.py.
 2015-06-22 14:11:43 +02:00
Norman Jäckel
e0188a149d Added view to create related assignment and motion items. Updated serializers. 2015-06-21 23:32:21 +02:00
Norman Jäckel
c4e23daccf Fixed bug in users/projector.py. 2015-06-21 22:36:21 +02:00
Emanuel Schuetze
002a4d583e Fix JavaScript errors in chromium. 2015-06-21 19:39:36 +02:00
Emanuel Schuetze
9a117999ef Updated motion list, form and detail views. 2015-06-20 10:44:00 +02:00
Oskar Hahn
2b9c0b4620 Fixed default_value in option request 2015-06-19 09:08:36 +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
Oskar Hahn
a5d9f0bb42 Merge pull request #1554 from normanjaeckel/UserResetPassword 
Added view to reset user's password.
 2015-06-18 23:16:45 +02:00
Norman Jäckel
466fab8752 Added view to reset user's password. 2015-06-18 22:45:23 +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
Emanuel Schuetze
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
Norman Jäckel
51455e8563 Merge pull request #1539 from ostcar/delete_old_stuff 
Delete old stuff.
 2015-06-16 17:32:38 +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
95683949ec Merge pull request #1536 from emanuelschuetze/portable-fixes 
Fixed FileFinder importer for plugin detection in portable.
 2015-06-16 17:00:30 +02:00
Oskar Hahn
1ccd2ab91c Merge pull request #1529 from normanjaeckel/RESTConfig 
Added config update view.
 2015-06-16 16:18:33 +02:00
Norman Jäckel
3e2aa6c081 Update 2015-06-16 14:04:38 +02:00
Emanuel Schuetze
ea908419be Fixed FileFinder importer for plugin detection in portable. 
Updated setuptools version for openslides-gui.
 2015-06-16 10:38:54 +02:00
Norman Jäckel
6f02d769cc Added config update view. 2015-06-15 18:24:23 +02:00
Norman Jäckel
5813b8341c Added permission check for objects required for active projector elements. 2015-06-15 18:22:15 +02:00
Oskar Hahn
a604f36634 Merge pull request #1537 from normanjaeckel/RESTPoll 
Added create, updated and destroy view for assignment polls.
 2015-06-15 16:34:11 +02:00
Oskar Hahn
cb1b262c92 Fix anonymous user for rest requests 2015-06-15 15:54:39 +02:00
Norman Jäckel
ccaa1eaf27 Added create, updated and destroy view for assignment polls. 2015-06-14 23:26:06 +02:00
Norman Jäckel
a033f74ba1 Merge pull request #1527 from ostcar/start_browser_on_localhost 
Start the browser on 127.0.0.1.
 2015-06-12 13:01:00 +02:00
Oskar Hahn
e836bccb72 Start the browser on 127.0.0.1 
Fixed #1525
 2015-06-11 11:37:01 +02:00
Norman Jäckel
5de7365c9a Merge pull request #1526 from normanjaeckel/AgendaSpeakerREST 
Added view to add and remove users from the list of speakers.
 2015-05-29 13:08:10 +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
Norman Jäckel
0853701cdd Added view to begin and end speach. 2015-05-27 15:42:32 +02:00
Norman Jäckel
95be18b78e Added view to add and remove users from the list of speakers. 2015-05-26 18:42:39 +02:00
Norman Jäckel
b30afbd635 Added several motion REST API views. 
Added motion creation view, motion update view, version permit and delete view, view to support motions, view to set and reset state. Refactored motion submitters and supporters.
 2015-05-13 12:22:50 +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
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
Oskar Hahn
505e587d6f Send tree for agenda items 2015-04-17 16:46:13 +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
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
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
Oskar Hahn
787343d651 Fixes users password PDF view. 
Fixes: #1496
 2015-02-27 11:56:31 +01:00
Norman Jäckel
2ef7c7cf29 Added 'id' to user creation response. 2015-02-25 17:16:36 +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
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
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
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
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
c4c9322321 Rework of assignment 
fixes: #1429, #1345

A database recreation is needed
 2015-02-12 10:14:10 +01:00
Oskar Hahn
ac6f3de60d Used AngularUI Router for more generic URL routing. 2015-02-12 09:52:07 +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
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
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
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
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
c7b52245b7 Fix AssignmentPollUpdateView 2015-01-25 15:15:28 +01:00
Oskar Hahn
b4e17b9b35 fix #1430 - anonymous user and motion detail view 2015-01-25 01:20:59 +01:00
Oskar Hahn
ac01d39eaa use our anonymous user object for the rest framework 
fix: #1432
 2015-01-25 01:11:14 +01:00
Oskar Hahn
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
Oskar Hahn
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
Oskar Hahn
35024764cf Rework of management command 2015-01-23 15:40:12 +01:00
Oskar Hahn
285d8c2cfb Use a real anonymous user object, instadt of a authentification backend 2015-01-23 15:38:14 +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
33c4562e62 Updated version to 1.7 2015-01-21 20:58:03 +01:00
Norman Jäckel
136f57057f Release 1.7b1 2015-01-21 20:58:03 +01:00
Norman Jäckel
afc2b246db Fixed bug in chatbox. 2015-01-21 17:24:39 +01:00
Emanuel Schuetze
6cbec7a32a Updated translations (DE, FR, CS, PT) for 1.7. 2015-01-21 15:59:27 +01:00
Emanuel Schuetze
4296fb0360 Show special characters in PDF, like "&". (Fixed #1415) 
Added escape function for agenda, motion, assignment and participants
pdf views.
 2015-01-21 13:03:03 +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
Norman Jäckel
2b744942e7 Merge pull request #1407 from ostcar/super_signal 
Remove update_projector and add inform_changed_data.
 2015-01-17 15:25:41 +01:00
Oskar Hahn
1a1d072454 remove update_projector and add inform_changed_data 2015-01-17 15:16:49 +01:00
Roland Geider
06b5ad5f2e Fix typos 2015-01-17 12:12:08 +01:00
Oskar Hahn
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
Norman Jäckel
b0422c4680 Added api viewset for agenda items. 
Fixed style checker problem.
 2015-01-17 09:18:40 +01:00
Norman Jäckel
8cb70017da Added api viewset for users. 2015-01-17 08:51:57 +01:00
Norman Jäckel
7644cb9a09 Added api viewset for custom slides. 2015-01-17 08:51:54 +01:00
Norman Jäckel
7ed5d2fc43 Setup Django REST Framework. 2015-01-17 08:49:52 +01:00
Norman Jäckel
82f46708f6 Merge pull request #1397 from emanuelschuetze/haystack-fix 
Fixed haystack indexing problem for m2m objects.
 2015-01-17 00:21:45 +01:00
Norman Jäckel
9b89e10cc7 Merge pull request #1398 from emanuelschuetze/portable-install-script 
Improved portable install script.
 2015-01-17 00:20:49 +01:00
Norman Jäckel
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
Emanuel Schuetze
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
Emanuel Schuetze
3127048be5 Fixed haystack indexing problem for m2m objects. 
Updated django-haystack to <2.4.
 2015-01-16 23:07:56 +01:00
Oskar Hahn
5d0737f656 Merge pull request #1396 from DebVortex/feature/update-pdfjs 
Updated pdf.js to 1.0.907
 2015-01-16 22:37:49 +01:00
Max Brauer
f0af21103c Updated pdf.js to 1.0.907 2015-01-16 22:16:31 +01:00
Oskar Hahn
4f27b9b63d Fix LocalizedModelMultipleChoiceField 
It has to be a generator, so it does not call the queryset
 2015-01-16 20:47:43 +01:00
Emanuel Schuetze
a9468cb0a4 Fixed missing translation strings. 2015-01-16 14:25:34 +01:00
Norman Jäckel
3ba86a6441 Updated English language files. 2015-01-11 19:04:21 +01:00
Norman Jäckel
3ec55daaf9 Fixed bug. Projector was not updated when an object was deleted. Fixex #1394. 2015-01-11 18:43:05 +01:00
Emanuel Schuetze
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
Norman Jäckel
06919fa543 Fixed bug in ResetPasswordView. Fixed #1391. 2015-01-06 16:27:50 +01:00
Oskar Hahn
34b6ca80f3 Merge branch 'stable/1.6.x' 
Conflicts:
	CHANGELOG
	openslides/users/signals.py
 2015-01-06 13:04:07 +01:00
Emanuel Schuetze
3cfb9b739b Template improvements for tags of agenda items, motions and 
assignments.
 2015-01-05 13:57:37 +01:00
Oskar Hahn
bcb1ee1213 Tags for motions, agenda items and assignments 2015-01-03 17:00:48 +01:00
Oskar Hahn
2951b4b38c Feature: amendments 2015-01-03 15:17:49 +01:00
Norman Jäckel
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
Norman Jäckel
8dafa2bfcd Added possibility to hide motions from non staff users in some states. 2015-01-02 19:32:56 +01:00
Norman Jäckel
f6b1a84545 Cleaned up utils.views to increase performance when fetching single objects from the database for a view. Fixed #1378. 2014-12-25 00:02:50 +01:00
Norman Jäckel
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
Norman Jäckel
808aae597f Merge branch 'stable/1.6.x' into 'master'. 
Conflicts:
	CHANGELOG
	openslides/__init__.py
	openslides/assignment/views.py
 2014-12-08 22:17:22 +01:00
Norman Jäckel
750918fe74 Update version to 1.6.2-dev 2014-12-04 15:47:21 +01:00
Norman Jäckel
9a50dab5fc Release 1.6.1 2014-12-04 15:45:19 +01:00
Emanuel Schuetze
6df6b92dd7 Fixed #1326 (Rearanged assignment pdf table cells to prevent a LayoutError) 2014-11-28 20:58:19 +01:00
Emanuel Schuetze
8be1215e12 Updated FR translation. 2014-10-27 20:42:36 +01:00
Norman Jäckel
c89f9bcccd Updated German and Czech language files. 2014-10-26 16:12:20 +01:00
Oskar Hahn
88222857bb Use the new django transaction API 
fixes #1027
 2014-10-19 10:52:48 +02:00
Oskar Hahn
5c6f7a41a8 Merge branch 'stable/1.6.x' 
Conflicts:
	tests/assignment/test_views.py
 2014-10-18 08:53:51 +02:00
Oskar Hahn
bcd6b9fad4 Merge pull request #1356 from ostcar/poll404 
Returns a 404 response if a requested poll does not exist.
 2014-10-17 19:42:47 +02:00
Oskar Hahn
cb03908a1b Returns a 404 response if a requested poll does not exist. 
fixes #1355
 2014-10-17 07:55:41 +02:00
Norman Jäckel
ff9fedd14f Updated English language files. 2014-10-16 23:28:02 +02:00
Oskar Hahn
c454faef94 Updated Django to 1.7.x 2014-10-14 17:14:52 +02:00
Stefan Frauenknecht
ebadb9078c Bugix in method get_title. Return item no for related objects. 2014-10-12 10:55:56 +02:00
Oskar Hahn
9b381b712e Merge pull request #1341 from frauenknecht/i1324 
Fix #1324 - Agenda item has whitespaces before number.
 2014-10-12 10:31:31 +02:00
Norman Jäckel
af8dead5a3 Fixed motion detail view template. Added block to enable extra content via plugins. Updated CHANGELOG. 2014-10-12 10:23:38 +02:00
Oskar Hahn
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
Emanuel Schuetze
2a389b4a7f Fixed #1326: Assignment PDF fails when having a lot of posts. 
Print always 7 signature lines in assingment pdf.
Added test.
 2014-10-10 22:24:28 +02:00
Stefan Frauenknecht
276f76d320 Omit leading zero in method item_no if no agenda prefix is given. 2014-10-10 21:30:22 +02:00
Oskar Hahn
32137b6523 Use python3 
python3.3 and python3.4 are supported
 2014-08-24 21:21:11 +02:00
Emanuel Schuetze
f6d0a96126 Show supporters on motion slide if available. 2014-07-14 22:54:53 +02:00
Emanuel Schuetze
587a3766d2 Fixed participant csv import for group id 
- Allowed to add multiple groups in csv group id field (e.g. "3,4")
- Fixed bug that group ids > 9 can not be imported.
- Updated error message if group id does not exists.
 2014-07-14 22:54:53 +02:00
Emanuel Schuetze
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
Norman Jäckel
dee81e58b3 Bump version to 2.0a1-dev. 2014-07-14 22:33:54 +02:00
Norman Jäckel
5db47bef76 Update version to 1.6.1-dev 2014-06-02 20:37:51 +02:00
Norman Jäckel
9d40e22783 Release 1.6 2014-06-02 20:37:50 +02:00
Norman Jäckel
2ebd215198 Merge pull request #1321 from emanuelschuetze/template-fixes 
Last template fixes for 1.6
 2014-06-02 18:23:04 +02:00
Emanuel Schuetze
0ebb2eb901 Last template fixes in agenda, motion and assignment list view. 2014-06-01 22:48:15 +02:00
Norman Jäckel
c2ae991fb2 Update help texts in start script. Set x-bit for manage.py. 2014-05-31 12:40:51 +02:00
Oskar Hahn
513000d241 Merge pull request #1316 from normanjaeckel/FixWorkflowBug 
Fixed bug with workflows. Fixed #1309.
 2014-05-28 12:32:12 +02:00
Norman Jäckel
efb6c17903 Added stylesheet to list of speakers overlay. Fixed #1310. 2014-05-28 00:30:33 +02:00
Norman Jäckel
52f7dff0f1 Fixed bug with workflows. Fixed #1309. 2014-05-28 00:20:13 +02:00
Norman Jäckel
c5db1c5e02 Merge pull request #1315 from emanuelschuetze/translations 
Updated final translations for 1.6 (DE, FR, PT, CS)
 2014-05-27 22:45:40 +02:00
Emanuel Schuetze
45c5f13980 Updated final translations for 1.6 (DE, FR, PT, CS) 2014-05-27 21:25:08 +02:00
Emanuel Schuetze
91ebd719bc Fixed #1311 (Motion poll slides shows wrong value for Abstain vote) 2014-05-22 17:26:38 +02:00
Norman Jäckel
769695bf14 Merge pull request #1307 from emanuelschuetze/en-translationfile 
Updated EN translation file for transifex
 2014-05-20 21:59:00 +02:00
Emanuel Schuetze
431f437ded Fixed motion title in motion list view (#1148). 2014-05-20 20:29:57 +02:00
Emanuel Schuetze
f1743a3790 Updated EN translation file for transifex 
String freeze for 1.6.
 2014-05-20 12:33:23 +02:00
Norman Jäckel
7ee5f688ae Update version to 1.6c1-dev 2014-05-19 23:02:39 +02:00
Norman Jäckel
fca8da8ae6 Release 1.6b2 2014-05-19 23:02:39 +02:00
Norman Jäckel
2bfa5f3a72 Prepared for release. 
Small style changes, CHANGELOG and README.rst update.
 2014-05-19 22:55:54 +02:00
Norman Jäckel
f9729fdae3 Merge pull request #1301 from normanjaeckel/MotionTitle 
Changed motion title behavior.
 2014-05-19 22:49:23 +02:00
Norman Jäckel
48471699c2 Merge pull request #1304 from emanuelschuetze/translations 
Updated translations (from transifex).
 2014-05-19 22:48:19 +02:00
Norman Jäckel
00eabcb8c8 Changed motion title appearance. Fixed #1148. 2014-05-19 22:42:43 +02:00
Emanuel Schuetze
715edf8a03 Updated translations (from transifex). 2014-05-19 22:30:50 +02:00
Norman Jäckel
ae99784372 Enabled reload always when DEBUG==True. 2014-05-19 22:29:05 +02:00
Oskar Hahn
22bacd1054 bind the reload of the webserver on the debug settings 
fix #1163
 2014-05-19 22:18:45 +02:00
Emanuel Schütze
bf8bb31cdb Merge pull request #1298 from emanuelschuetze/fix-995 
Improved html templates for mobile devices (responsive).
 2014-05-19 22:17:26 +02:00
Emanuel Schuetze
6bdfc33182 Motion CSV Import: Create new category if category is unkown. 2014-05-19 20:31:38 +02:00
Oskar Hahn
16a6ad4a9e Merge pull request #1278 from rolandgeider/ckeditor 
Replace own CKeditor with dedicated app
 2014-05-19 15:15:54 +02:00
Oskar Hahn
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
Oskar Hahn
53e0a1086d Merge pull request #1294 from emanuelschuetze/fix-1158 
Fixed #1158 (Clean up assignment.css)
 2014-05-19 14:57:17 +02:00
Norman Jäckel
38a4cf1bc3 Merge pull request #1295 from emanuelschuetze/pdf-fix 
PDF: Added missing 'fontName'.
 2014-05-19 09:57:50 +02:00
Norman Jäckel
5dc4742f2f Merge pull request #1291 from emanuelschuetze/fix-1235 
Fixed #1235 (DeprecationWarning in utils.views.PDFView).
 2014-05-19 09:54:45 +02:00
Norman Jäckel
60ba0f6900 Merge pull request #1292 from ostcar/fix_list_of_speaker_on_related_item 
Fixed link to list of speaker on related items.
 2014-05-19 09:50:47 +02:00
Roland Geider
e9d52245cb Replace own CKeditor with dedicated app 2014-05-19 00:00:18 +02:00
Emanuel Schuetze
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
Emanuel Schuetze
6cb99d9128 Fixed #1104 (Enable copy/paste in dashboard widgets) 2014-05-18 20:42:29 +02:00
Emanuel Schuetze
5f202c22a7 PDF: Add missing 'fontName'. 
And set 'registerFontFamily(...)' to use bold/italic in regular paragraphs.
 2014-05-18 13:57:20 +02:00
Emanuel Schuetze
99ee335925 Fixed #1158 (Clean up assignment.css) 2014-05-17 21:15:46 +02:00
Oskar Hahn
3419855a1e Fix link to list of speaker item on related items 
fix #1242
 2014-05-17 14:21:57 +02:00
Emanuel Schuetze
bacc9ca87b Fixed #1235 (DeprecationWarning in utils.views.PDFView) 2014-05-17 13:42:18 +02:00
Oskar Hahn
f0572551b3 Fix default-slide-preview-url 
Fix #1246
 2014-05-17 13:30:37 +02:00
Norman Jäckel
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
Norman Jäckel
ecf0e8b0d7 Cleaned up some widgets and the base.css. Removed icon definitions. 2014-05-15 17:23:46 +02:00
Emanuel Schuetze
f651ccf3b9 Fixed #1275 (Creating assignment pdf failed) 2014-05-13 21:39:27 +02:00
Oskar Hahn
86ac16dd14 Merge pull request #1283 from normanjaeckel/FixEnglishString 
Fixed English strings concerning agenda items and organizational items a...
 2014-05-13 13:08:05 +02:00
Oskar Hahn
c132346d14 Merge pull request #1284 from normanjaeckel/RefactorConfig 
Changed permission system for config pages.
 2014-05-13 13:03:09 +02:00
Oskar Hahn
bebd73dde2 Merge pull request #1282 from normanjaeckel/FixWidgets 
Fixed permission error in some widgets.
 2014-05-13 13:00:45 +02:00
Oskar Hahn
e6cbfdf575 Merge pull request #1281 from normanjaeckel/AssignmentPollBug 
Fixed error when creating an assignment poll. Fixed #1203.
 2014-05-13 12:59:58 +02:00
Oskar Hahn
cfea637676 Merge pull request #1277 from emanuelschuetze/fix-mediafileprojector 
Added missing mediafile projector stylefile for pdf.js presentation.
 2014-05-13 12:57:51 +02:00
Norman Jäckel
9f99ef8a38 Fixed error when creating an assignment poll. Fixed #1203. 2014-05-12 22:58:23 +02:00
Norman Jäckel
43429d4015 Changed some docstrings. 2014-05-12 22:57:57 +02:00
Norman Jäckel
ee82c2c105 Fixed English strings concerning agenda items and organizational items and their relation. Fixed #1271. 2014-05-12 22:56:57 +02:00
Norman Jäckel
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
Norman Jäckel
ebe8f90d1e Fixed permission error in some widgets. 
Fixed agenda item widget, assignment widget, motion widget, participant user widget and participant group widget. Fixed #1279.
 2014-05-12 22:55:49 +02:00
Emanuel Schuetze
1deaaf241e Added missing mediafile projector stylefile for pdf.js presentation. 2014-05-09 14:03:53 +02:00
Norman Jäckel
d4358d6aae Update version to 1.6b2-dev 2014-05-05 21:30:12 +02:00
Norman Jäckel
a581393b32 Release 1.6b1 2014-05-05 21:28:53 +02:00
Norman Jäckel
1857195812 Updated German translation. 2014-05-05 21:11:09 +02:00
Norman Jäckel
b8cd2d360b Merge pull request #1270 from emanuelschuetze/fix1178 
Adds plugin directory for win32 portable version (Fixed #1178).
 2014-05-05 21:07:51 +02:00
Emanuel Schütze
7add4c5691 Portable: Create empty plugins directory. 
Fixed file permissions.
 2014-05-05 21:01:25 +02:00
Norman Jäckel
7e085be54c Updated English language file. 2014-05-05 20:31:22 +02:00
Norman Jäckel
808715f34f Merge pull request #1262 from emanuelschuetze/fix-1260-1261 
Fix for new percent base choice config (Fixed #1260)
 2014-05-05 20:28:20 +02:00
Emanuel Schütze
5953e58c99 Fixed #1260 (Change description of percent base choices) 2014-05-05 20:21:21 +02:00
Oskar Hahn
921e4ab2bd Merge pull request #1268 from emanuelschuetze/translationstrings 
Updated translation strings.
 2014-05-05 16:15:44 +02:00
Oskar Hahn
9be0409869 Merge pull request #1266 from andkit/issue1253 
Fix #1253 data table in motion overview displayed incorrectly
 2014-05-05 16:14:59 +02:00
Andy Kittner
3584da89c3 Automatically load plugins from portable plugins dir; closes #1178 
All modules/ packages in the openslides/plugins subdirectory of the
portable version will be automatically added to INSTALLED_PLUGINS
 2014-05-05 00:55:22 +02:00
Emanuel Schütze
3ece699cd6 Add get_win32_portable_user_data_path() function in main.py to return 
correct user data path ("/openslides") of portable version.
 2014-05-05 00:55:17 +02:00
Emanuel Schütze
9c43523f06 Updated translation strings. 
Improved shortcut countdown layout.
 2014-05-04 20:49:05 +02:00
Andy Kittner
4af6fe1c9a Fix #1253 data table in motion overview displayed incorrectly 2014-05-04 16:40:50 +02:00
Norman Jäckel
d638d5b7e2 Fixed bug of numbering view when there are orga items. Renamed toRoman to to_roman. 2014-05-04 14:00:28 +02:00
Stefan Frauenknecht
f8bd4b0d86 Numbering of agenda items, part 2. 
Config item agenda_agenda_fixed removed'.
Config items agenda_agenda_fixed and agenda_enable_auto_numbering removed.
FixAgendaView and ResetAgendaView removed. AgendaNumberingView added.
Old two fix- and reset numbering buttons replaced by 'Number agenda items'.
 2014-05-04 13:47:01 +02:00
Norman Jäckel
5254cc83a6 Updated numbering feature. 
Fixed organizational item structuring. Prevented organizational items
from having agenda items as descendents. Some coding style changes.
Added CHANGELOG and README entries.
 2014-05-04 13:47:01 +02:00
Stefan Frauenknecht
2c5b3a8e4f Automatic numbering of agenda items 2014-05-04 13:47:01 +02:00
Norman Jäckel
1fbd77e701 Updated English language files. 2014-05-02 23:53:51 +02:00
Emanuel Schuetze
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
Norman Jäckel
84f9963bea Updated English language files. 2014-04-28 23:45:44 +02:00
Norman Jäckel
c1c952c136 Merge pull request #1257 from emanuelschuetze/projector-logo 
Use right projector logo (as in stable/1.5.x branch).
 2014-04-28 22:21:11 +02:00
Emanuel Schütze
945771e8a6 Use right projector logo (as in stable/1.5.x branch). 2014-04-28 22:07:06 +02:00
Emanuel Schütze
fa6c7d9d86 Fixed #1102 (New config option to set percent base for polls) 
Use locale format for poll percentage decimal number.
 2014-04-28 21:57:31 +02:00
Emanuel Schütze
579c9d49f0 Fixed #1240 (No assignment poll form fields for votes invalid and votes cast) 2014-04-28 21:57:17 +02:00
Norman Jäckel
3379f9542a Update English translation files. 2014-04-28 21:11:15 +02:00
Oskar Hahn
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
Emanuel Schütze
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
Norman Jäckel
42796f6118 Added global chatbox for managers. 2014-04-27 20:58:22 +02:00
Emanuel Schütze
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
Oskar Hahn
3d092f6dcc countdown shortcuts 2014-04-27 19:48:57 +02:00
Norman Jäckel
ac1ab81d7a New projector view with the current list of speakers. 2014-04-15 01:00:56 +02:00
Norman Jäckel
f8cdad711c Simplify overlay api methods. 2014-04-15 00:33:34 +02:00
Norman Jäckel
2a10feecad Added CSV import, fixed #1186. Also cleaned up motion and user CSV import. 2014-04-13 20:35:19 +02:00
Norman Jäckel
78077e4ab1 Fix syntax and style errors and errors after deficient merge conflic 
resolving after branch merging.
 2014-04-08 21:02:09 +02:00
Norman Jäckel
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
Emanuel Schütze
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