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

3112 Commits

Author SHA1 Message Date
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
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 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
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
Oskar Hahn 890383006b Merge pull request #1797 from emanuelschuetze/agendaNumbering 
Show agenda titles with correct numbering
 2016-01-09 14:07:22 +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 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 96328f033b Merge pull request #1793 from emanuelschuetze/fixAssignmentPhasesRequest 
Send assignments OPTION request for phases once only.
 2016-01-09 12:05:57 +01:00
Oskar Hahn db22d1f7dc Merge pull request #1777 from emanuelschuetze/fix1662 
Sort list of speakers (Fixes#1662)
 2016-01-09 12:04:38 +01:00
Oskar Hahn 091c08dabd Merge pull request #1788 from emanuelschuetze/fixSlides 
Fix slide templates
 2016-01-09 12:01:11 +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 74110453c8 Rename ItemDetailSlide to ListOfSpeakersSlide (Fixes #1576) 2016-01-09 10:55:12 +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 3304cf48c5 Sort list of speakers (Fixes #1662) 2016-01-09 09:44:01 +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
Norman Jäckel 241d3dbc20 Sorted list of speakers. 2016-01-08 23:32:29 +01:00
Emanuel Schuetze de77cfc38c Fixed zooming/scrolling on slides. 2016-01-08 21:31:58 +01:00
Oskar Hahn 5deae121ee Merge pull request #1779 from emanuelschuetze/fix-1761 
Generate example csv import files (Fixes #1761)
 2016-01-04 10:27:35 +01:00
Emanuel Schuetze 9b78b5992b Fix typo 2015-12-30 23:19:53 +01:00