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
Oskar Hahn
60e890a04e
Fixed link to download a file from the mediafileapp
...
Fixes #1575
2015-06-28 19:44:25 +02:00
Norman Jäckel
06ead753dc
Added and updated several projector elements (slides).
...
Added list slides for motions and assignments.
Added detail slide for presentable files.
Updated list and detail slides for agenda items including slides for list of speakers.
2015-06-28 19:22:57 +02:00
Norman Jäckel
34befe8f7b
Merge pull request #1572 from ostcar/fix_agenda_pdf
...
Moved agenda tree code to the Item-Manager and used it at the AgendaPDFView.
2015-06-28 19:22:01 +02:00
Oskar Hahn
8aab8388b3
Moved agenda tree code to the Item-Manager and used it at the AgendaPDFView.
...
fixed #1561
2015-06-28 18:26:05 +02:00
Oskar Hahn
c22791d6c9
Merge pull request #1573 from emanuelschuetze/slides
...
Agenda item slide template. Some template improvements.
2015-06-27 09:48:02 +02:00
Oskar Hahn
370f2a2360
Merge pull request #1538 from emanuelschuetze/config
...
Angular template for config app.
2015-06-27 09:46:15 +02:00
Emanuel Schuetze
f75516c7bb
Agenda slide templates. Some template improvements.
...
- User import
- show linebreaks for long text
- some style work
- item detail and agenda list slide
2015-06-25 14:19:43 +02:00
Emanuel Schuetze
6ea14cd2c6
Angular template for config app.
...
Added directive for config fields
2015-06-25 10:52:28 +02:00
Oskar Hahn
f5654837e1
Merge pull request #1569 from normanjaeckel/Slides
...
Added agenda slides.
2015-06-25 08:12:47 +02:00
Oskar Hahn
a08d20d330
Merge pull request #1570 from emanuelschuetze/template-work
...
Template improvements
2015-06-25 08:12:05 +02:00
Emanuel Schuetze
c2920407bb
Template improvements
...
- Activate slides for users, customslides, motions, assignments.
- Add delete confirm message.
- Fixed required form fields.
- Added version template.
- Improved user import. Updated csv files.
2015-06-25 00:15:56 +02:00
Norman Jäckel
6da0d41e50
Added agenda slides.
2015-06-24 23:45:21 +02:00
Oskar Hahn
fe16afa1a7
Merge pull request #1568 from normanjaeckel/Slides
...
Added motion and assignment detail slide.
2015-06-24 22:52:17 +02:00
Norman Jäckel
6b5ce5ae2f
Added motion and assignment detail slide.
2015-06-24 22:12:06 +02:00
Norman Jäckel
6187ec450d
Merge pull request #1566 from ostcar/projector_activation
...
Added projector methods to user model
2015-06-24 13:52:39 +02:00
Oskar Hahn
367404b20d
Added projector methods to user model
2015-06-24 13:07:49 +02:00
Norman Jäckel
95b7b16992
Merge pull request #1555 from emanuelschuetze/speakers
...
List of speakers with angularjs
2015-06-22 21:37:39 +02:00
Norman Jäckel
447f7581b8
Merge pull request #1560 from emanuelschuetze/projector
...
Projector templates.
2015-06-22 21:37:07 +02:00