Emanuel Schütze
41124a53ca
Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.
...
Set settings value to False to disable new amendment button in motion detail
template. Default: True.
2017-01-09 14:25:28 +01:00
FinnStutzenstein
a9fbbb522e
Change user import table
2017-01-09 14:22:32 +01:00
Norman Jäckel
58d8f68cc5
Merge pull request #2814 from FinnStutzenstein/ConfigEditor
...
Use ckeditor in config
2017-01-09 14:19:32 +01:00
FinnStutzenstein
e8fa488d60
Project change recommendations
2017-01-07 14:48:11 +01:00
FinnStutzenstein
4530a5faed
Use ckeditor in config
2017-01-07 14:45:58 +01:00
Emanuel Schütze
11c0b0cc3f
Merge pull request #2816 from FinnStutzenstein/Issue2127
...
Use ckeditor to edit projector messages
2017-01-06 21:28:48 +01:00
FinnStutzenstein
c3fc7d0f1b
Do not project more than one message
2017-01-06 19:48:37 +01:00
FinnStutzenstein
6e7321d2a3
disable edit button if it is not possible to edit
2017-01-06 14:51:27 +01:00
FinnStutzenstein
f37ad0f6c3
Use ckeditor to edit projector messages
2017-01-06 12:45:30 +01:00
Maximilian Krambach
a31ffd1009
print correct number of ballots ( closes #2504 )
2017-01-06 11:39:55 +01:00
Emanuel Schütze
cc0c0bf0d4
Merge pull request #2783 from FinnStutzenstein/PapaParse
...
New csv import using PapaParse
2017-01-06 11:33:06 +01:00
FinnStutzenstein
f5fa3575df
New csv import using PapaParse
2017-01-06 10:50:03 +01:00
Emanuel Schütze
388e6353cc
Show qr codes in access data pdf only if config fields are set.
...
Disable footer with page numbers.
2017-01-04 22:43:17 +01:00
Norman Jäckel
286643ddd2
Merge pull request #2797 from FinnStutzenstein/Issue2653
...
projector language (closes #2653 )
2016-12-21 11:55:49 +01:00
FinnStutzenstein
f9f64b3e31
projector language ( closes #2653 )
2016-12-21 10:41:06 +01:00
FinnStutzenstein
6454853bf6
Consistent time handling and generic time converter code
2016-12-21 10:09:27 +01:00
Emanuel Schütze
ff444eaa5d
Merge pull request #2795 from CatoTH/Issue2777-pdf-problems
...
Bugfix for PDF-export - fixes #2777
2016-12-19 19:46:44 +01:00
Tobias Hößl
159720b983
Bugfix for PDF-export - fixes #2777
2016-12-19 16:17:36 +01:00
FinnStutzenstein
a24b4aed99
cookie handling on login
2016-12-19 14:14:46 +01:00
Emanuel Schütze
01ab52a637
Use Roboto Medium font for some more 'bold' classes.
2016-12-16 22:10:56 +01:00
Emanuel Schütze
82396a784d
Fixing some remarks for CKEditor PR#2770
2016-12-16 21:43:19 +01:00
Maximilian Krambach
58b8066249
Going back from TinyMCE to CKEditor
...
- Update CKEditor toolbar
- CKEditor: new formating options and stripping empty paragraphs from imports
- fix for other clipboard html cases not beginning with 'p' tag
- Added RemoveFormat button to ckditor toolbar.
- Reorder bower.json
- inline editor and working on line numbers and language setting
- line numbering in inline edit
- changed allowed content, line number display, editor toggling
- included "justify" in ckeditor
- reload original text after ckeditor is disabled
- Reorder and extend ckeditor toolbar.
- fixed save button trigger and inserted a revert button
- set language on editor load (works for inline case only)
2016-12-16 21:43:19 +01:00
Norman Jäckel
4ebb8023e3
Merge pull request #2776 from CatoTH/Issue2770-pdfmake-bugfix
...
Bugfix for #2770
2016-12-16 20:32:54 +01:00
Emanuel Schütze
cd89f72a17
Merge pull request #2778 from emanuelschuetze/inject-improvement
...
Speed up autoupdates
2016-12-16 19:12:45 +01:00
Emanuel Schütze
4b9be816b3
Speed up autoupdates
...
Use 'bulk mode' for DS.inject by calling inject
only once per each collection.
2016-12-16 18:55:24 +01:00
Norman Jäckel
75f4c55181
Removed viewpoint for Django url patterns. Fixed #1453 .
2016-12-16 17:01:34 +01:00
Tobias Hößl
46cf26481e
Bugfix for #2770
2016-12-14 22:28:44 +01:00
Maximilian Krambach
0e6324b252
Change the language selector to the languages' own names
2016-12-14 15:25:38 +01:00
Emanuel Schütze
218b4bc7f4
Remove old countdowns and messages in core migrations.
2016-12-13 17:04:25 +01:00
Norman Jäckel
3096958ba9
Prepare migrations for 2.1b1.
...
Agenda, Assignments, Core, Mediafiles, Motions, Users.
Topics are already done.
2016-12-13 11:58:36 +01:00
Norman Jäckel
c1d4927a9b
Merge pull request #2764 from FinnStutzenstein/Issue2754
...
More motion select mode options and layout changes for guests
2016-12-13 11:57:51 +01:00
FinnStutzenstein
dbdaa9748c
More motion select mode options and layout changes for guests
2016-12-13 11:27:44 +01:00
Norman Jäckel
6a58174e25
Merge pull request #2765 from FinnStutzenstein/Issue2451
...
rename mediafiles private flag to hidden
2016-12-13 11:15:53 +01:00
Emanuel Schütze
a9cc8fcb37
Some template style and translation fixes.
2016-12-12 20:30:50 +01:00
FinnStutzenstein
6bbbf30d94
rename mediafiles private flag to hidden
2016-12-12 16:23:31 +01:00
Norman Jäckel
99db9b71b7
Merge pull request #2760 from normanjaeckel/MotionTextIntro
...
Added global config for motion preamble.
2016-12-12 16:23:18 +01:00
Emanuel Schütze
32b7ddedce
Template fixes for motion preamble ( #2760 ).
2016-12-12 16:14:32 +01:00
Emanuel Schütze
8780c47fc1
Minor fixes ( Fixes #2750 )
...
- Use <ul> instead of <ol> for candidate lists.
- Fix sorting by assignment_related_users.length in list view (Fixes #2750 ).
- Apply category and motion block for new amendments.
2016-12-12 12:58:58 +01:00
Emanuel Schütze
116c3702f2
Updated German translations.
...
Added missing translation filter.
2016-12-11 13:37:26 +01:00
Emanuel Schütze
8289306569
Merge pull request #2746 from emanuelschuetze/fonts
...
Use Roboto font in all templates.
2016-12-09 22:26:38 +01:00
Emanuel Schütze
0bef3d751e
Merge pull request #2742 from emanuelschuetze/missing-translations
...
Mark missing translation strings in table headers.
2016-12-09 15:22:03 +01:00
Norman Jäckel
c2edf134e2
Merge pull request #2751 from FinnStutzenstein/Issue2747
...
Some stylistic changes and new motion filter option
2016-12-09 15:16:50 +01:00
Emanuel Schütze
f6d01c1d17
Mark missing translation strings in table headers.
2016-12-09 15:13:35 +01:00
Emanuel Schütze
fb7b265826
Use Roboto font in all templates.
...
- Only install needed font files for Roboto and Roboto Condensed
which strongly reduced the directory size of 'static/font'.
- Make it easier to adjust custom font by using global css font definition
in app.css and projector.css.
- Remove Open Sans font.
2016-12-09 15:10:31 +01:00
FinnStutzenstein
f7fcb69cc2
Some stylistic changes and new motion filter option
2016-12-09 14:58:15 +01:00
FinnStutzenstein
36c8477c7f
no nav underline glitch
2016-12-09 13:51:23 +01:00
sean
b1f4def743
add precise text decoration ( fixes #2576 )
2016-12-07 21:41:55 +01:00
Norman Jäckel
4e5adb74e3
Merge pull request #2739 from CatoTH/Issue2561-pdf-line-numbering-in-lists
...
Attempt to mitigate the list / line number problem
2016-12-07 11:34:50 +01:00
Norman Jäckel
b27a975075
Merge pull request #2737 from FinnStutzenstein/Issue2730
...
Use session cookies and store filter settings in sessionStorage
2016-12-07 11:25:06 +01:00
FinnStutzenstein
acb5a6dcf9
Use session cookies and store filter settings in sessionStorage
2016-12-07 08:01:33 +01:00
Tobias Hößl
2cb1429c8d
First attempt to mitigate the list / line number problem
2016-12-06 22:12:29 +01:00
FinnStutzenstein
29ae600194
Dynamic webpage title
2016-12-05 18:00:52 +01:00
Emanuel Schütze
486f0601eb
Merge pull request #2721 from FinnStutzenstein/AgendaTable
...
Agenda table
2016-12-02 15:59:57 +01:00
FinnStutzenstein
ee5adb8fd2
New AgendaTable
2016-12-02 15:18:32 +01:00
Norman Jäckel
926d04f610
Merge pull request #2723 from FinnStutzenstein/Clock
...
Fixing the clock
2016-12-02 14:46:43 +01:00
Norman Jäckel
dc0559ef38
Merge pull request #2722 from FinnStutzenstein/Issue2126
...
Show countdown above messageoverlay (closes #2126 )
2016-12-02 14:26:15 +01:00
Norman Jäckel
1ca0b7f291
Merge pull request #2719 from FinnStutzenstein/Issue2693
...
Translate legal notice
2016-12-02 14:25:51 +01:00
FinnStutzenstein
7e18061e53
Fixing the clock
2016-12-02 14:17:37 +01:00
FinnStutzenstein
cc8cf1ef7a
Show countdown above messageoverlay ( closes #2126 )
2016-12-02 12:31:10 +01:00
FinnStutzenstein
0f89205038
Translate legal notice
2016-12-02 08:10:06 +01:00
Norman Jäckel
526a5478f7
Added settings for client to basic JavaScript code on client startup. Closed #2697 .
2016-12-01 15:21:11 +01:00
Emanuel Schütze
9dd44edb9e
Merge pull request #2698 from FinnStutzenstein/Issue2531
...
Translate default projector (closes #2531 )
2016-12-01 11:02:02 +01:00
Norman Jäckel
6aa3ea0d63
Merge pull request #2627 from CatoTH/change-recommendations-inline-diff
...
Showing Diff inline
2016-12-01 10:24:18 +01:00
FinnStutzenstein
b0c94888ce
Translate default projector ( closes #2531 )
2016-12-01 07:48:26 +01:00
Emanuel Schütze
17c464bafa
Merge pull request #2688 from FinnStutzenstein/AssignmentsTable
...
New assignment and mediafile tables and table generics
2016-11-30 14:29:13 +01:00
FinnStutzenstein
4f717b6610
New assignment and mediafile tables and table generics
2016-11-29 16:29:29 +01:00
Emanuel Schütze
5312d44235
Merge pull request #2651 from CatoTH/editing-change-recommendations
...
Editing change recommendations
2016-11-28 21:31:22 +01:00
Emanuel Schütze
a30085f756
Merge pull request #2632 from CatoTH/explicitly-enter-change-recommendation-type
...
Allow to explicitly set the type of a change recommendation
2016-11-28 20:57:21 +01:00
Emanuel Schütze
ddfafd327b
Merge pull request #2655 from CatoTH/Issue2615-line-selection-improvements
...
A small tooltip after selecting the first line when creating a change recommendation
2016-11-28 20:45:07 +01:00
Emanuel Schütze
e865cfe105
Improved forms in ng-dialogs.
...
- users: use form field in grid layout and add more option
to reduce scrolling of long dialog.
- agenda/motions/assignment: show parent agenda item field for create
dialog only (to prevent corrupt agenda by action 'set my child item as my new
parent item')
- refactor ng dialog and formly code.
2016-11-27 22:57:56 +01:00
Tobias Hößl
2958a401ad
Showing Diff inline
2016-11-26 16:50:32 +01:00
Tobias Hößl
f380f63851
A proposition so mitigate #2615
2016-11-26 12:34:26 +01:00
Norman Jäckel
36dc957f19
Changed tooltips.
2016-11-24 00:07:50 +01:00
Tobias Hößl
fd82ae348e
Editing change recommendations
2016-11-23 23:42:24 +01:00
FinnStutzenstein
88537cf67e
Some improvements for Multiprojector
2016-11-21 15:01:54 +01:00
Emanuel Schütze
829acce22d
Merge pull request #2648 from normanjaeckel/FixBroadcastOnDelete
...
Fixed projector broadcast if projector is deleted. Fixed #2646 .
2016-11-20 22:43:47 +01:00
Norman Jäckel
28059698c7
Fixed projector broadcast if projector is deleted. Fixed #2646 .
2016-11-19 13:04:24 +01:00
FinnStutzenstein
0cc8a81320
countdown and message models ( closes #2464 )
2016-11-19 12:37:33 +01:00
Tobias Hößl
771f087ade
Allow to explicitly set the type of a change recommendation
2016-11-19 11:57:54 +01:00
FinnStutzenstein
e0f78b16a0
New table design for users
2016-11-18 09:42:29 +01:00
Emanuel Schütze
f9f9934722
Fixed missplaced comma in pdf header ( Fixed #2639 )
2016-11-16 21:05:04 +01:00
Emanuel Schütze
f8958e36a6
Fixed missing translations ( Fixed #2616 , fixed #2625 )
2016-11-15 21:18:06 +01:00
Emanuel Schütze
b9a325ba5d
Merge pull request #2620 from FinnStutzenstein/Issue2590
...
Highlighting motions for multiprojector and move httpProvider (fixes …
2016-11-15 20:21:19 +01:00
FinnStutzenstein
4b8fc5fa19
Highlighting motions for multiprojector and move httpProvider ( fixes #2590 )
2016-11-15 13:09:56 +01:00
Emanuel Schütze
4e1fdc6b22
Updated PDF layout
...
- use default font for pdf from vfs_font.js
remove base64 encoding function on server side
- use recommendation config value in motion detail template
2016-11-14 18:52:50 +01:00
Emanuel Schütze
18accc58ae
Merge pull request #2610 from tsiegleauq/electionListPdfMake
...
ElectionList over PdfMake
2016-11-14 18:05:03 +01:00
Emanuel Schütze
ff359ea629
Improved assignments and motions pdf.
...
Load all users in pdfmake function - not in state resolver of
assignment list.
2016-11-14 17:55:50 +01:00
Emanuel Schütze
e49411250a
Merge pull request #2558 from FinnStutzenstein/Issue2462
...
change all isProjected functions (closes #2462 )
2016-11-11 15:57:56 +01:00
FinnStutzenstein
af9755cb9a
changed all project functions
2016-11-11 09:37:37 +01:00
Emanuel Schütze
3b41f99a6f
Load angular-gettext language files from plugin ( Fixed #2339 )
...
Add new OpenSlidesPlugins provider where plugins can be registered.
2016-11-10 12:51:16 +01:00
Sean Engelhardt
7069326655
ElectionList over PdfMake
2016-11-09 20:23:01 +01:00
Norman Jäckel
4d80914b8a
Fixed zoom and scroll, fixed #2547 .
2016-11-08 21:29:26 +01:00
FinnStutzenstein
43d9733881
fixing current list of speakers
2016-11-08 13:00:50 +01:00
Emanuel Schütze
b297bab5b5
Fix merge conflict in core/base.js
2016-11-02 22:05:07 +01:00
Emanuel Schütze
ef36962221
Merge pull request #2580 from tsiegleauq/accessDataListPdfMake
...
Creates the access data list with PdfMake
2016-11-02 14:53:50 +01:00
Sean Engelhardt
34f74da58d
Creates the access data list with PdfMake
2016-11-02 14:19:57 +01:00
Emanuel Schütze
e315cbad89
Fix regression with projector loading.
...
Projector requires Editor provider in core/base.js instead of site.js
because MotionComments (in motions/base.js) uses now Editor factory.
2016-11-02 14:10:59 +01:00
Emanuel Schütze
caf52094a4
Allow to resize tinymce editor ( Fixes #2115 )
2016-11-02 10:35:18 +01:00
Norman Jäckel
50868d1432
Merge pull request #2567 from emanuelschuetze/fix-translation-strings
...
Fixed translation issues.
2016-11-01 23:58:43 +01:00
Emanuel Schütze
b08ca4be02
Merge pull request #2534 from tsiegleauq/electionsListPdfMake
...
Creates the Election documents using PdfMake
2016-11-01 23:40:42 +01:00
Emanuel Schütze
4b124a629b
Fixed translation issues.
2016-11-01 23:32:39 +01:00
Sean Engelhardt
14ca655aa2
Creates the Election documents using PdfMake
2016-11-01 23:18:19 +01:00
FinnStutzenstein
58dd2f2b30
change all isProjected functions ( closes #2462 )
2016-11-01 10:31:28 +01:00
Tobias Hößl
03ef217c4e
Colors / text-Decorations for insered / deleted text; hide line numbers in inserted text
2016-10-29 16:23:16 +02:00
Norman Jäckel
9ca15fd0b8
Fixed migrations by skipping autoupdate.
2016-10-24 10:42:34 +02:00
FinnStutzenstein
111b9e3fd7
use check icon and no post request on deselect ( fixes #2471 )
2016-10-21 09:39:04 +02:00
Emanuel Schütze
dc1c958e0f
Merge pull request #2514 from FinnStutzenstein/Issue2494
...
Round corners for projectorbuttons (fixes #2494 )
2016-10-18 13:01:49 +02:00
FinnStutzenstein
6ca3c07e1f
Round corners for projectorbuttons ( fixes #2494 )
2016-10-18 12:48:19 +02:00
Emanuel Schütze
68139ff5be
Merge pull request #2512 from FinnStutzenstein/Issue2470
...
key value switched in angular foreach (fixes #2470 )
2016-10-17 22:05:55 +02:00
Norman Jäckel
676e783039
Merge pull request #2516 from FinnStutzenstein/Issue2502
...
Remove chat history
2016-10-17 21:48:34 +02:00
Norman Jäckel
f2fa8de7be
Merge pull request #2495 from normanjaeckel/MotionBlock
...
Motion block
2016-10-17 21:29:31 +02:00
Norman Jäckel
20f8875dcd
Added view to follow recommendations.
...
for all motions of a motion block
2016-10-17 21:02:50 +02:00
Emanuel Schuetze
0270c31b32
Template improvements for motion blocks.
...
Fixed $stateProvider to allow camelCase in state name (Fixed #2479 )
- Refactor generic templateUrl function.
- Rename MotionBlock templates.
- Rename MotionBlock controller.
2016-10-17 20:58:10 +02:00
Norman Jäckel
700c86a24c
New feature blocks for motions.
...
- Added ListView, DetailView, UpdateForm and connection to
agenda item for MotionBlock.
- Added slide and projection default.
- Added custom manager for motion blocks.
- Enabled current list of speakers slide and overlay for motion block.
2016-10-17 20:54:26 +02:00
Norman Jäckel
8d494ddef9
Merge pull request #2511 from FinnStutzenstein/Issue2465
...
Rename AdditionalId to arg (closes #2465 )
2016-10-17 20:45:23 +02:00
Tobias Hößl
228abf5cee
Change recommendations
2016-10-17 19:37:32 +02:00
Norman Jäckel
e944f6368b
Merge pull request #2509 from matakuka/majorities
...
Majorities (issue #2258 )
2016-10-17 17:15:15 +02:00
Norman Jäckel
45aa4146da
Refactored majority calculation. Added cache for MotionPollDetailCtrl.
2016-10-17 17:03:42 +02:00
Maximilian Krambach
e5e1e3e8ba
Majority test for motions
2016-10-17 17:03:31 +02:00
Norman Jäckel
639748bb3b
Added view to clear the chatbox.
2016-10-17 16:56:19 +02:00
FinnStutzenstein
7965fd3fce
Button for deleting chat history
2016-10-17 15:04:06 +02:00
Emanuel Schütze
208d94a91b
Support https as websocket protocol (wss).
2016-10-17 11:31:27 +02:00
FinnStutzenstein
5272a3c1bb
key value switched in angular foreach ( fixes #2470 )
2016-10-17 08:58:43 +02:00
FinnStutzenstein
7fcbed051c
Rename AdditionalId to arg ( closes #2465 )
2016-10-17 08:10:52 +02:00
André Böhlke
cced97d9fb
password change command
2016-10-14 16:01:46 +02:00
Norman Jäckel
447339ec33
Merge pull request #2508 from tsiegleauq/userListPdfMake
...
Create the user list over pdfmake
2016-10-14 11:50:31 +02:00
Sean Engelhardt
54fc500d04
Create the user list over pdfmake
2016-10-12 16:52:24 +02:00
Maximilian Krambach
88674da36a
list-of-speakers overlay ( fixes #2211 )
2016-10-12 15:45:21 +02:00
Emanuel Schütze
6f70fb630c
Merge pull request #2498 from tsiegleauq/agendaPDFmake
...
Generate agendas using pdfmake
2016-10-12 10:27:46 +02:00
Sean Engelhardt
345328357f
Generate agendas using pdfmake
2016-10-11 18:10:33 +02:00
Emanuel Schuetze
f7d10b417e
Template fixes
...
- motion list: show category and tags dropdown for manager only
- manage projector: fix submenu buttons and css classes
2016-10-07 11:42:33 +02:00
FinnStutzenstein
f1c58f98e8
Using a datetimepicker for agenda start time ( closes #2413 and fixes #2440 )
2016-10-06 22:12:51 +02:00
Sean Engelhardt
5040caba5c
moves pdfmake related code in own files ( fixes #2307 )
2016-10-05 11:27:22 +02:00
Oskar Hahn
e209dd6dfe
Support to send many objects through the autoupdate system
2016-10-04 18:10:04 +02:00
Emanuel Schuetze
d7a22c371e
Minor changes
...
- Show workflow field in motion form only if more than one workflows
exists.
- Reorder the fields category, tags and origin in motion detail.
- Fix translation string 'Line numbering'.
- Fix padding in motion list.
2016-10-04 15:06:50 +02:00
Emanuel Schuetze
4075c1aa3f
Fixed translations strings. Updated template-en.pot.
2016-10-04 12:04:55 +02:00
Emanuel Schütze
e64a1bf19c
Merge pull request #2478 from emanuelschuetze/ui-improvements
...
UI improvements
2016-10-04 10:59:21 +02:00
Emanuel Schuetze
bc72089973
UI improvements
...
- item list: reorder buttons
- motion list:
* move hover menu for edit/delete below submitters
* limit submitters to one
- motion detail:
* show ol flush left
* use 2 or 3 columns in meta box
* use small buttons for line numbering controls
* group line number controls in grey tool bar.
* Show motion comments div only if user is allowed.
- motion config:
* Deativate comments by default.
* Deactivate recommendations for motions by default.
- item detail: Show needed buttons only.
- assignment detail: Improve ballot tabs.
- general:
* move pdf button to right
* move 'back to overview' button to left
* update label vor countdown option
2016-10-04 10:51:19 +02:00
Norman Jäckel
2e7555e720
Fixed broadcast. Fixed #2467 .
2016-10-01 14:37:04 +02:00
Oskar Hahn
98bab9b358
Fix tests and remove old code.
2016-10-01 01:49:27 +02:00
Norman Jäckel
039795beb7
Refactored projector requirements system for autoupdate.
2016-10-01 01:49:17 +02:00
Oskar Hahn
ac9c9f4ec3
More tests, development instructions and small changes.
2016-10-01 01:48:30 +02:00
Norman Jäckel
7cd70a568c
Added docstrings. Small changes.
2016-10-01 01:48:18 +02:00
Oskar Hahn
368873e738
Adds a cache system to the CollectionElement and add
...
a Collection class that can be used to call a collection
used this for the list and receive rest api.
2016-09-30 21:37:52 +02:00
Emanuel Schuetze
720c7e76a5
Hot fix for broadcast (will improved later).
2016-09-30 21:20:30 +02:00
Emanuel Schuetze
6f2a509ebf
Fix mediafile control buttons for fullscreen and play.
2016-09-30 19:59:53 +02:00
Norman Jäckel
8427ffd816
Small changes for multiple projector feature.
2016-09-30 19:11:33 +02:00
Finn Stutzenstein
e6b9b21d41
Added support for multiple projectors.
2016-09-30 18:58:59 +02:00
Emanuel Schütze
447d475321
Merge pull request #2461 from FinnStutzenstein/minorFixes
...
some minor fixes
2016-09-30 17:37:27 +02:00
FinnStutzenstein
84cd3dbc77
little fixes
2016-09-28 19:27:40 +02:00
Norman Jäckel
f4c6c35584
Merge pull request #2449 from emanuelschuetze/fixTranslations
...
Minor fixes
2016-09-28 13:17:59 +02:00
Emanuel Schuetze
4732c64617
Minor fixes
...
- Fix translation strings.
- Fix dropdown style in motion table.
2016-09-27 15:21:52 +02:00
FinnStutzenstein
673ee1da18
hotfix
2016-09-27 11:47:57 +02:00
Norman Jäckel
8398e3abf0
Merge pull request #2436 from tsiegleauq/issue2433-PdfInvalidHTML
...
Repairs invalid HTML during PDF generation (fixes #2433 )
2016-09-26 20:51:04 +02:00
sean
d1addf4df6
Repairs invalid HTML during PDF generation ( fixes #2433 )
2016-09-26 18:53:59 +02:00
Emanuel Schütze
223b168441
Merge pull request #2434 from emanuelschuetze/update-translations
...
Updated German translations. Fixed some translation strings.
2016-09-26 15:46:38 +02:00
Emanuel Schuetze
148e7f6a9b
Updated German translations. Fixed some translation strings.
2016-09-26 15:33:40 +02:00
Sean Engelhardt
d4c4f944fe
Add motion catalog over pdfmake ( fixes #2299 )
2016-09-26 13:25:58 +02:00
Emanuel Schütze
50f5d0a33a
Merge pull request #2380 from FinnStutzenstein/Issue2348
...
New ui element for comments in config (closes #2348 )
2016-09-24 13:34:08 +02:00
Emanuel Schütze
5a70125922
Merge pull request #2423 from normanjaeckel/NeedFullUpdate
...
Implemented need_full_update check. Fixed #2396 .
2016-09-23 15:00:17 +02:00
Norman Jäckel
26f615fed4
Merge pull request #2426 from FinnStutzenstein/Issue2420
...
Fixing the projector sidebar on firefox (closes #2420 )
2016-09-23 14:45:25 +02:00
Finn Stutzenstein
d13e11beb1
New ui element for comments in config ( closes #2348 )
2016-09-23 14:37:13 +02:00
Norman Jäckel
dc404d21f6
Implemented need_full_update check. Fixed #2396 .
2016-09-23 14:36:26 +02:00
FinnStutzenstein
8a73ce1be5
Fixing the projector sidebar on firefox ( closes #2420 )
2016-09-23 14:34:31 +02:00
FinnStutzenstein
448756f17a
Docx export with docxtemplater
2016-09-23 14:20:07 +02:00
Norman Jäckel
53ac7c2348
Merge pull request #2117 from lesteenman/extendedMediaFileSupport
...
Initial attempt at support for image and video files.
2016-09-22 23:28:00 +02:00
Emanuel Schütze
2495d7dd7f
Merge pull request #2412 from FinnStutzenstein/Issue2109
...
Agenda duration and estimated time (closes #2109 )
2016-09-22 22:40:23 +02:00
Norman Jäckel
926516ac65
Small style changes.
2016-09-22 21:59:36 +02:00
FinnStutzenstein
970f42cacb
Agenda duration and estimated time ( closes #2109 )
2016-09-22 21:59:35 +02:00
Erik Steenman
514eea2105
Add support for image and video files.
2016-09-22 19:03:27 +02:00
FinnStutzenstein
457f8735d0
Allow to scale the projector in the projectorcontainer greater than 100%
2016-09-22 11:26:42 +02:00
Norman Jäckel
cab53f0434
Moved custom slides to own app topics for better app structure.
...
Renamed model to Topic. Added migrations file. Fixed #2402 .
2016-09-21 15:00:23 +02:00
Finn Stutzenstein
a06806c33b
Highlighting and jumping to lines in motions ( closes #2347 )
2016-09-21 13:58:39 +02:00
Norman Jäckel
2d15bd54a1
Merge pull request #2386 from FinnStutzenstein/sidebarScroll
...
First attempt to scroll the projector sidebar
2016-09-21 12:40:13 +02:00
Norman Jäckel
96b4fb9fd9
Merge pull request #2376 from tsiegleauq/issue2300-pdf-line-numbers
...
Add line numbers to pdf (fixes #2300 )
2016-09-20 21:15:25 +02:00
Emanuel Schuetze
875b7b2ddd
Reduced font-size of outline numbers.
2016-09-20 16:57:57 +02:00
Sean Engelhardt
cc5ff21005
Add line numbers to pdf ( fixes #2300 )
2016-09-20 11:34:19 +02:00
FinnStutzenstein
9347a78d56
Make the sidebar scroll and one typofix
2016-09-19 09:05:55 +02:00
Norman Jäckel
858f4a2b43
Merge pull request #2405 from emanuelschuetze/fixAlerts
...
Fixed syntax of all uib-alerts.
2016-09-18 22:54:29 +02:00
Emanuel Schuetze
2a825adde4
Disable projector auto reload after 5 minutes.
...
Auto reload no longer used because client gets all required data
after reconnection via websocket.
2016-09-18 22:34:54 +02:00
Emanuel Schuetze
a7f5d4dd3c
Fixed syntax of all uib-alerts.
...
Required after ui-bootstrap upgrade.
2016-09-18 21:09:37 +02:00
Norman Jäckel
00913a6333
Added management command to change config values. Fixed #2400 .
2016-09-18 13:17:21 +02:00
Norman Jäckel
76250c5851
Changed loading of JavaScript files.
2016-09-18 11:23:51 +02:00
Emanuel Schuetze
852b175f3e
Upgraded a lot of javascript libs.
...
Some template fixes required for upgrading ui-bootstrap.
2016-09-18 00:45:00 +02:00
Oskar Hahn
6abb0976c2
Change system for autoupdate on the projector ( #2394 )
...
* Second websocket channel for the projector
* Removed use of projector requirements for REST API requests.
Refactored data serializing for projector websocket connection.
* Refactor the way that the projector autoupdate get its data.
* Fixed missing assignment slide title for hidden items.
* Release all items for item list slide and list of speakers slide. Fixed error with motion workflow.
* Created CollectionElement class which helps to handle autoupdate.
2016-09-17 22:26:23 +02:00
Norman Jäckel
d7936c53e3
Updated settings files. Fixed timezone support.
2016-09-16 21:17:00 +02:00
Emanuel Schütze
2753af3585
Merge pull request #2277 from FinnStutzenstein/FeatureCSV
...
Improved motions table with CSV export
2016-09-08 14:47:54 +02:00
Finn Stutzenstein
a05a29c99a
A new motions table with csv export
2016-09-08 14:38:32 +02:00
Norman Jäckel
1cdcad7d47
Fixed bug in templateHook directive. Fixed #2362 .
2016-09-08 00:58:02 +02:00
Emanuel Schütze
34f85da1d8
Merge pull request #2352 from FinnStutzenstein/Issue2349
...
Fixing resolving of Config for projector resolution (fixes #2349 )
2016-09-07 20:10:53 +02:00
Norman Jäckel
261b23affa
Merge pull request #2326 from tsiegleauq/issue2301
...
Limit image scale in pdf documents (fixes #2301 )
2016-09-06 16:41:58 +02:00
Finn Stutzenstein
fd78ccdb01
Fixing resolving of Config for projector resolution ( fixes #2349 )
2016-09-06 12:09:50 +02:00
Norman Jäckel
0fddfdd25a
Merge pull request #2356 from emanuelschuetze/fix
...
Fixed missing translation and form errors.
2016-09-06 00:33:40 +02:00
Emanuel Schuetze
d7b092300d
Fixed missing translation and form errors.
2016-09-05 23:13:07 +02:00
Tobias Hößl
b701127f04
Fix a styling problem
2016-09-05 20:03:41 +02:00
Emanuel Schuetze
7abdc2e615
Increase the allowed characters for event name config to 100.
...
Same limit as event_description.
2016-09-01 15:32:59 +02:00
Norman Jäckel
c87111e81d
Merge pull request #2318 from FinnStutzenstein/projectorSize
...
Control the resolution of the projector
2016-09-01 14:59:53 +02:00
Finn Stutzenstein
a8dcc2abdc
Control the resolution of the projector
2016-08-31 14:18:29 +02:00
Norman Jäckel
31e47e0ac5
Merge pull request #2308 from FinnStutzenstein/Issue1213
...
Handle duplicates during user import (fixes #1213 )
2016-08-31 13:05:03 +02:00
Finn Stutzenstein
78ec30d6b2
Handle duplicates during user import
2016-08-31 12:23:38 +02:00
Emanuel Schuetze
24b95e5fbc
Scale image size also in detail and projector view.
2016-08-31 09:58:26 +02:00
sean
33f463599a
limit image scale in pdf documents ( fixes #2301 )
2016-08-30 12:54:55 +02:00
Emanuel Schütze
6efbe7b210
Merge pull request #2255 from matakuka/search_filter
...
Added search filtering by category (fixes #2019 , fixes #2239 )
2016-08-25 17:53:55 +02:00
Maximilian Krambach
e06b4db664
Added search filtering by category ( fixes #2019 , fixes #2239 )
2016-08-25 17:49:36 +02:00
Maximilian Krambach
3221ce18f6
new view for current list of speakers ( fixes #2212 )
2016-08-25 17:35:57 +02:00
Maximilian Krambach
126cfb9000
Parent items for Agenda items ( fixes #2213 )
2016-08-25 13:51:54 +02:00
Emanuel Schütze
73095948ca
Merge pull request #2260 from FinnStutzenstein/Feature435
...
New matrix interface for group editing (closes #435 )
2016-08-22 15:26:10 +02:00
Finn Stutzenstein
bf3a1ce714
New matrix interface for group editing ( closes #435 )
2016-08-22 15:05:06 +02:00
Tobias Hößl
d986d551e0
Line numbers and inline editing
2016-08-20 11:18:17 +02:00
Norman Jäckel
5ea9cbf4d1
Merge pull request #2289 from emanuelschuetze/motionpdf
...
Minor motion PDF improvements.
2016-08-19 22:42:56 +02:00
Emanuel Schuetze
8a329a81e6
Minor motion PDF improvements.
2016-08-19 22:13:12 +02:00
Norman Jäckel
70a732bce8
Merge pull request #2280 from normanjaeckel/TemplateHook
...
Added template hooks for plugins.
2016-08-19 21:13:55 +02:00
Norman Jäckel
c38cf562d5
Added template hooks for plugins.
2016-08-19 21:08:54 +02:00
Thomas Junk
92a541215f
pdfmake incl. fixes
2016-08-19 16:21:46 +02:00
Thomas Junk
546c4e65f6
PDFMake implemented
2016-08-19 14:10:30 +02:00
Finn Stutzenstein
ee95af9acc
Added a possibility to sort and renumber all motions in a category
2016-08-18 14:54:09 +02:00
Oskar Hahn
8d58368937
Added missing migrations for #2269
2016-08-15 19:15:05 +02:00
Oskar Hahn
fac9e71c29
Remove default permissions for session
...
fixes #2262
2016-08-13 07:37:27 +02:00
Emanuel Schütze
320de66783
Merge pull request #2261 from emanuelschuetze/config-translations
...
Fixed missing translations of config options (Fixes #2193 )
2016-08-09 20:18:49 +02:00
Emanuel Schuetze
282bc45790
Fixed missing translations of config options ( Fixes #2193 , fixes #2245 )
2016-08-09 17:06:24 +02:00
Finn Stutzenstein
b115691675
Messages now allow HTML tags ( Fixes #2127 )
2016-08-05 12:38:19 +02:00
Norman Jäckel
2627724c55
Merge pull request #2199 from matakuka/noBrowserLanguage
...
sets language to en if no browser language is set
2016-07-11 14:19:14 +02:00
Maximilian Krambach
31df629fc9
sets language to en if no browser language is set
2016-07-06 09:52:32 +02:00
Emanuel Schuetze
31657d0cf3
Fixed and update English translation strings.
2016-06-28 10:18:43 +02:00
Norman Jäckel
b45e0ea09f
Fixed coding style.
2016-06-16 10:28:14 +02:00
Maximilian Krambach
a5a00a7eda
Config translations moved to client side (Issue #2093 )
2016-06-12 11:46:46 +02:00
Joel Macht
b7d83e786f
Fix linebreak on tags, add spacing and remove commas ( Fixes #2147 )
2016-06-10 18:17:42 +02:00
Oskar Hahn
fe64941aab
Big Mode for OpenSlides
...
Uses django channels instead of tornado for the autoupdate. Therefore
tornado is nolonger a dependency of OpenSlides (but channels).
This uses websockets instead of SockJS.
Use the flag insecure in the start command to provide static files serving.
Use a new session backend that has a ForeignKey to User.
2016-06-09 11:14:39 +02:00
Maximilian Krambach
5061ea1770
typo fixing (issue #2181 )
2016-06-08 22:18:35 +02:00
Maximilian Krambach
649300cfb8
Add a back button to tag overview ( Fixed #2151 )
2016-06-08 16:41:27 +02:00
Norman Jäckel
8c5c5dc556
Fixed bug on config view.
2016-06-06 14:19:57 +02:00
Oskar Hahn
2221b23447
Redesign of the config variables.
...
Removed the config cache and created files for each app in which the
config variables are defined.
2016-06-03 13:47:54 +02:00
Erik Steenman
4b7ba02b7d
Change the z-index of .fullscreen
to 100.
...
Z-Index 199 places the fullscreen content just below the various
projector overlays, such as messages and timers.
2016-05-10 14:51:30 +02:00
Emanuel Schuetze
e151e7c84c
Fix z-index of chatbox and projector sidebar.
2016-04-17 22:18:16 +02:00
Emanuel Schuetze
06d333c067
Template fixes for better smartphone usage.
...
- Remove on-focus-me directive on every list view.
(Otherwise smartphones/tablets opens always the keyboard on each list view.)
- Make some columns 'optional' in list view to see only the most important columns
on small devices.
- Add z-index for projector sidebar. Show it in full width on small
devices.
- Remove padding on small devices.
2016-04-17 19:56:38 +02:00
Emanuel Schuetze
9481d037e8
Reduce sizes of used logos.
2016-04-13 11:06:50 +02:00
Emanuel Schuetze
cb605d619e
Mark missing translation string.
2016-04-03 11:53:40 +02:00
Emanuel Schuetze
0565d57789
Template fixes
...
- Fix config groups. Use group index instead of group names (with blanks).
- Use 100% width for all chosen fields.
2016-03-21 19:56:53 +01:00
Norman Jäckel
e2383dc770
Merge pull request #2051 from emanuelschuetze/templateFixes2
...
Template improvements
2016-03-20 21:21:52 +01:00
Emanuel Schuetze
3479a0636e
Allow to enter countdown time in seconds or 'mm:ss' format.
2016-03-20 21:07:20 +01:00
Emanuel Schuetze
2af38f75bb
Fix edit current slide button.
2016-03-20 21:07:16 +01:00
Norman Jäckel
5af25351fa
Merge pull request #2049 from emanuelschuetze/fix2028
...
Catch 404 errors in resolve promise if user has not all required permissions
2016-03-20 20:48:58 +01:00
Emanuel Schuetze
5e08e073f4
Fix translation strings in motions and users forms.
2016-03-19 13:06:36 +01:00
Emanuel Schuetze
0cd6bb272c
Projector template improvements
...
- Vertical centering event title (if no description available)
- Fix sorting of main agenda item list.
- Show countdowns side-by-side. Allow edit if countdown is running.
2016-03-19 07:30:18 +01:00
Emanuel Schuetze
03f08628c7
Catch 404 errors in resolve promise if user has not all required permissions.
...
- fix motion detail/list, agenda item detail, assignment list, mediafile list
- add fontpage permission check
- use agenda item title for motion title if available (to show item number)
- fix groupFilter reset in users list
- fix users permission string
Fixes #2028 . Fixes #2038 .
2016-03-18 21:41:16 +01:00
Emanuel Schuetze
140869ebd7
Fix translation strings.
2016-03-18 20:11:04 +01:00
Emanuel Schuetze
89446ce4f6
Use angular-chosen instead of ui-select for better performance.
...
The jQuery select field from angular-chosen is used for all ui-select
fields. See https://github.com/leocaseiro/angular-chosen/
Use input delay on users filter field with 'debounce'.
Fixed #2006 .
2016-03-18 14:37:03 +01:00
Emanuel Schuetze
a8d9581664
Allow html in event name and description.
2016-03-14 17:09:37 +01:00
Emanuel Schuetze
1b25d9c376
Added loading spinner icon.
...
Only for loading resolve object from server.
2016-03-14 17:09:37 +01:00
Emanuel Schuetze
85326d75f2
New configs for font color in header and h1 on projector ( Fixes #2020 )
2016-03-08 23:01:17 +01:00
Norman Jäckel
56936c86ab
Used bulk_create to create the initial projector during migration. Fixed #2035 .
2016-03-07 19:09:45 +01:00
Norman Jäckel
ce3576f306
Merge pull request #2034 from emanuelschuetze/fix2005
...
Fix main menu on small devices (Fixes #2005 )
2016-03-07 19:00:08 +01:00
Emanuel Schuetze
876d9408fe
Fix main menu on small devices ( Fixes #2005 )
...
Use bootstraps navbar-toggle button to bring up a
vertical responsive main menu.
Some additional responsive CSS impmprovements.
2016-03-06 20:14:52 +01:00
Norman Jäckel
132c6e81ec
Forwarding JSON instead of Django model instances to autoupdate loop.
...
- Used raw SQL for createing default projector during inital migration.
- Removed default_password and hidden agenda items from autoupdate data for some users.
- Removed old get_collection_and_id_from_url() function.
2016-03-06 14:24:53 +01:00
Norman Jäckel
4daa61888f
Massive refactoring for autoupdate optimization.
2016-03-06 14:22:40 +01:00
André Böhlke
3db2f2fc16
"durchstich" for autoupdate optimization
2016-03-06 14:22:40 +01:00
Emanuel Schuetze
b78c9bc7bd
Allow pdf scrolling on projector ( Fixes #1949 ).
2016-03-05 22:44:00 +01:00
Emanuel Schuetze
7029852043
Template fixes
...
- switch projector live view minimize/maximize buttons
- show agenda/item split buttons (project only main agenda items, project subitem)
only if subitems are available
2016-03-03 08:46:18 +01:00
Norman Jäckel
de871f3f9c
Squished migrations files.
2016-03-02 14:26:47 +01:00
Norman Jäckel
a2a6637c89
Rename and refactor some ProjectorElement methods. Fixed #1631 .
2016-02-27 20:56:03 +01:00
Norman Jäckel
9fbb12944c
Updated start script help text and custom commands. Fixed #1987 .
2016-02-25 23:17:04 +01:00
Emanuel Schuetze
a6be43809f
Agenda list slide improvements
...
- project summary of selected item
- show full tree OR main agenda items only
- show done items grey (without icon)
2016-02-25 13:37:59 +01:00
Emanuel Schuetze
16fd87cc93
Use a global variable for the limiting number of users in select fields. ( Fixed #1989 )
2016-02-23 22:24:41 +01:00
Emanuel Schuetze
0613304724
Use colorpicker for projector header color config.
2016-02-23 22:24:41 +01:00
Emanuel Schuetze
ba49781b39
Show orange countdown in last x seconds of speaking time (add new config)
2016-02-23 22:24:38 +01:00
Emanuel Schuetze
647e62fb0d
Set focus for chat input
2016-02-23 22:24:33 +01:00
Emanuel Schuetze
84ea0bf1f5
Several important fixes for beta4
...
- Fix socket error in autoupdate (Check if socket exists)
- Add missing translation string for core permission
- Fix KeyError in extract_default_password function in users/views.py
- Improve Pagination. Fix users list for users without can_see_extra_data permissions.
- Limit the number of users in ui-select field
- Fix csv header names in users import help text.
- Use config options (enable logo/title) on projector.
- Nicer font style for main and sub items on agenda slide.
- Fix JS error if this.groups is undefined for anonymous.
2016-02-17 17:49:44 +01:00
Norman Jäckel
75f4a2e62d
Work on JavaScript coding style.
2016-02-16 00:56:56 +01:00
Norman Jäckel
40a3d4534e
Merge pull request #1972 from emanuelschuetze/tinymce
...
Use tinymce instead of CKEditor.
2016-02-16 00:27:58 +01:00
Emanuel Schuetze
16f1ad5731
Use tinymce instead of CKEditor.
...
- better integration of tinymce in bower and gulp
- Improve support for html tags in reportlab's motion pdf.
- Now paste from word works without problems
(That was the main reason of switching to tinymce:
The data loss problem with MS Word is still unfixed in CKEditor,
see https://dev.ckeditor.com/ticket/13174 )
- The editor is now used for customslides (text), motions (text,
reason) and users (about).
- Use mediafile image list for tinymce.
- Use own repository for tinymce-i18n: OpenSlides/tinymce-i18n
2016-02-16 00:22:01 +01:00
Norman Jäckel
2d5f5c685c
Merge pull request #1964 from emanuelschuetze/assignmentpoll
...
Assignmentpoll slide
2016-02-15 23:50:43 +01:00
Emanuel Schuetze
503325220f
Show selected poll on assignment slide.
2016-02-15 23:47:31 +01:00
Emanuel Schuetze
aee8ed2f3b
Template fixes
...
- Show correct last speakers on list of speakers slide.
- Fixes config input type.
- Fixes config style for checkboxes.
- Improved line-height on projector for scaling.
2016-02-14 22:19:14 +01:00
Norman Jäckel
cc55aff8cc
Added possibility to hide config variables.
2016-02-14 21:38:26 +01:00
Emanuel Schuetze
b4cad89939
Use btn-group for projector controls. Added reset scaling.
2016-02-09 22:47:54 +01:00
Emanuel Schuetze
b1dc73ec4d
Use prune_elements for activate mediafile. ( Fixed #1910 )
...
Use page-fit to show pdf in full width.
Fix mediafile search result.
2016-02-09 22:38:07 +01:00
Norman Jäckel
25a7f59b70
Merge pull request #1950 from normanjaeckel/Worker.js
...
Simplified installing of JS and CSS libs. Fixed #1906 .
2016-02-08 22:35:28 +01:00
Norman Jäckel
3be21473a4
Merge pull request #1956 from emanuelschuetze/master
...
Several template fixes
2016-02-08 22:32:56 +01:00
Emanuel Schütze
6cd3e48e45
Merge pull request #1952 from normanjaeckel/ErrorMessages
...
Used 'detail' for all ValidationError messages. See #1946 .
2016-02-08 22:22:43 +01:00
Emanuel Schuetze
96b4784d52
Show motion poll results on projector.
2016-02-08 22:15:31 +01:00
Norman Jäckel
87a97edd69
Used 'detail' for all ValidationError messages. See #1946 .
2016-02-08 21:52:23 +01:00
Emanuel Schuetze
f89f3a9933
Improved motion state dropdown element.
2016-02-08 20:34:12 +01:00
Emanuel Schuetze
4bbb153c42
Use Roboto font in projector header/footer.
2016-02-08 20:27:59 +01:00
Norman Jäckel
0e784cde31
Fixed problem with some REST requests during autoupdate. Fixed #1935 .
2016-02-05 23:55:06 +01:00
Norman Jäckel
8cb74c5e7a
Simplified installing of JS and CSS libs. Fixed #1906 .
2016-02-05 23:27:15 +01:00
Oskar Hahn
eef82d7e72
Merge pull request #1936 from emanuelschuetze/pagination
...
Add Pagination and improve import.
2016-02-03 15:24:21 +01:00
Oskar Hahn
59294b1fcb
Merge pull request #1937 from emanuelschuetze/mediafileImprovements
...
Mediafile: Improvements for pdf presentaiton and list view.
2016-02-03 15:11:41 +01:00
Emanuel Schuetze
af023f30bc
Mediafile: Improvements for pdf presentaiton and list view.
2016-02-03 00:46:17 +01:00
Emanuel Schuetze
8ae3e1d468
Add Pagination and improve import.
...
- Use Pagination for users and item list and users import table.
- Improve agenda import: Allow to define agenda item stuff like
duration, comment, type.
2016-02-02 22:48:06 +01:00
Oskar Hahn
09cbe8c9e4
Fix the autoupdate
2016-02-01 23:21:50 +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
Emanuel Schuetze
1216ea99d3
Refactor reconnect function of autoupdate.
2016-01-29 16:30:00 +01:00
Emanuel Schuetze
3cd49704fc
Use correct special html character for projector template title.
2016-01-29 09:14:26 +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
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
0ce0b9cd18
Fixed gulp 'pot' task. Fixed typos in translation strings.
2016-01-27 22:11:24 +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
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
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
Emanuel Schuetze
2a9e0b4b81
Implement full text search (client side) Fixes #1699
2016-01-27 00:16:30 +01:00
Norman Jäckel
87e3c536da
Deleted Django default permission of some apps. Fixed #1643 .
2016-01-25 14:48:54 +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
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
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
76dc29cddf
Use uib-alert instead of deprecated alert tag.
2016-01-18 21:09:28 +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
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
3fc82a596c
Fixed server error in config update view. Fixed #1828 .
2016-01-13 15:04:47 +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
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
Emanuel Schuetze
f2375008d8
Added attachments for customslide views. ( Fixes #1681 )
2016-01-10 11:55:37 +01:00
Norman Jäckel
8a6ca904dc
Added attachments to custom slides.
2016-01-10 11:51:00 +01:00
Norman Jäckel
ca659351eb
Merge pull request #1825 from emanuelschuetze/fixTemplates
...
Fixed permissions in list views.
2016-01-10 01:07:51 +01:00
Oskar Hahn
87d647ac4d
Merge pull request #1824 from ostcar/fix_tornado
...
Fix tornado
2016-01-10 01:03:16 +01:00
Emanuel Schuetze
071b0a76be
Fixed permissions in list views.
2016-01-10 01:02:13 +01:00
Norman Jäckel
7005ab7f64
Disabled autocomplete for chat box.
2016-01-10 00:46:23 +01:00
Oskar Hahn
4bc0b1d19c
fix autoupdate and hide some groups in user edit form
2016-01-10 00:44:02 +01:00
Oskar Hahn
c30116f5c1
Merge pull request #1815 from emanuelschuetze/candidateElected
...
Mark candidate as elected. Updated assignment detail.
2016-01-09 22:37:39 +01:00
Emanuel Schuetze
2c46d3ae0a
Mark candidate as elected. Updated assignment detail.
2016-01-09 22:35:04 +01:00
Oskar Hahn
3ae6482863
Fix autoupdate of config
2016-01-09 22:13:55 +01:00
Oskar Hahn
2f8138f672
Merge pull request #1811 from normanjaeckel/SquishMigrations
...
Squished all migrations.
2016-01-09 21:04:54 +01:00
Norman Jäckel
8d1c351c9a
Squished all migrations.
2016-01-09 19:10:57 +01:00
Norman Jäckel
544efdb06e
Merge pull request #1806 from ostcar/fix_autoupdate_after_reload
...
Fix autoupdate after auth
2016-01-09 18:55:24 +01:00
Oskar Hahn
5069649e14
Fix autoupdate after auth
...
Remove data after logout
2016-01-09 18:25:18 +01:00
Norman Jäckel
193d318bc9
Merge pull request #1803 from ostcar/os_filter
...
Add osFilter that filters for an explicit text
2016-01-09 17:07:31 +01:00
Emanuel Schuetze
4a9f265b68
Used is_hidden instead of item.typ. Improve hidden filter.
...
Fixed JS error in users and assignments.
2016-01-09 16:55:21 +01:00
Oskar Hahn
e3b6fd8d6d
Add osFilter that filters for an explicit text
2016-01-09 16:45:47 +01:00
Norman Jäckel
68ec516e6f
Merge pull request #1799 from emanuelschuetze/loginText
...
Show info text in login form (Fixes #1754 )
2016-01-09 16:07:55 +01:00
Emanuel Schuetze
11470d3b57
Move welcome config values to general section.
...
Use textarea for welcome text.
2016-01-09 16:05:06 +01:00
Emanuel Schuetze
b035ee7d7c
Improved legal notice page ( Fixes #267 )
2016-01-09 14:44:49 +01:00
Oskar Hahn
c2041dca6f
Merge pull request #1796 from normanjaeckel/MoveTranslations
...
Remove model field verbose names. Move help texts.
2016-01-09 14:25:42 +01:00
Emanuel Schuetze
363c928517
Show info text in login form ( Fixes #1754 )
2016-01-09 14:22:32 +01:00
Norman Jäckel
e406b92745
Remove model field verbose names. Move help texts.
2016-01-09 14:17:51 +01:00
Emanuel Schuetze
54b1c8e350
Show agenda titles with correct numbering
2016-01-09 14:01:30 +01:00
Oskar Hahn
622dadd4ef
Merge pull request #1795 from normanjaeckel/StaticImpressumPage
...
Added config field for legal notes.
2016-01-09 13:22:54 +01:00
Norman Jäckel
d7e39be708
Added config field for legal notes.
2016-01-09 13:01:18 +01:00
Oskar Hahn
4b69c57c78
Merge pull request #1789 from ostcar/update_requirements
...
Update requirements
2016-01-09 12:22:41 +01:00
Oskar Hahn
552998b067
Update requirements, fixt a lot of warnings
...
Set python 3.4 as minimal supported python version
2016-01-09 12:19:46 +01:00
Oskar Hahn
091c08dabd
Merge pull request #1788 from emanuelschuetze/fixSlides
...
Fix slide templates
2016-01-09 12:01:11 +01:00
Oskar Hahn
308f55bb3f
Merge pull request #1782 from ostcar/search
...
Added a search on the server side.
2016-01-09 11:44:08 +01:00
Oskar Hahn
75dcbab5d1
Add search on the server side.
2016-01-09 11:35:57 +01:00
Emanuel Schuetze
5cab3bf3dc
Added indentation of subitems on agenda slide ( Fixes #1716 )
2016-01-09 10:34:34 +01:00
Norman Jäckel
6c33c60600
Merge pull request #1786 from normanjaeckel/LoginInfoView
...
Added login info text in config and view.
2016-01-09 10:24:56 +01:00
Norman Jäckel
ecf561e305
Added login info text in config and view.
2016-01-09 10:01:17 +01:00
Emanuel Schuetze
de77cfc38c
Fixed zooming/scrolling on slides.
2016-01-08 21:31:58 +01:00
Norman Jäckel
d3e8c68a51
Merge pull request #1775 from emanuelschuetze/templateStuff
...
Fixed some template bugs (#1727 )
2015-12-19 11:53:53 +01:00
Oskar Hahn
66e0fe272b
Merge pull request #1764 from normanjaeckel/DefaultPermissions
...
Deleted Django's default permissions.
2015-12-12 09:32:40 +01:00
Emanuel Schuetze
c275b08178
Fixed some template bugs ( #1727 )
...
- Fixed z-index of messages and countdowns.
- Sidebar: Live view open by default. Improve section style.
- Set default value for open_posts in assignments create form.
- Redefine default values in motions create form.
2015-12-12 00:30:05 +01:00
Emanuel Schuetze
041b01afe5
Login dialog behavior if guest mode enabled/disabled ( Fixes #1750 )
2015-12-11 21:18:45 +01:00
Emanuel Schuetze
5d29af5f52
Improved login form.
...
- Add redirect after aborting login. (Fixes #1762 )
- Use new state paramater 'guest_enabled' for login form.
2015-12-11 13:45:53 +01:00
Norman Jäckel
24cb58dc12
Added guest enabled info to WhoAmI view.
2015-12-11 13:44:58 +01:00
Norman Jäckel
114a38e4ee
Deleted Django's default permissions.
2015-12-10 00:31:27 +01:00
Emanuel Schuetze
f050e04f0a
Redirect to login dialog if user is not logged in ( Fixes #1750 )
2015-12-09 20:45:52 +01:00
Norman Jäckel
1b1e8f8ba2
Used our own repository for Open Sans font.
2015-12-06 23:55:30 +01:00
Emanuel Schuetze
5c6977c46d
Template fixes
2015-12-06 17:26:10 +01:00
Oskar Hahn
37cd431aa9
Merge pull request #1737 from emanuelschuetze/motion-csv-import
...
Add motion csv import (Fixes #1675 )
2015-12-05 23:53:08 +01:00
Emanuel Schuetze
d987a1138d
Added motion csv import ( Fixes #1675 )
...
using pre-import checks and preview table.
2015-12-05 21:44:19 +01:00
Emanuel Schuetze
f5452082f0
Use transparent favicon.
...
- Added favicon to projector template.
2015-12-02 14:20:59 +01:00
Norman Jäckel
696bfb0883
Fixed comment.
2015-12-01 15:45:35 +01:00
Emanuel Schuetze
b81704a88f
Fixed translations in agendaSupplement.
2015-12-01 13:45:54 +01:00
Emanuel Schuetze
e23121ed0f
Updated language menu.
...
- improved header menu style
- define new Languages factory
- make it easier to define new languages
2015-12-01 12:06:15 +01:00
Emanuel Schuetze
bf940b177c
Fixed gettext strings in JavaScript.
...
- Added browser lanugage detection.
- Use gettextCatalog.getString(..) instead of gettext(..) in JS code.
- updated pot file
2015-11-30 23:52:42 +01:00
Emanuel Schuetze
fa267b68c2
New template design
...
- Great thanks to Jörn Bensch (from triagonale.de) for new base
template!
- A lot of adaptations in all templates for new design.
2015-11-30 20:36:33 +01:00
Emanuel Schuetze
2b5c9c09b2
Template improvements
...
- use modal dialogs for new/edit views of customslide/motions/assigments
- use hover actions in all list views
- Show assignment candidate names
- support yesnoabstain/vote assignment poll
- Generic solution for open edit dialog.
2015-11-29 22:26:59 +01:00
Oskar Hahn
9a7dea26e0
Angular: Eject assignment related users before a assignment is updated
2015-11-27 22:26:30 +01:00
Emanuel Schuetze
35a8042759
Assignments template improvements
...
- list view with quickview
- ngDialog for create/update view
- candidates
- polls
2015-11-27 00:19:37 +01:00
Emanuel Schuetze
968083e9e5
Improved related agenda items
...
- Added QuickEdit mode for related agenda items
- show/hide hidden agenda items
- Added ng-dialog for modal create/update dialogs of customslides
- use generic links for list of speakers, edit, delete, project
- Moved projector elements to sidebar of index template (In progress!
It will be improved with new base template design).
- Fixed error if chat messages is empty.
- Moved ngSanitize to base.js to use ng-bind-html in projector slides.
2015-11-25 12:18:14 +01:00
Emanuel Schuetze
3c0fcfebac
Reworked on chatbox in base template.
2015-11-22 22:46:18 +01:00
Norman Jäckel
b1dfd2a4e9
Added first chatbox draft on client side.
2015-11-22 22:45:59 +01:00
Norman Jäckel
c5f5fbf203
Remove translations for projector exception messages.
2015-11-21 00:01:48 +01:00
Norman Jäckel
1016af3c52
Updated English language files.
2015-11-20 23:23:01 +01:00
Emanuel Schuetze
e3f57a250c
Use custom ckeditor options
2015-11-17 23:25:09 +01:00
Norman Jäckel
d299579f16
Added CKEditor to custom slide create and edit form.
2015-11-17 23:25:09 +01:00
Emanuel Schuetze
ed72a90306
Reworked all motions templates.
...
motion detail:
- added progres bar for motionpoll
- added support/unsupport function
- show log
motion list:
- added state filter
- added css animations for enter/leave
motion form:
- use angular-formly (instead of old ng-fab-forms with no angular 1.4.x support)
general:
- Workflow states use new field 'css_class' (instead of unused
'icon'). Added migration file.
- added 'allowed_actions' to rest api for each motion (by Norman)
- updated all JavaScript dependencies (bower.json)
2015-11-11 10:50:49 +01:00
Oskar Hahn
c379544e97
Fixed motion states, handled workflow field.
2015-11-11 10:50:49 +01:00
Emanuel Schuetze
5b37a21c87
Motion detail updated for polls.
...
bower.json: updated ui-select
New QuickEdit feature in motion list.
2015-11-11 10:50:49 +01:00
Norman Jäckel
8154b0324b
Added possibility to reset password. Work on user app in general.
2015-11-08 22:10:24 +01:00
Norman Jäckel
03fcf950ff
Updated logo help text.
2015-11-06 17:25:25 +01:00
Oskar Hahn
12a08b9732
New Agenda Item
...
Changed agenda item, so it can not be manualy created, but is always created
when a custom slide, motion or assignment is created.
2015-10-29 15:44:43 +01:00
Norman Jäckel
32b23df763
Split and cleaned up JS files. Added test.
2015-10-22 00:28:01 +02:00
Norman Jäckel
f8cf279d82
Added JSHint to Gulp. Split up JS-Code in users app.
2015-10-21 22:44:07 +02:00
Oskar Hahn
1f0ab173d3
Fix os-perms-lite to make it compatible to ng-show and ng-hide
2015-10-21 21:21:48 +02:00
Emanuel Schuetze
dda16af532
Added controls for projector elements
...
countdowns, messages, scale/scroll/edit current slide
Use global serverOffset.
Fixed #1645 (wrong time of projector clock).
Show countdown description on projector slide.
2015-10-08 19:21:25 +02:00
Norman Jäckel
30e390dcfb
Added API view for server time.
2015-09-24 21:28:30 +02:00
Norman Jäckel
e646cce91e
Added scale and scroll, up, down and reset. Fixed #1633 .
2015-09-18 10:31:22 +02:00
Oskar Hahn
264895b773
Configure js-data for projector elements to "replace" on inject.
...
fixes #1632
2015-09-17 12:04:45 +02:00
Norman Jäckel
187cb0c42f
Fixed blue line for active projector elements.
2015-09-16 23:59:20 +02:00
Emanuel Schuetze
7f9c8b6a38
Agenda item list: new multiselect delete mode
...
Remove action column.
2015-09-14 20:35:24 +02:00
Norman Jäckel
8c48d67df0
Fixed projector.
2015-09-14 20:30:37 +02:00
Norman Jäckel
6d76454925
Added model, serializer and viewset for chat messages.
2015-09-07 17:13:42 +02:00
Norman Jäckel
5c4c0367a1
Updated Projector config field and control views.
2015-09-06 14:59:33 +02:00
Oskar Hahn
2c64a161ac
fix projector
2015-09-06 10:24:15 +02:00
Norman Jäckel
973d3fa653
Merge pull request #1618 from normanjaeckel/Projector
...
Added UUID to projector elements. Added update view.
2015-09-05 21:23:00 +02:00
Norman Jäckel
47a151c71e
Added UUID to projector elements. Added update view.
2015-09-05 21:19:53 +02:00
Oskar Hahn
d8e9ef5575
Merge pull request #1616 from ostcar/main_menu
...
Autogenerate the main menu.
2015-09-05 18:19:59 +02:00
Oskar Hahn
c54b00c5f4
Merge pull request #1613 from emanuelschuetze/user-profile
...
User settings profile view
2015-09-05 18:19:17 +02:00
Oskar Hahn
2da2177c49
Autogenerate the main menu.
2015-09-05 17:23:47 +02:00
Emanuel Schuetze
60002d9111
Added user profile view.
2015-09-05 17:22:37 +02:00
Oskar Hahn
f802fde7de
Merge pull request #1614 from normanjaeckel/BundleCountDown
...
Bundle countdown with list of speakers. Fixed #1541 .
2015-09-05 17:12:22 +02:00
André Böhlke
8691608c5d
Fix javascript syntax
2015-09-05 16:15:25 +02:00
Norman Jäckel
719b5ffedd
Bundle countdown with list of speakers. Fixed #1541 .
2015-09-05 15:07:03 +02:00
Oskar Hahn
fbc57cc23a
Reload config after login
...
Fix errors by saving tags to motions
2015-09-05 11:26:41 +02:00
Oskar Hahn
6674ea85b7
Updated js-data to 2.0
...
Added js-data relation for the motion and agenda app
Added improved load function
2015-09-04 21:05:49 +02:00
Norman Jäckel
965206e1fc
Set permissions for OPTIONS requests. Fixed js-data dependency. Fixed blank in some motion model fields. Fixed error handling in agenda and core views.
2015-09-04 15:44:28 +02:00
Norman Jäckel
7e404946e4
Refactored view permissions.
...
Refactored permission check for REST API viewsets.
Removed old PermissionMixin.
Cleaned up several views.py files.
2015-07-05 22:17:58 +02:00
Oskar Hahn
291f60ee9f
Added a way to load angular apps dynamical
2015-07-01 20:10:40 +02:00
Emanuel Schuetze
bc74a2983c
Fixed typo. Removed unused config.js.
2015-06-29 20:23:10 +02:00
Norman Jäckel
87cce491a0
Merge pull request #1583 from emanuelschuetze/agenda-slides
...
Use item-detail and item-list slides for agenda app.
2015-06-29 18:05:45 +02:00
Emanuel Schuetze
6f985ef483
Use item-detail and item-list slides for agenda app.
2015-06-29 16:45:46 +02:00
Oskar Hahn
3dead745c6
Let the config app accept values that can be converted to the right type.
...
Fixed config app
2015-06-29 15:41:36 +02:00
Oskar Hahn
e042c668d5
Moved config app into the core app
2015-06-29 15:15:33 +02:00
Oskar Hahn
c22791d6c9
Merge pull request #1573 from emanuelschuetze/slides
...
Agenda item slide template. Some template improvements.
2015-06-27 09:48:02 +02:00
Emanuel Schuetze
f75516c7bb
Agenda slide templates. Some template improvements.
...
- User import
- show linebreaks for long text
- some style work
- item detail and agenda list slide
2015-06-25 14:19:43 +02:00
Emanuel Schuetze
6ea14cd2c6
Angular template for config app.
...
Added directive for config fields
2015-06-25 10:52:28 +02:00
Emanuel Schuetze
c2920407bb
Template improvements
...
- Activate slides for users, customslides, motions, assignments.
- Add delete confirm message.
- Fixed required form fields.
- Added version template.
- Improved user import. Updated csv files.
2015-06-25 00:15:56 +02:00
Oskar Hahn
367404b20d
Added projector methods to user model
2015-06-24 13:07:49 +02:00
Norman Jäckel
95b7b16992
Merge pull request #1555 from emanuelschuetze/speakers
...
List of speakers with angularjs
2015-06-22 21:37:39 +02:00
Emanuel Schuetze
8075b0adbb
List of speakers with angularjs.
...
- Add/remove user to/from list
- Open/close list
2015-06-22 14:34:23 +02:00
Emanuel Schuetze
f006b99caf
Added style to projector slide.
...
Added Customslide views.
2015-06-22 14:27:19 +02:00
Oskar Hahn
a0f4506c35
Merge pull request #1549 from normanjaeckel/ConfigRefactoring
...
Refactored config API. Removed form_fields. Added extra fields for HT…
2015-06-18 23:40:23 +02:00
Oskar Hahn
a4c00d5ee3
Angular Client
...
* Split angular app into a site- and a projector app
* Created client slide api and slides for customslide and user
* JS-function to activate a slide
2015-06-18 23:23:34 +02:00
Norman Jäckel
211e39be2c
Added version view via REST API.
2015-06-18 21:48:20 +02:00
Norman Jäckel
c5fbe2e9ee
Refactored config API.
...
Removed form_field attributes.
Added extra fields for HTML rendering like label and help text.
Added fields for sorting and grouping. Removed old collection system.
Added config groups to config view via OPTIONS requests.
Regrouped all variables.
Added validation. Changed internal handling.
2015-06-18 21:13:30 +02:00
Oskar Hahn
dc675e173b
Removed old static files
2015-06-18 18:24:54 +02:00
Norman Jäckel
632ca2bd9a
Renamed config variables. Fixed error in settings.
2015-06-17 12:07:09 +02:00
Oskar Hahn
fbf7d0e43d
Remove old thinks not needed for the 2.0 release:
...
* django templates
* widgets
* views
* mppt
* main_menu
* projector 1.x api
Sorted all imports
Add a ending slash to each url with a redirect view
2015-06-16 17:07:39 +02:00
Norman Jäckel
5813b8341c
Added permission check for objects required for active projector elements.
2015-06-15 18:22:15 +02:00
Norman Jäckel
dc7d27a985
Added REST API for projector. Introduced new projector API.
...
Added custom slide projector element class.
Added welcome slide as custom slide.
Added user slide projector element class.
Added clock, countdown ans message projector elements.
Renamed SignalConnectMetaClass classmethod get_all_objects to get_all (private API).
Added migrations to core app.
Fixed and wrote tests.
Updated CHANGELOG.
2015-05-29 12:44:25 +02:00
Emanuel Schuetze
8d638a908d
Added new angularjs templates
...
for agenda, motions, assignments, users and mediafiles apps.
Users app:
- Show permissions in group form (Fixed #1500 )
- Added experimental csv import for users.
Agenda:
- new agenda sort view.
- Added experimental angular-xeditable for item-list view.
General:
- Added core.tag templates.
- Added mediafiles templates.
- Remove old template and js files. Remove old views.
- Skip old tests.
Added external angular modules:
- angular-loading-bar (Fixed #1448 )
- ui-tree (for sorting agenda tree)
- ng-fab-forms (for better form validation)
- ui-bootstrap (for modal window, dropdown, popover)
- ngBootbox (for confirm delete dialogs in agenda and users app)
2015-05-06 09:19:16 +02:00
Oskar Hahn
80ca3f2484
Use ui-router to handle django urls
...
See: #1453
2015-03-02 19:03:19 +01:00
Emanuel Schuetze
db3625ec91
Angular templates for users app. Use angular-gettext.
...
- Use new "Font Awesome" icons.
- Sorting columns.
- Filter table.
- New focusMe directive.
- Delete user
- Use ui-sref.
- Use angular-gettext for i18n.
- Added sample po files for DE and FR.
- group views
- use google coding style (2 spaces, optional end tags, etc)
2015-03-02 16:25:36 +01:00
Norman Jäckel
681d1115c9
Merge pull request #1499 from ostcar/autoupdate_delete
...
Autoupdate for delete views.
2015-03-01 16:52:37 +01:00
Oskar Hahn
86c189c964
Autoupdate for delete views
...
Fixes : #1495
Also fixed the (example) assignment angular code
2015-03-01 08:42:47 +01:00
Oskar Hahn
f8e18a8900
Altered ui-router definitions
...
1. Allow trailing slash in urls
2. Use integer ids for detail views as default
2015-03-01 07:15:44 +01:00
Norman Jäckel
1777ac48b6
Cleaned up urls.py. Fixed #1472 . Removed use of 'django.views.i18n.javascript_catalog'.
2015-02-25 16:55:44 +01:00
Norman Jäckel
8c04454ecd
Updated setup.py and openslides module init, esp. version string. Removed git commit id grabbing during development.
2015-02-18 16:44:26 +01:00
Oskar Hahn
cfdabfbb40
Added utils.views.CSRFMixin to append the csrf token to a view
...
Fixes : #1476
2015-02-17 20:09:09 +01:00
Oskar Hahn
1969416e64
Implemented auth via AngularJS
...
Also added the derective osPerms to check if the current user has permissions.
Removed old Django views and urls for user.
Created utils.views.APIView which should be used instead of the AjaxView.
Fixes : #1470
Fixes : #1454
2015-02-16 11:42:48 +01:00
Oskar Hahn
411213b1ce
Merge pull request #1458 from normanjaeckel/feature/rest-api/users
...
Refactoring users app.
2015-02-14 02:35:56 +01:00
Norman Jäckel
3a19218bd5
Refactored parts of users app.
...
Refactored user creation and update via REST API. Used new serializer.
Cleaned up management commands, signals and imports. Moved code from 'api.py' to 'models.py'.
Changed usage of group 'Registered'. Now the users don't have to be members to gain its permissions. Used customized auth backend for this.
Added and changed some tests.
2015-02-14 02:29:53 +01:00
Norman Jäckel
99c6a4dbd8
Merge pull request #1461 from ostcar/js-data
...
Updated angular-data to js-data (angular-data 2.1).
2015-02-14 00:32:17 +01:00
Oskar Hahn
d31be54817
Update angular-data to js-data (angular-data 2.1)
...
Also reload all data after 5 minutes
2015-02-13 23:27:27 +01:00
Norman Jäckel
87cd31f6a5
Updated ViewSets to Django REST Framework 3.0.5. Refactored imports from openslides/utils/rest_api.py for better overriding them later.
...
Fixed #1450 . Updated requirements.
2015-02-12 19:19:44 +01:00
Oskar Hahn
ac6f3de60d
Used AngularUI Router for more generic URL routing.
2015-02-12 09:52:07 +01:00
Oskar Hahn
7171a71919
angular single page application
2015-02-05 23:06:09 +01:00
Norman Jäckel
eed5c59013
Refactored serializers and autoupdate.
...
Added api for groups.
Refactored serializers now using 'id' instead of 'url'.
Rework of tornado autoupdate functionality.
Implemented extra data in SockJS messages.
2015-02-05 19:49:54 +01:00
Norman Jäckel
7238b8159a
Added REST api for motion, mediafile and config app. Refactor REST api in other apps.
2015-01-31 14:15:10 +01:00
Oskar Hahn
35024764cf
Rework of management command
2015-01-23 15:40:12 +01:00
Oskar Hahn
8b88d38ac5
Merge branch 'stable/1.7.x'
...
Conflicts:
openslides/__init__.py
openslides/assignment/views.py
openslides/motion/pdf.py
openslides/users/pdf.py
2015-01-23 02:33:17 +01:00
Norman Jäckel
afc2b246db
Fixed bug in chatbox.
2015-01-21 17:24:39 +01:00
Emanuel Schuetze
18fe7e2d89
Update to bootstrap 3.3.1.
2015-01-21 12:23:32 +01:00
Norman Jäckel
c5a7cc889e
Merge pull request #1411 from boehlke/master
...
Fix #1352 and fix order in motion form.
2015-01-18 09:07:24 +01:00
André Böhlke
591d230cbb
Fix field order in motion forms.
...
Add documentation for new attribute.
Added .idea to .gitignore.
2015-01-18 01:01:38 +01:00
Norman Jäckel
4821a3b59b
Added api for assignments.
...
Also small changes in agenda REST api.
2015-01-17 22:46:23 +01:00
André Böhlke
e2e16a4c34
explicitly define fields attribute to fix deprecation warnings
2015-01-17 22:28:32 +01:00
Norman Jäckel
0d56424c90
Refactored REST api in agenda, core and users app.
2015-01-17 15:58:51 +01:00
Oskar Hahn
1a1d072454
remove update_projector and add inform_changed_data
2015-01-17 15:16:49 +01:00
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
7644cb9a09
Added api viewset for custom slides.
2015-01-17 08:51:54 +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
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
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
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
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
c454faef94
Updated Django to 1.7.x
2014-10-14 17:14:52 +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
Oskar Hahn
32137b6523
Use python3
...
python3.3 and python3.4 are supported
2014-08-24 21:21:11 +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
2bfa5f3a72
Prepared for release.
...
Small style changes, CHANGELOG and README.rst update.
2014-05-19 22:55:54 +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
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
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
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
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
Oskar Hahn
921e4ab2bd
Merge pull request #1268 from emanuelschuetze/translationstrings
...
Updated translation strings.
2014-05-05 16:15:44 +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
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
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
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
Norman Jäckel
e7f67457db
Regrouped config collections and pages. Fixed #1201 .
2014-03-13 00:41:57 +01:00
Oskar Hahn
a6fa8457cc
Merge remote-tracking branch 'openslides/stable/1.5.x'
...
Conflicts:
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/motion/templates/motion/motion_list.html
openslides/projector/templates/projector.html
requirements_production.txt
2014-03-12 19:29:22 +01:00
Norman Jäckel
ce8274fb53
Inserted command line option to translate config strings during database setup. Fixed #460 .
2014-01-31 02:03:43 +01:00
Oskar Hahn
2392c1ab36
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-28 08:32:26 +01:00
Emanuel Schuetze
cfa35241e1
Fixed #1138 : Wrong file for projectors logo
2014-01-27 21:15:53 +01:00
Emanuel Schuetze
d8d2ad002a
Rename and clean up static direcories.
...
- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files
2014-01-14 23:27:12 +01:00
Oskar Hahn
c82ee4ce1f
Added AbsoluteUrlMixin and used it in any model.
...
cleaned up get_absolute_url() in some models
2014-01-12 00:35:16 +01:00
Norman Jäckel
21ff62dd32
Changes in projector and core app and in utils.
...
Changed api for main menu entries.
Enhanced http error pages using a classed based views.
Moved dashboard and select widgets view from projector to core app.
Also some small clean ups.
2014-01-10 16:17:54 +01:00
Norman Jäckel
bdf1679eb0
Rename classes in the config api.
...
Also change attributes for config collection without view.
2013-12-06 10:47:20 +01:00
Norman Jäckel
fee983045b
Change API for plugins, esp. for names and versions of plugins. Also enhance possibility to patch existing OpenSlides urlpatterns.
...
Fix some other tests by the way.
2013-12-05 16:40:54 +01:00
Norman Jäckel
1fb1f17d15
New API for widgets using a metaclass.
...
It is now possible to define a default state and to submit extra stylefiles and javascript files when defining a widget in an app. This is done by a new metaclass in openslides.utils.dispatch. Also fixed some other tests.
2013-12-01 21:30:12 +01:00
Norman Jäckel
c34b407945
Fix templatetag, #1077 .
2013-11-19 17:57:03 +01:00
Emanuel Schuetze
06b91b89bb
Fixed typo (titel->title).
2013-11-12 10:57:07 +01:00
Emanuel Schuetze
34701c67a6
Template improvements.
...
- motion detail template: Fixes motion manage state template block.
- mediafile list template: Fixed missing activeline class.
- item detail template: Fixed is_active_slide conditions.
- assignment view template: Use bottongroup instead of single radio buttons.
- Projector template: Updated header and countdown style. Removed footer.
- Added config options to show logo and/or title/description.
- Projector template: New config options to set background color and font color for projector header.
- Make WLAN form labels not translateable.
2013-11-10 20:27:38 +01:00
Oskar Hahn
cc8b573b62
Update projector when the title of the default slide changes
2013-11-06 17:28:17 +01:00
Oskar Hahn
0752d476e4
Change to MIT Licence
...
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
Emanuel Schuetze
a513477033
Fixed #948 : Use DIN A4 format and wlan ssid qrcode on access data PDF.
2013-10-25 20:51:48 +02:00
Emanuel Schuetze
bac918a9e8
Some bug fixing for 1.5b1
...
- Fixed #921 (Check THANKS URL for jQuery UI Nested Sortable)
- Fixed #919 (Permission problem in agenda)
- Fixed #918 (Search does not work for guest users)
- Fixed search-bar position.
- Updated EN po files.
2013-10-21 14:39:28 +02:00
Norman Jäckel
c63b7f995f
Clean up main.py and move code to __main__.py and utils/main.py.
2013-10-19 14:44:20 +02:00
Emanuel Schuetze
e277b8babf
Full text search with haystack and whoosh.
...
Updated THANKS file.
Portable: Added haystack and whoosh.
2013-10-16 08:58:35 +02:00
Oskar Hahn
d937262d28
Use flake8 instead of pep8. Orderd the imports with isort
...
* changed the fab-command pep8 to check
* checked and fixed any code with flake8. Also the urls.py
* checkt the projector app with pylint
2013-10-14 18:43:12 +02:00
Emanuel Schuetze
84d5293fbc
Rework (projector) template with bootstrap.
...
- Always use templatetag 'absolute_url' instead of (depricated) 'model_url'.
Search and replace all old arguments: edit -> update, view -> detail, delete
- Fixed bug in setting default value in 'absolute_url' templatetag
(default value is defined in models.py only).
Updated 'backend' template.
2013-10-07 08:57:22 +02:00
Oskar Hahn
20cf960c82
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/core/templatetags/tags.py
2013-08-19 17:54:50 +02:00
Oskar Hahn
1113b6d861
Added template filter 'absolute_url'
2013-08-19 11:21:29 +02:00
Oskar Hahn
967c199a56
Removed utils from INSTALLED_APPS.
...
Moved utils.management and utils.templatetags to core
2013-08-11 09:40:14 +02:00
Emanuel Schuetze
a383a4305b
Fixed some (pdf) template issues and updated (DE) translation.
...
- Fixed #737 (Motion edit link is missing for normal delegate users)
- Fixed motion pdf filename errors (now use motion-<identifier>.pdf or if no identifier: motion-<title>.pdf with using djangos slugify for special chars in title)
- Fixed motion pdf build error if there is an unauthorized version
- Enlarge max_length of event name field to 50 chars.
- Align participant import instruction with motion import page.
- Added title field to particpants-demo_en.csv.
- participant overview: Show comma after last_name only if first_name and last_name are given.
- Changed all page titles to "<specific action page> - <event-name>" (moved event-name to the end of the string)
- Updated EN tranlation string.
- Updated DE translations.
2013-06-15 17:50:30 +02:00
Emanuel Schuetze
d5becd5c18
Fixed #431 : Template improvements (removed unused loaded tags and check of all html template files)
2013-05-30 23:25:49 +02:00
Norman Jäckel
76d7409830
Change version view. New way to get name and version from plugins.
2013-05-11 14:27:46 +02:00
Norman Jäckel
b6f2176cc8
Move Version page out of config menu. Insert Link into the footer.
2013-04-25 12:37:44 +02:00
Emanuel Schuetze
abad75c129
A lot of template improvements and translation fixes
...
- Fixed agenda widget for special slide views (e.g. list of speakers, summary).
- Fixed back to motion(s) link
- Set icon for list of speakers widget.
- Fixed overlay widget layout of form elements.
- Added submenu with other config_pages to version.html.
- Updated completly DE translations, fixed EN strings.
- Coding style: Use correct ugettext and ugettext_lazy strings. Use "as _" for ugettext only.
Updated translation.
- Improved projector template (clock image, fixed facicon, added subtitle for list of speakers)
- Changed permission strings ('oneself'). Added check if group(pk=3) exists.
- Added event name and description to base template. Some minor template layout fixes.
- Use static subtile (no context var). Show last 2 old_speakers for projector.
- Cut old_speakers.
- Projektor template style changes (e.g. overlay list of speakers).
2013-04-24 10:38:03 +02:00
Norman Jäckel
e1b149cde3
New config app. Apps only have to define config vars once. Config pages, forms and so on are created automaticly.
...
Changes after some reviews are done.
Problematic is still that the JS can not be moved to an extra file because of the template tags in the code.
2013-03-28 15:31:13 +01:00
Norman Jäckel
514577f7c6
Built-in Workflows are created by listening to a signal which is sent after syncdb.
2013-03-11 21:32:09 +01:00