Merge branch 'develop-dashboard-feeds' into '134-merge-dashboard-ajax'
# Conflicts: # aleksis/core/templates/core/index.html # aleksis/core/views.py # poetry.lock # pyproject.toml
Branches 134-merge-dashboard-ajax
No related tags found
Showing
- CONTRIBUTING.rst 105 additions, 11 deletionsCONTRIBUTING.rst
- aleksis/core/__init__.py 6 additions, 0 deletionsaleksis/core/__init__.py
- aleksis/core/celery.py 8 additions, 0 deletionsaleksis/core/celery.py
- aleksis/core/locale/ar/LC_MESSAGES/djangojs.po 32 additions, 0 deletionsaleksis/core/locale/ar/LC_MESSAGES/djangojs.po
- aleksis/core/locale/de_DE/LC_MESSAGES/djangojs.po 30 additions, 0 deletionsaleksis/core/locale/de_DE/LC_MESSAGES/djangojs.po
- aleksis/core/locale/fr/LC_MESSAGES/djangojs.po 31 additions, 0 deletionsaleksis/core/locale/fr/LC_MESSAGES/djangojs.po
- aleksis/core/locale/nb_NO/LC_MESSAGES/djangojs.po 30 additions, 0 deletionsaleksis/core/locale/nb_NO/LC_MESSAGES/djangojs.po
- aleksis/core/locale/tr_TR/LC_MESSAGES/djangojs.po 30 additions, 0 deletionsaleksis/core/locale/tr_TR/LC_MESSAGES/djangojs.po
- aleksis/core/migrations/0001_initial.py 7 additions, 2 deletionsaleksis/core/migrations/0001_initial.py
- aleksis/core/migrations/0006_create_default_term.py 27 additions, 0 deletionsaleksis/core/migrations/0006_create_default_term.py
- aleksis/core/migrations/0007_create_admin_user.py 25 additions, 0 deletionsaleksis/core/migrations/0007_create_admin_user.py
- aleksis/core/migrations/0008_rename_fields_notification_activity.py 39 additions, 0 deletions...re/migrations/0008_rename_fields_notification_activity.py
- aleksis/core/mixins.py 39 additions, 5 deletionsaleksis/core/mixins.py
- aleksis/core/models.py 26 additions, 17 deletionsaleksis/core/models.py
- aleksis/core/settings.py 127 additions, 17 deletionsaleksis/core/settings.py
- aleksis/core/static/js/helper.js 3 additions, 0 deletionsaleksis/core/static/js/helper.js
- aleksis/core/static/js/main.js 11 additions, 11 deletionsaleksis/core/static/js/main.js
- aleksis/core/static/style.scss 30 additions, 6 deletionsaleksis/core/static/style.scss
- aleksis/core/templates/403.html 24 additions, 27 deletionsaleksis/core/templates/403.html
- aleksis/core/templates/404.html 28 additions, 31 deletionsaleksis/core/templates/404.html
Loading
Please register or sign in to comment