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
Emanuel Schuetze
8075b0adbb
List of speakers with angularjs.
...
- Add/remove user to/from list
- Open/close list
2015-06-22 14:34:23 +02:00
Emanuel Schuetze
f006b99caf
Added style to projector slide.
...
Added Customslide views.
2015-06-22 14:27:19 +02:00
Oskar Hahn
836d5042ad
Merge pull request #1565 from OpenSlides/revert-1564-RelatedAgendaItems
...
Revert "Added view to create related assignment and motion items. Upd…
2015-06-22 14:24:10 +02:00
Oskar Hahn
35aa36f88e
Revert "Added view to create related assignment and motion items. Updated ser…"
2015-06-22 14:23:42 +02:00
Oskar Hahn
2d6cdfa168
Merge pull request #1557 from emanuelschuetze/angular-motions
...
Updated motion list, form and detail views.
2015-06-22 14:18:09 +02:00
Oskar Hahn
3f321051c5
Merge pull request #1562 from emanuelschuetze/chromium-fixes
...
Fix JavaScript errors in chromium (Fixed #1530 )
2015-06-22 14:12:12 +02:00
Oskar Hahn
bb2da91204
Merge pull request #1563 from normanjaeckel/Fix
...
Fixed bug in users/projector.py.
2015-06-22 14:11:43 +02:00
Oskar Hahn
0190bb0b0b
Merge pull request #1564 from normanjaeckel/RelatedAgendaItems
...
Added view to create related assignment and motion items. Updated ser…
2015-06-22 14:11:32 +02:00
Norman Jäckel
e0188a149d
Added view to create related assignment and motion items. Updated serializers.
2015-06-21 23:32:21 +02:00
Norman Jäckel
c4e23daccf
Fixed bug in users/projector.py.
2015-06-21 22:36:21 +02:00
Norman Jäckel
4c9683a1b3
Merge pull request #1556 from ostcar/config_default_value
...
Fixed missing config default_value for OPTIONS requests.
2015-06-21 21:50:38 +02:00
Emanuel Schuetze
002a4d583e
Fix JavaScript errors in chromium.
2015-06-21 19:39:36 +02:00
Emanuel Schuetze
9a117999ef
Updated motion list, form and detail views.
2015-06-20 10:44:00 +02:00
Oskar Hahn
2b9c0b4620
Fixed default_value in option request
2015-06-19 09:08:36 +02:00
Oskar Hahn
a0f4506c35
Merge pull request #1549 from normanjaeckel/ConfigRefactoring
...
Refactored config API. Removed form_fields. Added extra fields for HT…
2015-06-18 23:40:23 +02:00
Oskar Hahn
e24ae3fd2a
Merge pull request #1552 from ostcar/projector_client
...
Projector client
2015-06-18 23:29:14 +02:00
Oskar Hahn
a4c00d5ee3
Angular Client
...
* Split angular app into a site- and a projector app
* Created client slide api and slides for customslide and user
* JS-function to activate a slide
2015-06-18 23:23:34 +02:00
Oskar Hahn
a5d9f0bb42
Merge pull request #1554 from normanjaeckel/UserResetPassword
...
Added view to reset user's password.
2015-06-18 23:16:45 +02:00
