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

121 Commits

Author SHA1 Message Date
Oskar Hahn
cad252cd2b Merge pull request #1794 from normanjaeckel/LockoutProtextion 
Added lockout protection, see #1452.
 2016-01-09 12:19:28 +01:00
Norman Jäckel
cb22071886 Added lockout protection, see #1452. 2016-01-09 12:07:31 +01:00
Oskar Hahn
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
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
Norman Jäckel
7843cc2ec0 Merge pull request #1785 from emanuelschuetze/fix-template-bugs 
Fix template bugs
 2016-01-09 01:12:51 +01:00
Emanuel Schuetze
de77cfc38c Fixed zooming/scrolling on slides. 2016-01-08 21:31:58 +01:00
Emanuel Schuetze
9b78b5992b Fix typo 2015-12-30 23:19:53 +01:00
Emanuel Schuetze
98cd4301a6 Generate example csv import files (Fixes #1761) 
- agenda csv file
- motions csv file
- users csv file
 2015-12-30 23:02:20 +01:00
Oskar Hahn
99b4e8c494 Merge pull request #1771 from emanuelschuetze/fix1729 
Added whitespace before triple dots in template (Fixes #1729)
 2015-12-12 11:05:58 +01:00
Oskar Hahn
63d4351c9a Merge pull request #1773 from emanuelschuetze/csv-import 
Improved agenda and users csv import (Fixes #1748)
 2015-12-12 11:05:03 +01:00
Emanuel Schuetze
f5efca1d1e Added whitespace before triple dots in template (Fixes #1729) 2015-12-12 10:16:44 +01:00
Emanuel Schuetze
31c320f9ef Improved csv import for agenda and users. 
- Fix users list.
 2015-12-12 10:12:22 +01:00
Oskar Hahn
66e0fe272b Merge pull request #1764 from normanjaeckel/DefaultPermissions 
Deleted Django's default permissions.
 2015-12-12 09:32:40 +01:00
Oskar Hahn
fae3747da6 Merge pull request #1769 from normanjaeckel/LoginLogout 
Fixed login and logout view.
 2015-12-12 09:30:00 +01:00
Oskar Hahn
fd90b15a0e Merge pull request #1770 from emanuelschuetze/fix1728 
Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728)
 2015-12-12 09:28:20 +01:00
Norman Jäckel
e0e74d6c3c Fixed login, logout and password change view. 2015-12-11 23:58:59 +01:00
Emanuel Schuetze
041b01afe5 Login dialog behavior if guest mode enabled/disabled (Fixes #1750) 2015-12-11 21:18:45 +01:00
Emanuel Schuetze
ca94a4e720 Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728) 2015-12-11 19:50:50 +01:00
Emanuel Schuetze
5d29af5f52 Improved login form. 
- Add redirect after aborting login. (Fixes #1762)
- Use new state paramater 'guest_enabled' for login form.
 2015-12-11 13:45:53 +01:00
Norman Jäckel
24cb58dc12 Added guest enabled info to WhoAmI view. 2015-12-11 13:44:58 +01:00
Emanuel Schuetze
9001456d19 Fix user.id in password reset request (Fixes #1752) 2015-12-10 15:03:18 +01:00
Norman Jäckel
114a38e4ee Deleted Django's default permissions. 2015-12-10 00:31:27 +01:00
Emanuel Schuetze
f050e04f0a Redirect to login dialog if user is not logged in (Fixes #1750) 2015-12-09 20:45:52 +01:00
Emanuel Schuetze
5c6977c46d Template fixes 2015-12-06 17:26:10 +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
bf940b177c Fixed gettext strings in JavaScript. 
- Added browser lanugage detection.
- Use gettextCatalog.getString(..) instead of gettext(..) in JS code.
- updated pot file
 2015-11-30 23:52:42 +01:00
Norman Jäckel
f84b8f29ac Template and translation changes. Updated English language files. 2015-11-30 21:06:31 +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
Emanuel Schuetze
968083e9e5 Improved related agenda items 
- Added QuickEdit mode for related agenda items
- show/hide hidden agenda items
- Added ng-dialog for modal create/update dialogs of customslides
- use generic links for list of speakers, edit, delete, project
- Moved projector elements to sidebar of index template (In progress!
  It will be improved with new base template design).
- Fixed error if chat messages is empty.
- Moved ngSanitize to base.js to use ng-bind-html in projector slides.
 2015-11-25 12:18:14 +01:00
Emanuel Schuetze
9af302ce36 Fix 'operator' error in projector view. 
Move operator factory from users/site.js to users/base.js.
The Motion factory uses 'operator' in motions/base.js which is also
loaded on projector. So operator is required in users/base.js.
 2015-11-23 22:06:54 +01:00
Norman Jäckel
c5f5fbf203 Remove translations for projector exception messages. 2015-11-21 00:01:48 +01:00
Norman Jäckel
1016af3c52 Updated English language files. 2015-11-20 23:23:01 +01:00
Norman Jäckel
cdd1813c02 Merge pull request #1691 from emanuelschuetze/motions-permissions 
Updated motion permission checks
 2015-11-20 23:18:54 +01:00
Oskar Hahn
02a67097e4 Merge pull request #1690 from emanuelschuetze/rest-password 
Reset default password of an user in UserUpdateCtrl. (Fixes #412)
 2015-11-20 10:26:04 +01:00
Emanuel Schuetze
c93e20b1b3 Updated motion permission checks. 
- Add permission checks in motion form (Fixes #1677)
- Implement get_allowed_actions in motions JavaScript (Fixes #1668)
 2015-11-20 00:15:18 +01:00
Oskar Hahn
b1e7259ce5 AngularClient: Fix operator.pasPerms() after a reload 2015-11-19 21:49:51 +01:00
Emanuel Schuetze
e9cf2fb591 Reset default password of an user in UserUpdateCtrl. (Fixes #412) 2015-11-19 21:49:28 +01:00
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
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
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
fac45fbf2a Added multiselection delete mode for users list view. 
Fix users import: Allows multiple groups.
 2015-10-15 21:09:49 +02:00
Norman Jäckel
1e08e9411a Cleaned up users app. 2015-09-21 16:23:47 +02:00
Norman Jäckel
c8dfb9437b Removed imports from openslides.users in other apps: Cleaned up agenda, assignments and motions. 2015-09-14 21:13:56 +02:00