12397 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias	b4068c5e0f	remove dead middleware	2022-04-25 00:25:12 +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	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	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
Oliver Walters	2144506745	Add language support for Czech	2022-04-21 00:12:53 +10:00
Oliver Walters	e15a4b73cd	Restore docker-compose.sqlite.yml ... This is used for docker build testing in CI!	2022-04-21 00:03:48 +10:00
Oliver Walters	0c93009bf7	Tweaks to dockerfile	2022-04-21 00:01:11 +10:00
Oliver Walters	6929d07f42	Cache the pre-built image ... - The worker container can then use it - Saves a *lot* of time (and otherwise wasted resources)	2022-04-20 23:52:56 +10:00
Oliver Walters	e87e478009	Fix env file reference for docker-compose.yml (development)	2022-04-20 23:34:50 +10:00
Oliver Walters	85feb30812	Refactor development docker-compose setup	2022-04-20 23:15:37 +10:00
Oliver Walters	0b3aac21ea	The production docker-compose file now no longer needs to be touched at all ... Everything can be specified in the .env file!	2022-04-20 22:46:25 +10:00
Oliver Walters	c3fff02bd8	Automatically create a database (with the correct name) when the db container is started!	2022-04-20 22:11:07 +10:00
Oliver Walters	a50f26e84d	Adjust naming of nginx production file	2022-04-20 21:52:25 +10:00
Oliver Walters	e4e735a71b	Refactoring docker-compose.postgresql.yml ... - Do not require duplication of username / password values - Specify different env file - Move to a new child directory which simplifies setup	2022-04-20 21:44:22 +10:00
Oliver Walters	f0a01587ac	Rename default docker-compose file	2022-04-20 21:18:12 +10:00
Oliver	aec7d2d0aa	Merge pull request #2842 from awiswasi/vulnerability-fix ... Fixed vulnerability in jquery-ui@1.12.1	2022-04-20 11:11:58 +10:00
Awf Wiswasi	761e822a4e	Updated jquery v1.12.1 to v1.13.0 to fix a possible XSS vulnerability.	2022-04-19 17:36:34 -07:00
Oliver	8d51c592e7	Merge pull request #2843 from matmair/plugin-mark-sample ... Mark sample plugins	2022-04-20 09:20:00 +10:00
Matthias Mair	d2e3d824b0	Merge branch 'inventree:master' into plugin-mark-sample	2022-04-20 00:03:42 +02:00
Oliver	ad541903c8	Merge pull request #2841 from SchrodingersGat/x-forwarded-for ... X-forwarded-for	2022-04-20 07:02:52 +10:00
Matthias Mair	544a590b7a	Merge branch 'inventree:master' into plugin-mark-sample	2022-04-19 18:24:21 +02:00
Awf Wiswasi	d93cc78bf6	Fixed vulnerability to Cross-site Scripting (XSS) when accepting the value of altField option of the Datepicker widget from untrusted sources, which may lead to execution of untrusted code. Vulnerability fixed in jquery-ui@1.13.0	2022-04-19 05:50:17 -07:00
Oliver Walters	85c8b94d80	Update nginx conf files	2022-04-19 22:09:30 +10:00
Oliver Walters	7c126ed712	Added x_forwarded_for middleware ... Used to extract remote client IP (when behind balancer / proxy / etc)	2022-04-19 21:19:25 +10:00
Oliver	8a82f22378	Merge pull request #2840 from SchrodingersGat/batch-install ... Batch install	2022-04-19 21:15:42 +10:00