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 |
|
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
|
1f72ef4099
|
Merge pull request #1802 from normanjaeckel/Blocked
Removed possibility to block candidates. Fixes #1708.
|
2016-01-09 18:10:19 +01:00 |
|
Norman Jäckel
|
2e104d07b7
|
Removed possibility to block candidates. Fixes #1708.
|
2016-01-09 18:05:41 +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 |
|
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 |
|
Oskar Hahn
|
dba513c2fd
|
Merge pull request #1805 from emanuelschuetze/agendaHidden
Improved item hidden filter.
|
2016-01-09 17:00:55 +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
|
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 |
|