Conflicts:
	website/photos/models.py
	website/photos/templates/photos/album.html

This might be a useful feature before publishing albums publically,
to review if everything looks ok.

This modifies the fancybox plugin to support the rotation.
To achieve this properly, we switch to using the non-packed version.
Future improvements might include automatically minifying JS,
as well as upstreaming this fix. However, the Fancybox repository
seems inactive and has numerous unanswered pull requests.

Allow albums to be shared with 3rd parties

Closes #30

See merge request !25

Fix rendering error in translated meeting strings

Apparently you should not use filters in a blocktrans

See merge request !34

Add templatecheck test to tox

Closes #46 

As this is a new package, it could be useful to quickly glance over [joostrijneveld/django-template-check](https://github.com/joostrijneveld/django-template-check/blob/master/django_template_check/management/commands/templatecheck.py) as well.

See merge request !33

Resolve "Hide 'for members' submenu for non-members"

Closes #41

For the future it might be good to make this permissions based but this merge request will achieve feature equivalence

See merge request !30

As suggested by @lrijneveld

Apparently you should not use filters in a blocktrans

Fixes a simple template syntax error

nice



See merge request !29

Fix some syntax errors in the committee template

@twiggers atleast run things before you commit ;)

See merge request !31

@twiggers atleast run things before you commit ;)

In the future perhaps a permission based solution would be
better/fancier but this is enough for feature equivalence.

Extend TranslateMeta for model admin

This makes it possible to use MultilingualField in`fields`, `fieldsets` and `prepopulated_fields`.

This also fixes a minor bug that occured when no `verbose_name` was specified (introduced in 1d30bf43)

See merge request !27

Ik snap niet helemaal waarom deze regel er bij moet aangezien het
base.html zou moeten extended.

This makes it easier to spot the differences to add rotation

Lazy translation in menu

For more information, check out:
http://stackoverflow.com/questions/4160770/when-should-i-use-ugettext-lazy
Closes #39

See merge request !24

For more information, check out:
http://stackoverflow.com/questions/4160770/when-should-i-use-ugettext-lazy

Create Metaclass to translate Model fields

Closes #35 

Dit ondersteunt nu dingen als:

```
from django.db import models
from utils.translation import MultilingualField, ModelTranslateMeta


class MerchandiseItem(models.Model, metaclass=ModelTranslateMeta):

    description = MultilingualField(models.TextField, default='', verbose_name='Some elaborate text')
```

In je templates kan je gewoon transparant bijv. `merchandise_item.description` blijven gebruiken.

See merge request !22

Translate merchandise strings

Closes #34

See merge request !23

Create mailinglists application

Closes #25 

This is currently functionally equivalent to the old system. See #29 for new ideas.

See merge request !20

Complete photos app functionality

Closes #2

See merge request !17

Conflicts:
	website/thaliawebsite/settings/settings.py

This should probably be replaced again soon by something nicer,
but this is functionally equivalent to what we had.