4081 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
eeintech	28585644ea	Added automatic listing of custom CSS sheets (no more hardcoded), added error message when current selection is not valid and select default theme	2020-09-09 14:55:32 -05:00
eeintech	8198fad6d5	Updated common.colortheme migration	2020-09-08 16:36:58 -05:00
eeintech	35060ce8dc	Merge branch 'master' of git://github.com/inventree/InvenTree into color_themes	2020-09-08 16:33:22 -05:00
eeintech	896fa131f0	Moved color themes CSS sheets to own folder, nicer crispy form for selecting theme	2020-09-08 16:24:22 -05:00
Oliver	700d522c3c	Merge pull request #962 from eeintech/part_ipn_slug ... Added PartDetailFromIPN view (subclass of PartDetail) and url pattern	2020-09-08 09:40:28 +10:00
eeintech	8e2d568a42	Style correction (missing ending new line), removed commented line in ColorThemeSelectForm	2020-09-07 17:01:05 -05:00
eeintech	10dd8fad80	Renamed Theme to ColorTheme, ColorTheme is now a per-user selection	2020-09-07 16:27:23 -05:00
eeintech	2e5ec5d249	Theme change works but applies to all user	2020-09-07 15:15:51 -05:00
eeintech	0548bee8ad	Added Color Theme view in settings	2020-09-07 11:29:24 -05:00
eeintech	27241e217f	Style correction	2020-09-07 08:46:39 -05:00
eeintech	c5efce36b6	Added PartDetailFromIPN view tests	2020-09-07 08:40:37 -05:00
eeintech	41071f0ed4	Moved IPN url pattern to right before Part index to avoid catching others	2020-09-05 12:03:07 -05:00
eeintech	8198e919b1	Merge branch 'master' of git://github.com/inventree/InvenTree into part_ipn_slug	2020-09-05 11:42:33 -05:00
Oliver Walters	bec92901c3	Merge remote-tracking branch 'inventree/master'	2020-09-06 00:02:03 +10:00
Oliver	f0713ce01d	Merge pull request #966 from SchrodingersGat/stock-item-link ... Add link from stock item to base part	2020-09-06 00:01:36 +10:00
Oliver Walters	87f25eacc5	Add link from stock item to base part	2020-09-06 00:01:14 +10:00
Oliver Walters	05ae880999	Merge remote-tracking branch 'inventree/master'	2020-09-05 23:43:20 +10:00
Oliver	22e30903b6	Merge pull request #965 from SchrodingersGat/api-stock-fix ... Major bugfix for multiple annotations in API querysets	2020-09-05 23:42:25 +10:00
Oliver Walters	46a8107be5	Refactor stock filter	2020-09-05 23:35:48 +10:00
Oliver Walters	2cf40c0e0b	Translation updates	2020-09-05 23:32:36 +10:00
Oliver Walters	f7ad38dad5	Add unit tests for new aggregation annotation approach	2020-09-05 23:28:54 +10:00
Oliver Walters	5f2e4c3790	Update serializers for Order model	2020-09-05 23:08:59 +10:00
Oliver Walters	598e15af46	Fix annotations for Company serializers	2020-09-05 23:03:38 +10:00
Oliver Walters	db214dfd73	Update queryset annotation for StockItem ... - Query time reduced from 4.1 to 3.5s (for sample data)	2020-09-05 22:50:17 +10:00
Oliver Walters	42967905bc	New approach for multiple annotations ... - Use the django-sql-utils addon - https://github.com/martsberger/django-sql-utils - The "distinct=True" flag was not doing what I thought it was doing...	2020-09-05 22:35:19 +10:00
Oliver	a2efac4dbe	Merge pull request #964 from SchrodingersGat/new-stock-item-form ... Bugfix: CreateStockItem form	2020-09-05 20:51:36 +10:00
Oliver Walters	f737ad2d38	Bugfix: CreateStockItem form ... - hide the field rather than popping it	2020-09-05 20:31:18 +10:00
Oliver	2667dc68d7	Merge pull request #963 from SchrodingersGat/variant-form ... Allow selection of bom_copy and parameter_copy when making a new variant	2020-09-05 20:26:14 +10:00
Oliver Walters	c4989e59b2	Allow selection of bom_copy and parameter_copy when making a new variant	2020-09-05 20:10:18 +10:00
Oliver	6ef4390e29	Merge pull request #961 from eeintech/parameters_copy ... Implemented part parameters copy from template/original part	2020-09-05 20:03:18 +10:00
eeintech	2fa284d37b	Added PartDetailFromIPN view (subclass of PartDetail) and url pattern	2020-09-04 17:20:17 -05:00
eeintech	440a5fafea	Implemented part parameters copy from template/original part	2020-09-04 14:02:12 -05:00
Oliver	11b751323e	Merge pull request #953 from SchrodingersGat/part-import-fix ... Part: Alter model fields to fix data import issues	2020-09-03 00:18:26 +10:00
Oliver Walters	34a334236a	Part: Alter model fields to fix data import issues ... Without setting 'null=True' on fields which may be empty, the import subsequently fails if these fields are indeed empty	2020-09-03 00:11:20 +10:00
Oliver	81b50312e2	Merge pull request #952 from SchrodingersGat/variant-table ... Add ability to filter part list by 'ancestor'	2020-09-03 00:09:53 +10:00
Oliver Walters	b89588ffb7	variant of link links to variants page	2020-09-03 00:00:03 +10:00
Oliver Walters	303572bc03	More translation updates	2020-09-02 23:57:51 +10:00
Oliver Walters	e3d92e1390	Fixes for translation script	2020-09-02 23:54:35 +10:00
Oliver Walters	eaec85398f	Treegrid display for part variants	2020-09-02 23:51:28 +10:00
Oliver Walters	62c26c881d	Add ability to filter part list by 'ancestor'	2020-09-02 23:18:26 +10:00
Oliver	104b9d2d44	Merge pull request #949 from SchrodingersGat/multi-db-unit-test ... Add CI tests for MySQL database	2020-09-02 20:26:51 +10:00
Oliver Walters	36955d6d4f	pep fixes	2020-09-02 20:16:46 +10:00
Oliver Walters	92ec849fc1	Add ci settings file for postgresql database	2020-09-02 20:09:11 +10:00
Oliver Walters	bb9e8fa97b	Merge remote-tracking branch 'inventree/master' into multi-db-unit-test ... # Conflicts: # InvenTree/build/test_build.py	2020-09-02 20:02:22 +10:00
Oliver Walters	911727f7b7	Update test fixtures ... - Can't assume that pk values will be assigned sensibly! - Need to hard-code them in	2020-09-02 19:47:07 +10:00
Oliver Walters	bc2f131144	travis fixes	2020-09-01 21:24:19 +10:00
Oliver Walters	b8856476be	More CI file changes	2020-09-01 21:21:32 +10:00
Oliver Walters	37a43c8657	Install required PIP packages	2020-09-01 21:13:38 +10:00
Oliver Walters	85f635c975	Darn spelling misterks	2020-09-01 21:08:58 +10:00
Oliver Walters	3af704c453	Fix - tickmark	2020-09-01 21:05:52 +10:00