concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2016-08-12T16:46:19+02:00https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/33Add templatecheck test to tox2016-08-12T16:46:19+02:00Joost Rijneveldjoost@joostrijneveld.nlAdd templatecheck test to toxCloses #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/templ...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.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/32Correctly link to report documents2016-08-13T11:14:54+02:00Joost Rijneveldjoost@joostrijneveld.nlCorrectly link to report documentshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/31Fix some syntax errors in the committee template2016-08-11T23:42:26+02:00Wietse KuipersFix some syntax errors in the committee template@twiggers atleast run things before you commit ;)@twiggers atleast run things before you commit ;)https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/30Resolve "Hide 'for members' submenu for non-members"2016-08-12T15:26:51+02:00Wietse KuipersResolve "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 equivalenceCloses #41
For the future it might be good to make this permissions based but this merge request will achieve feature equivalencehttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/29Fixes a simple template syntax error2016-08-10T23:36:20+02:00Wietse KuipersFixes a simple template syntax errornice
nice
https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/28Enable rotating photos, adjusting visibility2016-08-12T17:27:37+02:00Joost Rijneveldjoost@joostrijneveld.nlEnable rotating photos, adjusting visibilityCloses #28Closes #28https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/27Extend TranslateMeta for model admin2016-08-10T19:22:54+02:00Joost Rijneveldjoost@joostrijneveld.nlExtend TranslateMeta for model adminThis 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 1d30bf4)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 1d30bf4)https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/26Create Thabloid app2016-08-12T17:25:38+02:00Joost Rijneveldjoost@joostrijneveld.nlCreate Thabloid appCloses #3, but does not fully solve it. See #43 for the follow-up.Closes #3, but does not fully solve it. See #43 for the follow-up.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/25Allow albums to be shared with 3rd parties2016-08-12T16:57:16+02:00Joost Rijneveldjoost@joostrijneveld.nlAllow albums to be shared with 3rd partiesCloses #30Closes #30https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/24Lazy translation in menu2016-08-07T00:20:47+02:00Luuk ScholtenLazy translation in menuFor more information, check out:
http://stackoverflow.com/questions/4160770/when-should-i-use-ugettext-lazy
Closes #39For more information, check out:
http://stackoverflow.com/questions/4160770/when-should-i-use-ugettext-lazy
Closes #39https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/23Translate merchandise strings2016-08-06T15:23:00+02:00Joost Rijneveldjoost@joostrijneveld.nlTranslate merchandise stringsCloses #34Closes #34https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/22Create Metaclass to translate Model fields2016-08-06T17:16:08+02:00Joost Rijneveldjoost@joostrijneveld.nlCreate Metaclass to translate Model fieldsCloses #35
Dit ondersteunt nu dingen als:
```
from django.db import models
from utils.translation import MultilingualField, ModelTranslateMeta
class MerchandiseItem(models.Model, metaclass=ModelTranslateMeta):
descri...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.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/21Events datamodel en grootste deel admininterface2016-08-13T16:53:26+02:00Thom WiggersEvents datamodel en grootste deel admininterfaceWorking on #4
Implements the checked functionality:
* [x] Events aanmaken
* [x] Extra informatievelden
* [x] ORM Aanmeldingen
* [x] Organisatorveld
* [ ] Aanmeldingen weergeven
* [x] Met de hand aanmelden
* [x] led...Working on #4
Implements the checked functionality:
* [x] Events aanmaken
* [x] Extra informatievelden
* [x] ORM Aanmeldingen
* [x] Organisatorveld
* [ ] Aanmeldingen weergeven
* [x] Met de hand aanmelden
* [x] leden
* [x] niet-leden
* [ ] Aanwezigheidregistratie
* [ ] Export aanmeldingen
* [ ] met informatie
* [ ] Events weergeven
* [ ] Agendaoverzicht
* [ ] iCal feed
* [ ] Evenement view
* [ ] Deelnemers laten zien iff ingelogd
* [ ] Aanmelden
* [ ] Alleen huidige leden laten aanmelden
* [ ] Afmelden
* [ ] Afmelden na de deadline: thalia/website#390
* [ ] Squash migrationsLaunchJoost Rijneveldjoost@joostrijneveld.nlJoost Rijneveldjoost@joostrijneveld.nlhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/20Create mailinglists application2016-08-06T17:18:09+02:00Joost Rijneveldjoost@joostrijneveld.nlCreate mailinglists applicationCloses #25
This is currently functionally equivalent to the old system. See #29 for new ideas.Closes #25
This is currently functionally equivalent to the old system. See #29 for new ideas.Launchhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/19Merchandise2016-08-06T17:21:16+02:00Nienke WesselMerchandiseclose #7 close #7 Launchhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/18Allow for storage of membership history2016-08-05T17:55:57+02:00Joost Rijneveldjoost@joostrijneveld.nlAllow for storage of membership historyCloses #32
Note that this should still be populated (#33)Closes #32
Note that this should still be populated (#33)https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/17Complete photos app functionality2016-08-06T17:21:13+02:00Joost Rijneveldjoost@joostrijneveld.nlComplete photos app functionalityCloses #2Closes #2Launchhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/16Boards page2016-08-06T17:21:04+02:00Thom WiggersBoards pageImplement pages for the board
Closes #14 Implement pages for the board
Closes #14 Launchhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/15Usable photos app2016-08-06T17:21:01+02:00Joost Rijneveldjoost@joostrijneveld.nlUsable photos appIssue #2 is not fully resolved by this MR, as it does not include admin pages to manage the photos yet. Still, it seems useful to merge progress, especially since this adds thumbnailing. This does close #21.Issue #2 is not fully resolved by this MR, as it does not include admin pages to manage the photos yet. Still, it seems useful to merge progress, especially since this adds thumbnailing. This does close #21.LaunchThom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/14Prevent overriding underscore variable2016-07-28T17:41:37+02:00Joost Rijneveldjoost@joostrijneveld.nlPrevent overriding underscore variable