Kaibu 8b09777b2c Merge branch 'feature/books_refactor' into develop ...

# Conflicts:
#	vue/webpack-stats.json

2021-09-13 19:30:13 +02:00

..

assets

layout progress

2021-09-12 22:47:31 +02:00

css

social login buttons

2021-06-20 14:58:56 +02:00

custom

meal plan entry view

2020-05-08 00:10:23 +02:00

django_js_reverse

Squashed commit of the following:

2021-07-29 16:38:26 -05:00

emojionearea

emojis and migrations

2018-05-14 11:31:17 +02:00

fontawesome

cleanup and dependency updates + new nav

2019-11-19 19:59:53 +01:00

js

Squashed commit of the following:

2021-07-29 16:38:26 -05:00

pdfjs

improved pdf viewer

2020-06-10 15:40:24 +02:00

tabulator

updated tabulator js to 4.6

2020-03-31 01:20:49 +02:00

themes

small tweaks and fixes

2021-08-22 14:18:46 +02:00

vue

Merge branch 'develop' into generic_card_fix

2021-09-11 13:09:02 +02:00

webfonts

new tandoor theme added, minor ux fixes

2021-05-31 00:47:59 +02:00