Merge branch 'master' into...
Merge branch 'master' into 214-add-notification-dashboard-widget-anything-to-notify-of-upcoming-birthdays
Showing
- aleksis/core/filters.py 9 additions, 0 deletionsaleksis/core/filters.py
- aleksis/core/mixins.py 70 additions, 1 deletionaleksis/core/mixins.py
- aleksis/core/models.py 6 additions, 0 deletionsaleksis/core/models.py
- aleksis/core/rules.py 24 additions, 0 deletionsaleksis/core/rules.py
- aleksis/core/settings.py 46 additions, 13 deletionsaleksis/core/settings.py
- aleksis/core/static/print.css 23 additions, 1 deletionaleksis/core/static/print.css
- aleksis/core/templates/403.html 10 additions, 4 deletionsaleksis/core/templates/403.html
- aleksis/core/templates/500.html 1 addition, 1 deletionaleksis/core/templates/500.html
- aleksis/core/templates/503.html 1 addition, 1 deletionaleksis/core/templates/503.html
- aleksis/core/templates/core/additional_field/edit.html 1 addition, 1 deletionaleksis/core/templates/core/additional_field/edit.html
- aleksis/core/templates/core/base_print.html 7 additions, 5 deletionsaleksis/core/templates/core/base_print.html
- aleksis/core/templates/core/group/full.html 21 additions, 2 deletionsaleksis/core/templates/core/group/full.html
- aleksis/core/templates/core/group/list.html 7 additions, 1 deletionaleksis/core/templates/core/group/list.html
- aleksis/core/templates/core/pages/system_status.html 37 additions, 0 deletionsaleksis/core/templates/core/pages/system_status.html
- aleksis/core/templates/core/person/full.html 15 additions, 2 deletionsaleksis/core/templates/core/person/full.html
- aleksis/core/templates/core/person/list.html 16 additions, 1 deletionaleksis/core/templates/core/person/list.html
- aleksis/core/templates/core/school_term/create.html 1 addition, 1 deletionaleksis/core/templates/core/school_term/create.html
- aleksis/core/templates/core/school_term/edit.html 1 addition, 1 deletionaleksis/core/templates/core/school_term/edit.html
- aleksis/core/urls.py 6 additions, 1 deletionaleksis/core/urls.py
- aleksis/core/util/apps.py 11 additions, 0 deletionsaleksis/core/util/apps.py
Loading
Please register or sign in to comment