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

3155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
35fa5470d2 Merge pull request #1608 from emanuelschuetze/speakerscontrol 
Added manage controls for list of speakers of agenda items.
 2015-09-05 11:26:53 +02:00
Oskar Hahn
fbc57cc23a Reload config after login 
Fix errors by saving tags to motions
 2015-09-05 11:26:41 +02:00
Emanuel Schuetze
77d027c1cc Agenda templates 
- Added manage controls for list of speakers of agenda items.
- New slide for list of speakers.
- Fixed typo (speach -> speech)
 2015-09-05 11:23:32 +02:00
Oskar Hahn
6acdb3c305 Merge pull request #1611 from emanuelschuetze/tags 
Use tags in agenda. Fix motions.js.
 2015-09-05 10:16:55 +02:00
Emanuel Schuetze
0e124dbbae Use tags in agenda. Fix motions.js. 2015-09-05 10:07:53 +02:00
Oskar Hahn
026f4d45cb Merge pull request #1607 from normanjaeckel/PollNumber 
Removed poll_number field in MotionPoll model.
 2015-09-05 09:58:57 +02:00
Oskar Hahn
2618001ddd Merge pull request #1609 from normanjaeckel/Localhost 
Start browser at 'localhost:8000' in start script. Fixed #1534.
 2015-09-05 09:39:46 +02:00
Oskar Hahn
d8b0eca7f4 Merge pull request #1610 from normanjaeckel/GitAttributes 
Removed .gitattributes. Fixed #1422.
 2015-09-05 09:39:36 +02:00
Norman Jäckel
933318c19d Removed .gitattributes. Fixed #1422. 2015-09-05 09:36:47 +02:00
Norman Jäckel
80efae4980 Start browser at 'localhost:8000' in start script. Fixed #1534. 2015-09-05 09:32:56 +02:00
Norman Jäckel
5e5ab61612 Removed poll_number field in MotionPoll model. 2015-09-05 09:29:06 +02:00
Oskar Hahn
dfe0094661 Merge pull request #1596 from ostcar/js-data-update 
Updated js-data to 2.0
 2015-09-04 21:07:49 +02:00
Oskar Hahn
6674ea85b7 Updated js-data to 2.0 
Added js-data relation for the motion and agenda app

Added improved load function
 2015-09-04 21:05:49 +02:00
Oskar Hahn
ec50b6e67f Merge pull request #1602 from normanjaeckel/MotionPoll 
Added views to create, update and delete MotionPoll objects.
 2015-09-04 20:21:04 +02:00
Norman Jäckel
a1f1cfed1f Added views to create, update and delete MotionPoll objects. 2015-09-04 19:55:47 +02:00
Norman Jäckel
6b747c8cef Merge pull request #1604 from normanjaeckel/OptionsPermissions 
Set permissions for OPTIONS requests.
 2015-09-04 15:51:43 +02:00
Norman Jäckel
965206e1fc Set permissions for OPTIONS requests. Fixed js-data dependency. Fixed blank in some motion model fields. Fixed error handling in agenda and core views. 2015-09-04 15:44:28 +02:00
Norman Jäckel
aaadfbf78e Merge pull request #1600 from normanjaeckel/Plugins 
Updated plugin utils. Enabled plugins to override urlpatterns.
 2015-07-25 22:29:45 +02:00
Norman Jäckel
1cf8a1f222 Updated plugin utils. Enabled plugins to override urlpatterns. 2015-07-25 21:37:03 +02:00
Oskar Hahn
f6c50a966d Merge pull request #1598 from ostcar/field_name_with_id_suffix 
Appended an _id suffix to all related field names in the rest api
 2015-07-25 19:20:44 +02:00
Oskar Hahn
89a6d5b451 Appended an _id suffix to all related field names in the rest api 
Fixes #1597
 2015-07-25 19:17:33 +02:00
Norman Jäckel
66f45ecd1f Merge pull request #1592 from normanjaeckel/CheckPermission 
Refactored permission check for REST API viewsets.
 2015-07-05 23:08:34 +02:00
Norman Jäckel
7e404946e4 Refactored view permissions. 
Refactored permission check for REST API viewsets.
Removed old PermissionMixin.
Cleaned up several views.py files.
 2015-07-05 22:17:58 +02:00
