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

3203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oskar Hahn
82f5239b8c Merge pull request #1845 from normanjaeckel/ConfigFix 
Fixed server error in config update view. Fixed #1828.
 2016-01-13 18:36:34 +01:00
Norman Jäckel
441c297986 Fixed several things in assignment app. See #1838. 
Fixed "Add Me" and "Remove Me" button.

Show poll results for normal users.

Reverse ballot tab order.
 2016-01-13 16:11:01 +01:00
Norman Jäckel
3fc82a596c Fixed server error in config update view. Fixed #1828. 2016-01-13 15:04:47 +01:00
Norman Jäckel
919425cbb3 Merge pull request #1844 from emanuelschuetze/German 
Updated German translations.
 2016-01-13 14:57:15 +01:00
Emanuel Schuetze
cffed7aa3e Updated German translations. 2016-01-13 14:47:45 +01:00
Emanuel Schuetze
2f8c894104 Motion template fixes 
- Fix missing workflows in Motion create form.
- redesign motion meta box
- use table format for motion voting results
 2016-01-13 14:32:15 +01:00
Emanuel Schütze
e471b84b27 Merge pull request #1842 from emanuelschuetze/pot-files 
Updated translation pot files
 2016-01-13 11:49:28 +01:00
Emanuel Schuetze
a2721f9589 Updated translation pot files 2016-01-13 11:44:53 +01:00
Oskar Hahn
007a92a96b Merge pull request #1841 from emanuelschuetze/ProjectorRedesign 
Redesign projector template (Fixes #1787)
 2016-01-13 11:28:06 +01:00
Oskar Hahn
aa6a099840 Merge pull request #1809 from emanuelschuetze/CustomSlideAttachment 
Custom slide attachment
 2016-01-13 11:26:46 +01:00
Emanuel Schuetze
d0b9b2a492 Added reduced projector logo. 
Added openslides blue color value to logo README.
 2016-01-13 10:47:27 +01:00
Emanuel Schuetze
09b88fb4a6 Redesign projector template. 2016-01-13 10:28:49 +01:00
Emanuel Schütze
bc17baa2b9 Merge pull request #1835 from emanuelschuetze/templateFixes3 
A lot of template fixes
 2016-01-13 10:24:47 +01:00
Emanuel Schuetze
93e2296bdc A lot of template fixes 
- Reset password from current (unsaved) value of default_password.
- MotionForm, AssignmentForm and UserForm factory for open ngDialog.
  Fixes edit url redirect problem.
- Added back-to-detail-view-button to list of speakers view.
- Add translation context.
- Fixed (missing) translation strings.
- Fixed tags and category list views.
- motion detail: Use select box for changing state.
- motion slide updated
 2016-01-13 10:22:24 +01:00
Oskar Hahn
4a3cefadb1 Merge pull request #1834 from normanjaeckel/Assignment 
Assignment
 2016-01-12 14:58:07 +01:00
Emanuel Schuetze
f2375008d8 Added attachments for customslide views. (Fixes #1681) 2016-01-10 11:55:37 +01:00
Norman Jäckel
8a6ca904dc Added attachments to custom slides. 2016-01-10 11:51:00 +01:00
Norman Jäckel
e2145f9777 Fixed candidate button. 2016-01-10 11:27:17 +01:00
Norman Jäckel
8bdbdd0b07 Merge pull request #1832 from ostcar/fix_agenda_title 
Always use item.getTitle() instead of item.title
 2016-01-10 11:26:44 +01:00
Oskar Hahn
dd120bbf91 Merge pull request #1831 from emanuelschuetze/templateFixes2 
Several fixes for 2.0b2
 2016-01-10 11:26:37 +01:00
Emanuel Schuetze
f9f3af245e Template fixes. 
- Use PATCH request for user profile update.
 2016-01-10 11:18:13 +01:00
Oskar Hahn
b6f4c3cc15 Always use item.getTitle() instead of item.title 2016-01-10 11:10:14 +01:00
Emanuel Schütze
18f6ffbafd Merge pull request #1830 from ostcar/fix_speaker_buttons 
Change the speaker management buttons in the speaker page
 2016-01-10 10:40:25 +01:00
Oskar Hahn
fd6190b7a7 Change the speaker management buttons in the speaker page 2016-01-10 10:26:20 +01:00
Norman Jäckel
896ac28c30 Added number of candidates to assignment list view. 2016-01-10 10:23:55 +01:00
Oskar Hahn
78ec776c3f Merge pull request #1829 from ostcar/fix_python 
Fix syntaxerror in python
 2016-01-10 09:47:40 +01:00
Oskar Hahn
dc80efeee9 Fix syntaxerror in python 2016-01-10 09:47:08 +01:00
Oskar Hahn
f3fcb74aec Merge pull request #1827 from ostcar/fix_list_of_speaker_error_message 
Remove item id from error message "{user} is already on the list of speakers."
 2016-01-10 09:32:48 +01:00
Oskar Hahn
78640a27f1 Remove item id from error message "{user} is already on the list of speakers." 2016-01-10 09:32:06 +01:00
Norman Jäckel
7dd9edec8b Merge pull request #1819 from normanjaeckel/Attachment 
Fixed mediafile model. Fixed #1808.
 2016-01-10 01:08:24 +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
Norman Jäckel
2cfa7517a8 Fixed mediafile model. Fixed #1808. 2016-01-10 01:05:57 +01:00
Oskar Hahn
87d647ac4d Merge pull request #1824 from ostcar/fix_tornado 
Fix tornado
 2016-01-10 01:03:16 +01:00
Oskar Hahn
ccf88ec4d5 Switch host and port 2016-01-10 01:02:18 +01:00
Emanuel Schuetze
071b0a76be Fixed permissions in list views. 2016-01-10 01:02:13 +01:00
Oskar Hahn
4ee2b85b76 Merge pull request #1821 from normanjaeckel/LoginView 
Fixed alerts on login form.
 2016-01-10 00:59:03 +01:00
Oskar Hahn
f4e91caeaf Merge pull request #1822 from normanjaeckel/ChatBox 
Disabled autocomplete for chat box.
 2016-01-10 00:58:45 +01:00
Oskar Hahn
e93b2f1118 Merge pull request #1823 from normanjaeckel/ListOfSpeakersChess 
Fixed strange empty field for sorting list of speakers.
 2016-01-10 00:58:25 +01:00
Oskar Hahn
ffa60e8d06 show user about me as html 2016-01-10 00:57:09 +01:00
Norman Jäckel
83ac20a704 Fixed strange empty field for sorting list of speakers. 2016-01-10 00:56:04 +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
Norman Jäckel
5a1317eb19 Fixed alerts on login form. 2016-01-10 00:38:59 +01:00
Oskar Hahn
b968a92630 fix autoupdate when openslides runs on a other port then 8000 2016-01-10 00:17:00 +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
f375f4b45a Merge pull request #1814 from ostcar/fix_config 
Fix autoupdate of config
 2016-01-09 22:19:30 +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