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

3427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
5c46a896d3 Merge pull request #2037 from emanuelschuetze/fix1975 
Use specific tag of tinymce-18n repo (Fixes #1975).
 2016-03-17 20:38:27 +01:00
Norman Jäckel
b3582f462e Merge pull request #2042 from emanuelschuetze/spinner 
Template improvements
 2016-03-15 21:02:04 +01:00
Emanuel Schuetze
a8d9581664 Allow html in event name and description. 2016-03-14 17:09:37 +01:00
Emanuel Schuetze
1b25d9c376 Added loading spinner icon. 
Only for loading resolve object from server.
 2016-03-14 17:09:37 +01:00
Emanuel Schuetze
4ad775869f Use specific tag of tinymce-18n repo (Fixes #1975). 2016-03-14 17:09:22 +01:00
Norman Jäckel
15119ab28b Merge pull request #2041 from emanuelschuetze/fix2020 
New configs for font color in header and h1 on projector (Fixes #2020)
 2016-03-08 23:16:28 +01:00
Emanuel Schuetze
b9fed84732 Updated EN language files. 2016-03-08 23:01:20 +01:00
Emanuel Schuetze
85326d75f2 New configs for font color in header and h1 on projector (Fixes #2020) 2016-03-08 23:01:17 +01:00
Norman Jäckel
f29db57ace Merge pull request #2040 from emanuelschuetze/fix2029 
Fix 'stop' speech button in Safari (Fixes #2029)
 2016-03-08 22:14:06 +01:00
Emanuel Schuetze
f47055c13a Fix 'stop' speech button in Safari (Fixes #2029) 
Use '{}' instead of empty 'JSON.stringify()'.
 2016-03-08 20:23:12 +01:00
Emanuel Schütze
21d9898645 Merge pull request #2039 from normanjaeckel/FixRawSQLQuery 
Used bulk_create to create the initial projector during migration. Fi…
 2016-03-07 19:52:49 +01:00
Norman Jäckel
56936c86ab Used bulk_create to create the initial projector during migration. Fixed #2035. 2016-03-07 19:09:45 +01:00
Norman Jäckel
ce3576f306 Merge pull request #2034 from emanuelschuetze/fix2005 
Fix main menu on small devices (Fixes #2005)
 2016-03-07 19:00:08 +01:00
Emanuel Schütze
2097121e45 Merge pull request #2030 from normanjaeckel/FixAgendaGetQueryset 
Fixed get_queryset method of ItemViewSet. Fixed #2027.
 2016-03-06 22:48:50 +01:00
Emanuel Schuetze
876d9408fe Fix main menu on small devices (Fixes #2005) 
Use bootstraps navbar-toggle button to bring up a
vertical responsive main menu.
Some additional responsive CSS impmprovements.
 2016-03-06 20:14:52 +01:00
Emanuel Schütze
2f168e2945 Merge pull request #2036 from normanjaeckel/UpdateMigrations 
Updated migrations.
 2016-03-06 18:13:42 +01:00
Norman Jäckel
78565ffd25 Updated migrations. 2016-03-06 14:36:50 +01:00
Norman Jäckel
9440903dfd Merge pull request #2018 from normanjaeckel/optimization 
Optimization of autoupdate behavior.
 2016-03-06 14:29:43 +01:00
Norman Jäckel
132c6e81ec Forwarding JSON instead of Django model instances to autoupdate loop. 
- Used raw SQL for createing default projector during inital migration.
- Removed default_password and hidden agenda items from autoupdate data for some users.
- Removed old get_collection_and_id_from_url() function.
 2016-03-06 14:24:53 +01:00
Norman Jäckel
4daa61888f Massive refactoring for autoupdate optimization. 2016-03-06 14:22:40 +01:00
André Böhlke
3db2f2fc16 "durchstich" for autoupdate optimization 2016-03-06 14:22:40 +01:00
Norman Jäckel
e598b308f0 Merge pull request #2033 from emanuelschuetze/fix1949 
Allow pdf scrolling on projector (Fixes #1949).
 2016-03-06 14:19:06 +01:00
Norman Jäckel
f4797a7081 Merge pull request #2032 from emanuelschuetze/fix2004 
Remove 'can_see_extra_data' permission from registered and anonymous groups
 2016-03-06 14:18:20 +01:00
Emanuel Schuetze
b78c9bc7bd Allow pdf scrolling on projector (Fixes #1949). 2016-03-05 22:44:00 +01:00
Emanuel Schuetze
921ec3ab72 Remove 'can_see_extra_data' permission from registered and anonymous groups. 
Now, only staff users has this permission by default. (Fixed #2004.)

Some more work on users/groups template:
- Added description to permission string to show that only 'present' and
  'comment' fields are affected by this permission.
- Allowed to create groups without permissions.
- Fixed showing group names in users lists view for staff and normal users.
 2016-03-05 22:12:29 +01:00
Norman Jäckel
bc93b61a02 Fixed get_queryset method of ItemViewSet. Fixed #2027. 2016-03-04 11:48:20 +01:00
Norman Jäckel
66de30f852 Merge pull request #2022 from emanuelschuetze/templateFixes 
Template fixes:
 2016-03-03 10:50:43 +01:00
Emanuel Schuetze
7029852043 Template fixes 
- switch projector live view minimize/maximize buttons
- show agenda/item split buttons (project only main agenda items, project subitem)
  only if subitems are available
 2016-03-03 08:46:18 +01:00
Emanuel Schütze
f3e59d3d04 Merge pull request #2026 from normanjaeckel/FixAgenda 
Fixed TypeError in agenda views. Fixed #2023.
 2016-03-03 08:45:33 +01:00
Norman Jäckel
7da48efd4c Fixed TypeError in agenda views. Fixed #2023. 2016-03-03 00:23:41 +01:00
Norman Jäckel
6799cab940 Merge pull request #2024 from normanjaeckel/JSHintFailReporter 
Fixed gulp jshint task.
 2016-03-02 17:16:47 +01:00
Norman Jäckel
3c6d4d5e30 Fixed gulp jshint task. 2016-03-02 16:51:40 +01:00
Norman Jäckel
7e6ff44696 Merge pull request #2021 from normanjaeckel/SquishMigrations 
Squish migrations
 2016-03-02 16:11:08 +01:00
Norman Jäckel
de871f3f9c Squished migrations files. 2016-03-02 14:26:47 +01:00
Emanuel Schütze
bab909713a Merge pull request #2012 from normanjaeckel/DevOption 
Changed name of '--development' option and name of the respective dir…
 2016-03-02 08:18:37 +01:00
Norman Jäckel
ca3cfae8b3 Changed name of '--development' option and name of the respective directory. Fixed #2001 2016-03-01 17:38:14 +01:00
Emanuel Schütze
8d1de6923b Merge pull request #2017 from normanjaeckel/FixMotionPoll 
Fixed error in motion poll serializer. Fixed #2014.
 2016-02-28 00:21:04 +01:00
Norman Jäckel
bc49f00c66 Fixed error in motion poll serializer. Fixed #2014. 2016-02-27 21:34:26 +01:00
Norman Jäckel
872d73b5cf Merge pull request #2016 from normanjaeckel/GetContext 
Rename and refactor some ProjectorElement methods. Fixed #1631.
 2016-02-27 21:24:18 +01:00
Norman Jäckel
ea429adefe Merge pull request #2015 from emanuelschuetze/fix2009 
Show special vote values for motion polls on projector.
 2016-02-27 20:57:21 +01:00
Norman Jäckel
a2a6637c89 Rename and refactor some ProjectorElement methods. Fixed #1631. 2016-02-27 20:56:03 +01:00
Emanuel Schuetze
1d314db487 Show special vote values for motion polls on projector. 2016-02-27 20:10:24 +01:00
Norman Jäckel
452e7f1325 Merge pull request #2011 from ostcar/fix_requirements.txt 
Updated requirements_production.txt
 2016-02-27 00:20:46 +01:00
Norman Jäckel
d00c257ee8 Merge pull request #1998 from normanjaeckel/HelpText 
Updated start script help text and custom commands. Fixed #1987.
 2016-02-27 00:18:45 +01:00
Oskar Hahn
099ff5a681 Updated requirements_production.txt 
reportlab 3.3 can be used
sockjs-tornado 1.0.0 is not usable. We need at least 1.0.1
 2016-02-26 09:10:21 +01:00
Norman Jäckel
9fbb12944c Updated start script help text and custom commands. Fixed #1987. 2016-02-25 23:17:04 +01:00
Emanuel Schütze
2b239f2214 Merge pull request #2003 from emanuelschuetze/fix1820 
Reload after login and logout (Fixes #1820)
 2016-02-25 13:51:44 +01:00
Emanuel Schütze
c9cc8e236e Merge pull request #2002 from emanuelschuetze/fixes2 
Template improvements
 2016-02-25 13:45:28 +01:00
Emanuel Schuetze
a6be43809f Agenda list slide improvements 
- project summary of selected item
- show full tree OR main agenda items only
- show done items grey (without icon)
 2016-02-25 13:37:59 +01:00
Emanuel Schuetze
d3d73a019d Fix translations in group detail template. 2016-02-25 13:37:55 +01:00