Oskar Hahn
e6bc1c5016 Merge pull request #1588 from ostcar/python_requirements 
Updated python requirements.
 2015-07-03 11:04:24 +02:00
Oskar Hahn
f31925387f Updated python requirements. 
This included django 1.8
 2015-07-02 14:51:08 +02:00
Norman Jäckel
e2dc496352 Merge pull request #1591 from ostcar/angular_modules 
Added a way to load angular apps dynamical
 2015-07-01 22:21:02 +02:00
Oskar Hahn
291f60ee9f Added a way to load angular apps dynamical 2015-07-01 20:10:40 +02:00
Oskar Hahn
10c6d30252 Merge pull request #1589 from ostcar/fix_user_permissions 
Fix osPerms to use groups registered and anonymous
 2015-07-01 00:36:33 +02:00
Oskar Hahn
1dbe07c041 Fix osPerms to use groups registered and anonymous 
Fixes #1586
 2015-07-01 00:32:37 +02:00
Emanuel Schütze
0910c3fac2 Merge pull request #1585 from emanuelschuetze/release-2.0a1 
Release 2.0a1
 2015-06-29 22:03:10 +02:00
Emanuel Schuetze
c6800bc8f5 Update version to 2.0b1-dev 2015-06-29 21:58:58 +02:00
Emanuel Schuetze
d50d771014 Release 2.0a1 2015-06-29 21:58:58 +02:00
Emanuel Schütze
e95c1223e3 Merge pull request #1587 from emanuelschuetze/readme 
Updated Readme.
 2015-06-29 21:58:24 +02:00
Emanuel Schuetze
f8ed048128 Updated Readme. 2015-06-29 21:53:26 +02:00
Emanuel Schütze
8a87ed9457 Merge pull request #1584 from emanuelschuetze/typos 
Fixed typo. Removed unused config.js.
 2015-06-29 20:27:19 +02:00
Emanuel Schuetze
bc74a2983c Fixed typo. Removed unused config.js. 2015-06-29 20:23:10 +02:00
Norman Jäckel
87cce491a0 Merge pull request #1583 from emanuelschuetze/agenda-slides 
Use item-detail and item-list slides for agenda app.
 2015-06-29 18:05:45 +02:00
Emanuel Schuetze
6f985ef483 Use item-detail and item-list slides for agenda app. 2015-06-29 16:45:46 +02:00
Oskar Hahn
d3e5f2695c Merge pull request #1582 from ostcar/config_accept_str_as_int 
Let the config app accept values that can be converted to the right type
 2015-06-29 15:54:58 +02:00
Oskar Hahn
3dead745c6 Let the config app accept values that can be converted to the right type. 
Fixed config app
 2015-06-29 15:41:36 +02:00
Oskar Hahn
a6659e06a2 Merge pull request #1580 from ostcar/migrations 
Added initial migrations for all apps
 2015-06-29 15:40:51 +02:00
Oskar Hahn
ec1d676ed9 Added initial migrations for all apps 2015-06-29 15:38:15 +02:00
Oskar Hahn
682b5a16a2 Merge pull request #1581 from ostcar/remove_projector_app 
Removed the projector App
 2015-06-29 15:25:41 +02:00
Oskar Hahn
16fa6bfffc Removed the projector App 2015-06-29 15:20:28 +02:00
Oskar Hahn
db0a4224c2 Merge pull request #1579 from ostcar/config_into_core 
Moved config app into the core app
 2015-06-29 15:18:54 +02:00
Oskar Hahn
e042c668d5 Moved config app into the core app 2015-06-29 15:15:33 +02:00
Norman Jäckel
bcfe72fa8c Merge pull request #1578 from ostcar/remove_mptt_again 
Realy removed mptt
 2015-06-28 20:18:09 +02:00
Norman Jäckel
025c9c0b2a Merge pull request #1577 from ostcar/fix_mediafile_download_link 
Fixed link to download a file from the mediafileapp.
 2015-06-28 20:17:30 +02:00
Oskar Hahn
4dac4d1ca8 Realy removed mptt 2015-06-28 19:55:48 +02:00
Norman Jäckel
2b727cc617 Merge pull request #1574 from normanjaeckel/Slides 
Added list slides for motions and assignments.
 2015-06-28 19:48:34 +02:00