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

2328 Commits

Author SHA1 Message Date
Oskar Hahn
a2d8b41d55 Merge pull request #1931 from normanjaeckel/LocalHostVar 
Refactored logic in autoupdate.py concerning wsgi network connection …
 2016-02-01 21:27:13 +01:00
Oskar Hahn
7d6c202200 Merge pull request #1927 from emanuelschuetze/autoconnect 
Refactor reconnect function of autoupdate.
 2016-02-01 21:25:58 +01:00
Norman Jäckel
6541d49c99 Merge pull request #1928 from emanuelschuetze/updateTranslations 
Show missing translations. Updated de and pt.
 2016-01-31 10:19:18 +01:00
Emanuel Schuetze
2e0d57d310 Updated EN translation source files. 2016-01-30 11:34:47 +01:00
Norman Jäckel
af0f8fcac6 Refactored logic in autoupdate.py concerning wsgi network connection variables. Fixed #1929." 2016-01-30 10:18:15 +01:00
Norman Jäckel
01aad229fe Fixed login modal info text. Fixed #1924. 2016-01-30 10:04:20 +01:00
Norman Jäckel
15bb62b39a Merge pull request #1926 from ostcar/fix_autoreload_in_django_1.9 
Fix the start command not to reload if debug is False
 2016-01-30 09:58:13 +01:00
Emanuel Schuetze
fb41d0a219 Show missing translations. Updated de and pt. 2016-01-30 09:20:53 +01:00
Norman Jäckel
144037ff57 Merge pull request #1922 from ostcar/fix_tornado_on_windows 
fix tornado on windows
 2016-01-29 23:30:04 +01:00
Emanuel Schuetze
1216ea99d3 Refactor reconnect function of autoupdate. 2016-01-29 16:30:00 +01:00
Oskar Hahn
fbf8b0aa62 Fix the start command not to reload if debug is False 2016-01-29 09:51:12 +01:00
Emanuel Schuetze
3cd49704fc Use correct special html character for projector template title. 2016-01-29 09:14:26 +01:00
Oskar Hahn
9292558db7 fix tornado on windows 2016-01-28 16:19:14 +01:00
Norman Jäckel
2aa31bffbf Updated version to 2.0-dev 2016-01-27 23:41:16 +01:00
Norman Jäckel
95ac91893c Release 2.0b2 2016-01-27 23:41:16 +01:00
Norman Jäckel
da30be5184 Merge pull request #1919 from emanuelschuetze/fix1904 
Fixed TypeError caused by #1904.
 2016-01-27 23:40:53 +01:00
Emanuel Schuetze
587f397171 Fixed TypeError caused by #1904. 
"Resource.relationList is undefinded" after activating a slide.
 2016-01-27 23:35:24 +01:00
Norman Jäckel
1b1d41b9b8 Updated angular-gettext language file. 2016-01-27 22:33:05 +01:00
Norman Jäckel
c4281c6bc7 Merge pull request #1912 from emanuelschuetze/fixAgenda 
Check if user is allowed to see detail view link in agenda list.
 2016-01-27 22:25:56 +01:00
Norman Jäckel
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
Norman Jäckel
fea0287a20 Updated translations. 2016-01-27 22:16:54 +01:00
Emanuel Schuetze
3c7d03547c Set default of item.weigth to 10000. 
So new items are placed at the end of agenda.
After sorting weight is updated.
 2016-01-27 22:16:46 +01:00
Emanuel Schuetze
0ce0b9cd18 Fixed gulp 'pot' task. Fixed typos in translation strings. 2016-01-27 22:11:24 +01:00
Emanuel Schuetze
fc22711a9c Check if user is allowed to see detail view link in agenda list. 
Fixes #1886
 2016-01-27 21:19:32 +01:00
Norman Jäckel
4aaa474761 Updated language files. 2016-01-27 20:55:27 +01:00
Norman Jäckel
352e32334e Merge pull request #1901 from emanuelschuetze/fix1895 
Translate permission strings. (Fixes #1895)
 2016-01-27 20:42:07 +01:00
Norman Jäckel
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
André Böhlke
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
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