12921 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias	a4af573812	add logo option to config template	2022-04-24 16:14:55 +02:00
Matthias	1bce7b745e	add custom logo option	2022-04-24 16:13:44 +02:00
Matthias	002f5ec288	move setting lower	2022-04-24 16:12:01 +02:00
Matthias	f1f6c9ff66	remove InvenTree from settings texts	2022-04-24 15:25:34 +02:00
Matthias	2847eef71c	load missing tag	2022-04-24 15:13:31 +02:00
Matthias	f2d0537198	set navbar message via config file	2022-04-24 15:12:03 +02:00
Matthias	1127bf2497	make it possible to resitrict the about modal	2022-04-24 01:02:41 +02:00
Matthias	ff9d8e7b6b	use instance title in version string	2022-04-24 00:28:27 +02:00
Matthias	9673d81014	remove InvenTree name where not needed	2022-04-24 00:23:26 +02:00
Matthias	54d8a4e802	use server title instead of InvenTree	2022-04-24 00:21:33 +02:00
Matthias	7834171c2a	[FR] White labeling ... Fixes #2301	2022-04-23 23:38:49 +02:00
Matthias Mair	b118890676	Merge branch 'inventree:master' into matmair/issue2694	2022-04-23 21:30:01 +02:00
Matthias Mair	8f13f36e2d	Merge branch 'inventree:master' into matmair/issue2788	2022-04-23 21:29:52 +02:00
Matthias Mair	2f0291864f	Merge branch 'inventree:master' into matmair/issue2385	2022-04-23 21:29:37 +02:00
Oliver	adfcd42e09	Merge pull request #2859 from SchrodingersGat/ipn-validator-fix ... IPN validator fix	2022-04-22 15:11:33 +10:00
Oliver	99718865c0	Further attempts to fix CI issues	2022-04-22 14:33:46 +10:00
Oliver	4994920119	Use recommended collation option	2022-04-22 13:48:15 +10:00
Oliver	fa3c24b085	Try a different collation option	2022-04-22 13:25:22 +10:00
Oliver	0806e18aca	Case sensitive collation	2022-04-22 12:39:42 +10:00
Oliver	2f1e869351	Only set collation option for mysql test database	2022-04-22 11:31:51 +10:00
Oliver	dc0f18d21f	Specify charset and collation options for the test database	2022-04-22 11:20:49 +10:00
Oliver Walters	5fde9f552c	Add similar check for IPN	2022-04-22 01:00:38 +10:00
Oliver Walters	292d28d378	Account for cases where serial number could be an integer!	2022-04-22 01:00:02 +10:00
Oliver Walters	aa4df62ac9	IPN fix	2022-04-22 00:40:23 +10:00
Oliver Walters	a7c18891b5	Increase unit testing for duplicate IPN testing ... - IPN duplication test is case sensitive!	2022-04-22 00:38:08 +10:00
Oliver Walters	9a9ed5f192	Fix validation of duplicate IPN ... - Duplicate IPN check does not apply if an empty IPN value is set - Note that "if x" is a more pythonic test than "if x not in [None, '']"	2022-04-22 00:36:30 +10:00
Oliver Walters	6dec8ba113	PEP fix	2022-04-22 00:24:25 +10:00
Oliver Walters	f504dfe797	part variant table now displays information about variant stock quantities	2022-04-22 00:20:32 +10:00
Oliver Walters	8b9aa86a0a	Add 'variant_stock' to Part API serializer	2022-04-22 00:14:37 +10:00
Oliver Walters	aa20d84cc1	Update javascript rendering in build table	2022-04-22 00:00:50 +10:00
Oliver Walters	ec34d23bfc	Update javascript rendering in BOM table	2022-04-21 23:58:12 +10:00
Oliver Walters	fa2510c42f	Use a proper queryset annotation to calculate the "available_variant_stock"	2022-04-21 23:53:03 +10:00
Oliver	42f0628a48	Merge pull request #2858 from SchrodingersGat/docker-init-fix ... Revert location of init.sh for Dockerfile	2022-04-21 22:29:36 +10:00
Oliver Walters	0cd5a2b005	Revert location of init.sh for Dockerfile	2022-04-21 20:17:12 +10:00
Oliver Walters	1d73f7c066	Update API version info	2022-04-21 20:14:46 +10:00
Oliver Walters	3b4d0c2f9c	Merge remote-tracking branch 'inventree/master' into variant-available ... # Conflicts: # InvenTree/InvenTree/version.py	2022-04-21 20:13:51 +10:00
Oliver	d647153cc2	Merge pull request #2856 from SchrodingersGat/docker-project-names ... Adds project names for docker-compose files	2022-04-21 12:30:07 +10:00
Oliver	60097ef57c	Merge pull request #2855 from SchrodingersGat/security-fix ... Security patch for django	2022-04-21 12:11:46 +10:00
Oliver	6d56dbd266	Adds project names for docker-compose files	2022-04-21 12:04:05 +10:00
Oliver	27c807492d	Security patch for django	2022-04-21 11:45:09 +10:00
Oliver	d9fcdf8253	Merge pull request #2852 from SchrodingersGat/docker-build-fix ... Add sqlite-config file back in	2022-04-21 02:01:11 +10:00
Oliver Walters	67196b866e	Compose script fixes ... - Define INVENTREE_DB_NAME - Cache built image	2022-04-21 01:13:34 +10:00
Oliver Walters	1ac8ae7697	No need to build docker test image on each pull request commit	2022-04-21 01:10:29 +10:00
Oliver Walters	a376625088	Force INVENTREE_DB_USER and INVENTREE_DB_PASSWORD to be set manually ... - Only for the "production" docker setup	2022-04-21 01:04:46 +10:00
Oliver Walters	ced9c6c050	Sqlite docker-compose file no longer requires .env file ... As this is only used for CI this is OK	2022-04-21 01:02:55 +10:00
Oliver	12ef35338f	Merge pull request #2851 from SchrodingersGat/czech-yourself ... Add Czech language support	2022-04-21 00:50:31 +10:00
Oliver Walters	0974fde59e	Add sqlite-config file back in ... - required for CI steps - might refactor this out later on	2022-04-21 00:34:24 +10:00
Oliver	b3d96801af	Merge pull request #2850 from SchrodingersGat/docker-refactor ... Docker refactor	2022-04-21 00:31:14 +10:00
Oliver Walters	2b8ddd58a8	Add initial translation files	2022-04-21 00:18:39 +10:00
Oliver Walters	7dce7779c3	cz -> cs	2022-04-21 00:14:38 +10:00