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

3277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Norman Jäckel
5044aaf7ed Merge pull request #1907 from ostcar/fix_reconnect 
Reconnect at once. Do not wait 5 seconds. Add a connected flag to the…
 2016-01-27 20:07:46 +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
d37b89a15a Merge pull request #1902 from OpenSlides/revert-1720-master 
Revert "Add upload feature to mediafiles module"
 2016-01-27 15:29:16 +01:00
Oskar Hahn
6970235f23 Revert "Add upload feature to mediafiles module" 2016-01-27 15:28:59 +01:00
Oskar Hahn
2d1077ddad Merge pull request #1720 from boehlke/master 
Add upload feature to mediafiles module
 2016-01-27 15:16:03 +01:00
André Böhlke
3c691b9937 work on pdf presenter support 2016-01-27 19:33:30 +07:00
Oskar Hahn
2307bdc188 Merge pull request #1898 from emanuelschuetze/templateFixes 
Template fixes
 2016-01-27 12:32:47 +01: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
Oskar Hahn
8be872eb48 Merge pull request #1899 from emanuelschuetze/search 
Full text search (Fixes #1699)
 2016-01-27 08:32:24 +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
41c43a7b31 Merge pull request #1888 from normanjaeckel/DefaultPerms 
Deleted Django default permission of some apps. Fixed #1643.
 2016-01-25 21:16:35 +01:00
Oskar Hahn
bc520a1adf Merge pull request #1889 from normanjaeckel/Requirements 
Fixed requirements.
 2016-01-25 21:15:07 +01:00
Oskar Hahn
339b3891da Fix Search on server side 2016-01-25 21:12:34 +01:00
Norman Jäckel
676ec23340 Updated package.json. Fixed requirements. 2016-01-25 15:38:30 +01:00
Norman Jäckel
87e3c536da Deleted Django default permission of some apps. Fixed #1643. 2016-01-25 14:48:54 +01:00
Norman Jäckel
bb1ae463db Merge pull request #1884 from emanuelschuetze/mediafileTemplate 
Refactoring mediafile templates. (Fixes #1839, #1818, #1833)
 2016-01-25 11:43:55 +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
Oskar Hahn
cc657b1fee Merge pull request #1885 from normanjaeckel/MediafileFix 
Fixed mediaifle app.
 2016-01-25 08:21:35 +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
Oskar Hahn
338f4ce0a1 Merge pull request #1879 from emanuelschuetze/templateIssues 
Send option request for config page just once (Fixes #1813)
 2016-01-23 08:29:16 +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
Norman Jäckel
48781b95ba Merge pull request #1875 from emanuelschuetze/template-fixes 
Template fixes
 2016-01-22 15:02:06 +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