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

92 Commits

Author SHA1 Message Date
Emanuel Schuetze
42f9cfdf45 List views: show number of filtered AND total rows. 
Improve css animation for ng-enter/ng-leave.
 2016-01-21 20:43:04 +01:00
Emanuel Schuetze
23e7b3aaf5 Fixed translation string. 2016-01-21 19:58:50 +01:00
Emanuel Schuetze
4125efbfe6 Added agendaSupplement for agenda item title. 
Added padding-left for child item cells.
 2016-01-18 21:40:50 +01:00
Emanuel Schuetze
76dc29cddf Use uib-alert instead of deprecated alert tag. 2016-01-18 21:09:28 +01:00
Emanuel Schuetze
d083309a30 Show candidates on assignments slide. 2016-01-18 16:27:50 +01:00
Emanuel Schuetze
8bf82a0306 Added meta box in assignment detail view (Fixes #1866) 2016-01-17 22:32:52 +01:00
Emanuel Schuetze
851252dfe8 Format all JavaScript functions in same syntax. 
Required for use minified js code in production mode.
 2016-01-17 22:32:48 +01:00
Emanuel Schuetze
0e24d9b632 Modify motion/assignment/customslide in form dialog without updating list/detail view. 2016-01-17 21:19:32 +01:00
Oskar Hahn
ffe80e8da3 Merge pull request #1852 from normanjaeckel/AssignmentFixes 
Fixed several things in assignment app. See #1838.
 2016-01-15 09:37:18 +01:00
Emanuel Schuetze
694ed6f1cc Motion template fixes 
- Add has_votes to motion serializer and add poll.has_votes check in motion detail view.
- Fix motion meta box 3 column layout.
- Added missing intents
- Show motionPoll edit form in dialog. Moved into new template.
- Clean up assignmentpoll form (like motionPoll)
 2016-01-15 00:03:29 +01:00
Emanuel Schuetze
bc60b7e7ca Several template improvements 
- Move Languages services from site.js to base.js
  Now the detected browser language is used as projector language.
- Use verboseName instead of agendaSupplement.
- Show submitters on projector (load Users on Controller).
- Improve list of speakers (slide and item detail).
 2016-01-14 00:14:48 +01:00
Norman Jäckel
441c297986 Fixed several things in assignment app. See #1838. 
Fixed "Add Me" and "Remove Me" button.

Show poll results for normal users.

Reverse ballot tab order.
 2016-01-13 16:11:01 +01:00
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
Norman Jäckel
e2145f9777 Fixed candidate button. 2016-01-10 11:27:17 +01:00
Norman Jäckel
896ac28c30 Added number of candidates to assignment list view. 2016-01-10 10:23:55 +01:00
Emanuel Schuetze
071b0a76be Fixed permissions in list views. 2016-01-10 01:02:13 +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
Norman Jäckel
8d1c351c9a Squished all migrations. 2016-01-09 19:10:57 +01:00
Norman Jäckel
2e104d07b7 Removed possibility to block candidates. Fixes #1708. 2016-01-09 18:05:41 +01:00
Norman Jäckel
ae315d388b Merge pull request #1804 from ostcar/remove_old_search 
Remove old haystack files
 2016-01-09 17:01:42 +01:00
Emanuel Schuetze
4a9f265b68 Used is_hidden instead of item.typ. Improve hidden filter. 
Fixed JS error in users and assignments.
 2016-01-09 16:55:21 +01:00
Oskar Hahn
b7d63afc91 Remove old haystack files 2016-01-09 16:50:39 +01:00
Oskar Hahn
c2041dca6f Merge pull request #1796 from normanjaeckel/MoveTranslations 
Remove model field verbose names. Move help texts.
 2016-01-09 14:25:42 +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
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
96328f033b Merge pull request #1793 from emanuelschuetze/fixAssignmentPhasesRequest 
Send assignments OPTION request for phases once only.
 2016-01-09 12:05:57 +01:00
Emanuel Schuetze
4faf3dd2c0 Send assignments OPTION request for phases once only. 2016-01-09 11:45:25 +01:00
Oskar Hahn
308f55bb3f Merge pull request #1782 from ostcar/search 
Added a search on the server side.
 2016-01-09 11:44:08 +01:00
Oskar Hahn
75dcbab5d1 Add search on the server side. 2016-01-09 11:35:57 +01:00
Emanuel Schuetze
de77cfc38c Fixed zooming/scrolling on slides. 2016-01-08 21:31:58 +01:00
Oskar Hahn
c63bd31db0 Merge pull request #1778 from emanuelschuetze/fix1718 
Fix publish assignment poll function. (Fixes#1718)
 2015-12-22 00:02:44 +01:00
Emanuel Schuetze
6b8aa56e87 Fix publish assignment poll function. 
Set 'votes' to required=False in AssignmentAllPollSerializer.
 2015-12-19 12:38:07 +01:00
Norman Jäckel
d3e8c68a51 Merge pull request #1775 from emanuelschuetze/templateStuff 
Fixed some template bugs (#1727)
 2015-12-19 11:53:53 +01:00
Oskar Hahn
99b4e8c494 Merge pull request #1771 from emanuelschuetze/fix1729 
Added whitespace before triple dots in template (Fixes #1729)
 2015-12-12 11:05:58 +01:00
Emanuel Schuetze
f5efca1d1e Added whitespace before triple dots in template (Fixes #1729) 2015-12-12 10:16:44 +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
ca94a4e720 Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728) 2015-12-11 19:50:50 +01:00
Norman Jäckel
114a38e4ee Deleted Django's default permissions. 2015-12-10 00:31:27 +01:00
Emanuel Schuetze
3c5f49a127 Updated English translation strings. 2015-12-07 15:15:12 +01:00
Emanuel Schuetze
5c6977c46d Template fixes 2015-12-06 17:26:10 +01:00
Emanuel Schuetze
232ce522fe Updated translation strings and pot file. 2015-12-06 07:25:07 +01:00
Emanuel Schuetze
b81704a88f Fixed translations in agendaSupplement. 2015-12-01 13:45:54 +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
Oskar Hahn
ca201758e8 Merge pull request #1715 from emanuelschuetze/template-improvements 
Template improvements
 2015-11-29 22:32:08 +01:00