Commit Graph

7446 Commits

Author SHA1 Message Date
Oliver
f95346f214 Make the part thumbnail selection window searchable 2021-08-04 12:10:49 +10:00
Oliver
8daf601f00
Merge pull request #1897 from matmair/price-terms
updating language to be clearer
2021-08-04 09:03:13 +10:00
Oliver
69f242d11d
Merge pull request #1892 from eeintech/stock_installed_items
Re-enabled installing stock items into others
2021-08-04 09:01:28 +10:00
Oliver
910c57c92d
Merge pull request #1895 from eeintech/fix_has_ipn_filter
'has_ipn' filter method did not return queryset
2021-08-04 08:55:49 +10:00
Matthias
fa3c5ae108 updating language to be clearer
see https://github.com/inventree/InvenTree/issues/1889#issuecomment-891901070
2021-08-04 00:45:56 +02:00
eeintech
29c8daed0a 'has_ipn' filter method did not return queryset 2021-08-03 12:21:44 -04:00
eeintech
172a08fbba Removed old quantity setting lines 2021-08-03 09:53:08 -04:00
Oliver
529742b520
Merge pull request #1894 from SchrodingersGat/non-int-serial-fix
Fix for non-integer serial numbers
2021-08-03 10:03:05 +10:00
Oliver
f057937df0 Fix for non-integer serial numbers 2021-08-03 09:46:28 +10:00
eeintech
1c4924a4a5 Style duh 2021-08-02 15:14:55 -04:00
eeintech
ac3dcac641 Re-enabled installing stock items into others 2021-08-02 15:05:24 -04:00
Oliver
9aa5086067
Merge pull request #1819 from eeintech/part_main_details
Cleaner part details
2021-08-02 08:47:18 +10:00
Oliver
d154ca08ea
Merge pull request #1887 from matmair/settings-safety
settings fixes
2021-08-02 08:38:34 +10:00
Oliver
db57e9516b
Merge pull request #1890 from matmair/fix-for-1888
catch connection errors in exchange update
2021-08-02 08:34:52 +10:00
Matthias
0f11ab527f PEP fix 2021-08-01 20:58:57 +02:00
Matthias
83dab558d7 catch connection errors in exchange update
#Fixes #1888
2021-08-01 20:44:26 +02:00
Matthias
55762f2a96 do not use safe in template
that can cause wrong escaping and generally is considered unsafe
2021-08-01 01:41:46 +02:00
Matthias
c0921fc7ce removing unneeded prints 2021-08-01 01:16:10 +02:00
Matthias
ae8e58ac12 invoke task for celan_settings 2021-08-01 01:06:17 +02:00
Matthias
2347f15c2e new command to cleanup old settings in db 2021-08-01 01:05:43 +02:00
Matthias
369864574e only include setting in the settings that have a key 2021-07-30 23:25:45 +02:00
eeintech
634e5e0da6 Added toggle for part details
Added persistence for page refresh or new part page
2021-07-30 14:55:12 -04:00
eeintech
20b21a2b71 Merge branch 'master' of github.com:inventree/InvenTree into part_main_details 2021-07-30 10:50:28 -04:00
Oliver
7ed43f5a11
Merge pull request #1886 from inventree/revert-1885-docker-publish
Revert "Publish on tags also"
2021-07-30 13:39:49 +10:00
Oliver
1d19393442
Revert "Publish on tags also" 2021-07-30 12:42:03 +10:00
Oliver
6d0b01d0fb
Merge pull request #1885 from SchrodingersGat/docker-publish
Publish on tags also
2021-07-30 12:33:31 +10:00
Oliver
13898d6687 Publish on tags also 2021-07-30 11:51:06 +10:00
Oliver
eb883d7e70
Merge pull request #1884 from SchrodingersGat/typo-fix
logging.get -> logging.getLogger
2021-07-30 00:09:43 +10:00
Oliver Walters
d9f4c34a42 logging.get -> logging.getLogger 2021-07-29 23:44:52 +10:00
Oliver
3806e3ebeb
Merge pull request #1880 from SchrodingersGat/settings-fix
Bug fix
2021-07-29 17:56:45 +10:00
Oliver
c39e3aaa82 Bug fix 2021-07-29 17:52:24 +10:00
Oliver
60e4022568
Merge pull request #1879 from SchrodingersGat/docker-improvements
Specify how many workers to use
2021-07-29 17:19:41 +10:00
Oliver
542c204ca0 PEP fixes 2021-07-29 16:39:51 +10:00
Oliver
dd12a593f4 Specify how many workers to use 2021-07-29 16:37:34 +10:00
Oliver
935ef968de
Merge pull request #1878 from SchrodingersGat/js-template-stuff
Js template stuff
2021-07-29 13:42:47 +10:00
Oliver
7756c766c3 Fix stock.js 2021-07-29 12:35:21 +10:00
Oliver
4381a16b0e Template cleanup 2021-07-29 12:31:07 +10:00
Oliver
6fe5f0e0e6 Fixes for order.js 2021-07-29 11:58:32 +10:00
Oliver
ba5479090a Fix nav.js 2021-07-29 11:54:04 +10:00
Oliver
28bf5bfdbc Fix table_filters.js 2021-07-29 11:52:50 +10:00
Oliver
a222efda33 Fix rendering issues 2021-07-29 11:43:50 +10:00
Oliver
27ec65a002 Add 'settings.js' which provides all settings (global and user) as a dynamic javascript file
- Minimal database hits required
2021-07-29 11:28:04 +10:00
Oliver
915756eacf Improve test output 2021-07-29 09:28:08 +10:00
Oliver
8e97d14f1f Rename CI test 2021-07-29 09:26:56 +10:00
Oliver
14aebfdae1 Split dynamic javascript files into two separate directories
- One gets translated and is served statically
- One does not get translated and is served dynamically
- Add CI step
2021-07-29 09:23:24 +10:00
Oliver
bc3c3be751 force linux-style line endings for .sh files 2021-07-29 09:10:46 +10:00
Oliver
2009773d9d
Merge pull request #1877 from eeintech/fix_search_js
Fixed missing comma propagating to translated JS files
2021-07-29 08:27:20 +10:00
eeintech
d43312d162 Missing comma propagating to translated JS files 2021-07-28 13:29:12 -04:00
Oliver
430f737953
Merge pull request #1876 from SchrodingersGat/mpn-api
Adds an API filter class for the ManufacturerPart list endpoint
2021-07-29 00:23:44 +10:00
Oliver
baa6283d20 Fixes 2021-07-28 23:47:50 +10:00