1836 Commits

Author	SHA1	Message	Date
Matthias	240859c38c	make crispy	2021-11-01 23:03:36 +01:00
Matthias	58bc677029	more contrast for the qr	2021-11-01 22:58:47 +01:00
Matthias	6404764025	crispyfy	2021-11-01 22:51:42 +01:00
Matthias	3cb2078821	fix spelling	2021-11-01 22:46:56 +01:00
Matthias	fc0e80dd76	make remove button conditional	2021-11-01 22:45:56 +01:00
Matthias	392e7f6e4c	there can be only one factor	2021-11-01 22:43:43 +01:00
Matthias	17e7c2ee15	disable add button if already set up	2021-11-01 22:43:28 +01:00
Oliver	6f9ac4a850	- Fixes for construct_absolute_url function ... - Refactor notification email generation - Update template file - Add separate templates folder for email	2021-11-02 00:40:25 +11:00
Matthias	62adb95d3c	Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201	2021-11-01 12:35:25 +01:00
Oliver	2662ba1202	Merge branch 'master' into stock-item-forms	2021-11-01 12:43:32 +11:00
Oliver	f607841601	Fix navbar spacing when "sticky-header" is enabled	2021-11-01 12:07:07 +11:00
Oliver	ad0277a8c3	Merge branch 'master' into stock-item-forms ... # Conflicts: # InvenTree/stock/serializers.py # InvenTree/stock/templates/stock/item_base.html	2021-11-01 12:00:40 +11:00
Oliver	94a86e52f8	Merge pull request #2224 from matmair/remove-breadrcumb-space ... remove breadcrub div where no breadcrumb is added	2021-11-01 11:57:21 +11:00
Matthias Mair	05a86c863f	Update page_base.html	2021-11-01 01:38:21 +01:00
Oliver	b64f0e1f54	Merge pull request #2222 from matmair/ui-navbar ... UI tweaks	2021-11-01 11:30:27 +11:00
Matthias	338e85ff52	remove breadcrub div where no breadcrumb	2021-11-01 01:09:08 +01:00
Matthias	9a346dd3e2	Revert "remove breadcrub div where no breadcrumb" ... This reverts commit 2c9b03944fab8590507e97eb4a584ed9018825f1.	2021-11-01 01:07:13 +01:00
Matthias Mair	d89cb0936c	Merge branch 'inventree:master' into plugin-2037	2021-11-01 01:06:26 +01:00
Matthias	9d68d6bdca	added setting to anable MFA	2021-11-01 00:34:00 +01:00
Matthias	8da2865299	setting sidebar header different color to items	2021-11-01 00:11:01 +01:00
Matthias	62aa014f6b	add button for navbar toogle	2021-11-01 00:09:38 +01:00
Matthias	2c9b03944f	remove breadcrub div where no breadcrumb	2021-11-01 00:08:39 +01:00
Matthias	d8fb6d44ec	adds faktors to user settings	2021-10-31 23:42:31 +01:00
Oliver	80e741fe1b	Further improvements for filter elements	2021-11-01 09:21:42 +11:00
Matthias	85da98a004	use auth screen to make more clear this is about security	2021-10-31 23:07:25 +01:00
Matthias Mair	0d836530e4	Merge branch 'inventree:master' into plugin-2037	2021-10-31 23:04:50 +01:00
Oliver	360f0406b5	CSS updates ... - Add template for filter lists - Filter lists now layout horizontally - Change flex-row to flex-wrap	2021-11-01 08:38:24 +11:00
Matthias	487bab5162	cleanup	2021-10-31 14:02:24 +01:00
Matthias	9fd66e9f22	Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201	2021-10-31 13:56:14 +01:00
Matthias	ec17bbcb95	mkaeuser setting tighter	2021-10-31 13:54:12 +01:00
Matthias	06822303bc	refactor user settings	2021-10-31 13:42:41 +01:00
Oliver	9057462588	Merge pull request #2212 from matmair/matmair/issue2210 ... Fix for actions wrapping on smaller screens	2021-10-31 09:09:27 +11:00
Matthias	199254dfe9	adjust navigation integration to new style	2021-10-30 22:35:47 +02:00
Matthias	0ae514e7be	hide breadcrumb section	2021-10-30 22:15:21 +02:00
Matthias	13cc329dc6	remove unneeded headers	2021-10-30 22:14:57 +02:00
Matthias Mair	b31a1aa4cc	fix plugin rendering in settings nav	2021-10-30 18:10:56 +00:00
Matthias	703c8a31b1	Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037	2021-10-30 18:23:09 +02:00
Matthias Mair	14680531f0	[BUG] Auth screens broken ... Fixes #2213	2021-10-30 14:05:40 +00:00
Oliver	eaa315e726	Merge branch 'master' into partial-shipment ... # Conflicts: # InvenTree/build/templates/build/build_base.html # InvenTree/order/templates/order/order_base.html # InvenTree/order/templates/order/sales_order_base.html # InvenTree/order/templates/order/sales_order_detail.html # InvenTree/order/templates/order/so_navbar.html	2021-10-30 23:44:06 +11:00
Matthias Mair	6af866557d	fixes missing wraping on iPdas and iPhones ... Fixes #2210	2021-10-30 12:34:31 +00:00
Oliver	75c8faa09f	Tweaks	2021-10-30 22:30:04 +11:00
Oliver	638c9d4007	Enable bootstrap-5 theme for select2	2021-10-30 22:16:40 +11:00
Oliver	29c913b553	Improvements for stock item test result table	2021-10-30 13:31:13 +11:00
Oliver	a689b77cfb	More tweaks	2021-10-30 13:18:11 +11:00
Oliver	c4c533bee0	JS linting	2021-10-30 13:03:52 +11:00
Oliver	8e1d9c281a	Adds tree view for stock locations	2021-10-30 12:53:25 +11:00
Oliver	be23634c5d	Refactor display toggle for part list and part category list	2021-10-30 12:45:07 +11:00
Oliver	fcc1e9fe8f	Fixes	2021-10-30 01:00:37 +11:00
Oliver	a792903a79	Catch sidebar error	2021-10-30 00:15:19 +11:00
Oliver	a15cc1f3ba	linting fixes	2021-10-30 00:07:51 +11:00