f31925387f
Updated python requirements.
...
This included django 1.8
2015-07-02 14:51:08 +02:00
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
291f60ee9f
Added a way to load angular apps dynamical
2015-07-01 20:10:40 +02:00
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
1dbe07c041
Fix osPerms to use groups registered and anonymous
...
Fixes #1586
2015-07-01 00:32:37 +02:00
0910c3fac2
Merge pull request #1585 from emanuelschuetze/release-2.0a1
...
Release 2.0a1
2015-06-29 22:03:10 +02:00
c6800bc8f5
Update version to 2.0b1-dev
2015-06-29 21:58:58 +02:00
d50d771014
Release 2.0a1
2015-06-29 21:58:58 +02:00
e95c1223e3
Merge pull request #1587 from emanuelschuetze/readme
...
Updated Readme.
2015-06-29 21:58:24 +02:00
f8ed048128
Updated Readme.
2015-06-29 21:53:26 +02:00
8a87ed9457
Merge pull request #1584 from emanuelschuetze/typos
...
Fixed typo. Removed unused config.js.
2015-06-29 20:27:19 +02:00
bc74a2983c
Fixed typo. Removed unused config.js.
2015-06-29 20:23:10 +02:00
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
6f985ef483
Use item-detail and item-list slides for agenda app.
2015-06-29 16:45:46 +02:00
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
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
a6659e06a2
Merge pull request #1580 from ostcar/migrations
...
Added initial migrations for all apps
2015-06-29 15:40:51 +02:00
ec1d676ed9
Added initial migrations for all apps
2015-06-29 15:38:15 +02:00
682b5a16a2
Merge pull request #1581 from ostcar/remove_projector_app
...
Removed the projector App
2015-06-29 15:25:41 +02:00
16fa6bfffc
Removed the projector App
2015-06-29 15:20:28 +02:00
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
e042c668d5
Moved config app into the core app
2015-06-29 15:15:33 +02:00
bcfe72fa8c
Merge pull request #1578 from ostcar/remove_mptt_again
...
Realy removed mptt
2015-06-28 20:18:09 +02:00
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
4dac4d1ca8
Realy removed mptt
2015-06-28 19:55:48 +02:00
2b727cc617
Merge pull request #1574 from normanjaeckel/Slides
...
Added list slides for motions and assignments.
2015-06-28 19:48:34 +02:00
60e890a04e
Fixed link to download a file from the mediafileapp
...
Fixes #1575
2015-06-28 19:44:25 +02:00
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
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
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
c22791d6c9
Merge pull request #1573 from emanuelschuetze/slides
...
Agenda item slide template. Some template improvements.
2015-06-27 09:48:02 +02:00
370f2a2360
Merge pull request #1538 from emanuelschuetze/config
...
Angular template for config app.
2015-06-27 09:46:15 +02:00
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
6ea14cd2c6
Angular template for config app.
...
Added directive for config fields
2015-06-25 10:52:28 +02:00
f5654837e1
Merge pull request #1569 from normanjaeckel/Slides
...
Added agenda slides.
2015-06-25 08:12:47 +02:00
a08d20d330
Merge pull request #1570 from emanuelschuetze/template-work
...
Template improvements
2015-06-25 08:12:05 +02:00
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
6da0d41e50
Added agenda slides.
2015-06-24 23:45:21 +02:00
fe16afa1a7
Merge pull request #1568 from normanjaeckel/Slides
...
Added motion and assignment detail slide.
2015-06-24 22:52:17 +02:00
6b5ce5ae2f
Added motion and assignment detail slide.
2015-06-24 22:12:06 +02:00
6187ec450d
Merge pull request #1566 from ostcar/projector_activation
...
Added projector methods to user model
2015-06-24 13:52:39 +02:00
367404b20d
Added projector methods to user model
2015-06-24 13:07:49 +02:00
95b7b16992
Merge pull request #1555 from emanuelschuetze/speakers
...
List of speakers with angularjs
2015-06-22 21:37:39 +02:00
447f7581b8
Merge pull request #1560 from emanuelschuetze/projector
...
Projector templates.
2015-06-22 21:37:07 +02:00
8075b0adbb
List of speakers with angularjs.
...
- Add/remove user to/from list
- Open/close list
2015-06-22 14:34:23 +02:00
f006b99caf
Added style to projector slide.
...
Added Customslide views.
2015-06-22 14:27:19 +02:00
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
35aa36f88e
Revert "Added view to create related assignment and motion items. Updated ser…"
2015-06-22 14:23:42 +02:00
2d6cdfa168
Merge pull request #1557 from emanuelschuetze/angular-motions
...
Updated motion list, form and detail views.
2015-06-22 14:18:09 +02:00
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