2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-15 20:32:17 +00:00

Commit Graph

  • 9673d81014 remove InvenTree name where not needed Matthias 2022-04-24 00:23:26 +02:00
  • 54d8a4e802 use server title instead of InvenTree Matthias 2022-04-24 00:21:33 +02:00
  • 7834171c2a [FR] White labeling Fixes #2301 Matthias 2022-04-23 23:38:49 +02:00
  • b118890676 Merge branch 'inventree:master' into matmair/issue2694 Matthias Mair 2022-04-23 21:30:01 +02:00
  • 8f13f36e2d Merge branch 'inventree:master' into matmair/issue2788 Matthias Mair 2022-04-23 21:29:52 +02:00
  • 2f0291864f Merge branch 'inventree:master' into matmair/issue2385 Matthias Mair 2022-04-23 21:29:37 +02:00
  • adfcd42e09 Merge pull request #2859 from SchrodingersGat/ipn-validator-fix Oliver 2022-04-22 15:11:33 +10:00
  • 99718865c0 Further attempts to fix CI issues #2859 Oliver 2022-04-22 14:33:46 +10:00
  • 4994920119 Use recommended collation option Oliver 2022-04-22 13:48:15 +10:00
  • fa3c24b085 Try a different collation option Oliver 2022-04-22 13:25:22 +10:00
  • 0806e18aca Case sensitive collation Oliver 2022-04-22 12:39:42 +10:00
  • 2f1e869351 Only set collation option for mysql test database Oliver 2022-04-22 11:31:51 +10:00
  • dc0f18d21f Specify charset and collation options for the test database Oliver 2022-04-22 11:20:49 +10:00
  • 5fde9f552c Add similar check for IPN Oliver Walters 2022-04-22 01:00:38 +10:00
  • 292d28d378 Account for cases where serial number could be an integer! Oliver Walters 2022-04-22 01:00:02 +10:00
  • aa4df62ac9 IPN fix Oliver Walters 2022-04-22 00:40:23 +10:00
  • a7c18891b5 Increase unit testing for duplicate IPN testing Oliver Walters 2022-04-22 00:38:08 +10:00
  • 9a9ed5f192 Fix validation of duplicate IPN Oliver Walters 2022-04-22 00:36:30 +10:00
  • 6dec8ba113 PEP fix Oliver Walters 2022-04-22 00:24:25 +10:00
  • f504dfe797 part variant table now displays information about variant stock quantities Oliver Walters 2022-04-22 00:20:32 +10:00
  • 8b9aa86a0a Add 'variant_stock' to Part API serializer Oliver Walters 2022-04-22 00:14:37 +10:00
  • aa20d84cc1 Update javascript rendering in build table Oliver Walters 2022-04-22 00:00:50 +10:00
  • ec34d23bfc Update javascript rendering in BOM table Oliver Walters 2022-04-21 23:58:12 +10:00
  • fa2510c42f Use a proper queryset annotation to calculate the "available_variant_stock" Oliver Walters 2022-04-21 23:51:29 +10:00
  • 42f0628a48 Merge pull request #2858 from SchrodingersGat/docker-init-fix Oliver 2022-04-21 22:29:36 +10:00
  • 0cd5a2b005 Revert location of init.sh for Dockerfile #2858 Oliver Walters 2022-04-21 20:17:12 +10:00
  • 1d73f7c066 Update API version info Oliver Walters 2022-04-21 20:14:46 +10:00
  • 3b4d0c2f9c Merge remote-tracking branch 'inventree/master' into variant-available Oliver Walters 2022-04-21 20:13:51 +10:00
  • d647153cc2 Merge pull request #2856 from SchrodingersGat/docker-project-names Oliver 2022-04-21 12:30:07 +10:00
  • 60097ef57c Merge pull request #2855 from SchrodingersGat/security-fix Oliver 2022-04-21 12:11:46 +10:00
  • 6d56dbd266 Adds project names for docker-compose files #2856 Oliver 2022-04-21 12:04:05 +10:00
  • 27c807492d Security patch for django #2855 Oliver 2022-04-21 11:45:09 +10:00
  • d9fcdf8253 Merge pull request #2852 from SchrodingersGat/docker-build-fix Oliver 2022-04-21 02:01:11 +10:00
  • 67196b866e Compose script fixes #2852 Oliver Walters 2022-04-21 01:13:34 +10:00
  • 1ac8ae7697 No need to build docker test image on each pull request commit Oliver Walters 2022-04-21 01:10:29 +10:00
  • a376625088 Force INVENTREE_DB_USER and INVENTREE_DB_PASSWORD to be set manually Oliver Walters 2022-04-21 01:04:46 +10:00
  • ced9c6c050 Sqlite docker-compose file no longer requires .env file Oliver Walters 2022-04-21 01:02:55 +10:00
  • 12ef35338f Merge pull request #2851 from SchrodingersGat/czech-yourself Oliver 2022-04-21 00:50:31 +10:00
  • 0974fde59e Add sqlite-config file back in Oliver Walters 2022-04-21 00:34:24 +10:00
  • b3d96801af Merge pull request #2850 from SchrodingersGat/docker-refactor Oliver 2022-04-21 00:31:14 +10:00
  • 2b8ddd58a8 Add initial translation files #2851 Oliver Walters 2022-04-21 00:18:39 +10:00
  • 7dce7779c3 cz -> cs Oliver Walters 2022-04-21 00:14:38 +10:00
  • 2144506745 Add language support for Czech Oliver Walters 2022-04-21 00:12:53 +10:00
  • e15a4b73cd Restore docker-compose.sqlite.yml #2850 Oliver Walters 2022-04-21 00:03:48 +10:00
  • 0c93009bf7 Tweaks to dockerfile Oliver Walters 2022-04-21 00:01:11 +10:00
  • 6929d07f42 Cache the pre-built image Oliver Walters 2022-04-20 23:52:56 +10:00
  • e87e478009 Fix env file reference for docker-compose.yml (development) Oliver Walters 2022-04-20 23:34:50 +10:00
  • 85feb30812 Refactor development docker-compose setup Oliver Walters 2022-04-20 23:15:37 +10:00
  • 0b3aac21ea The production docker-compose file now no longer needs to be touched at all Oliver Walters 2022-04-20 22:35:53 +10:00
  • c3fff02bd8 Automatically create a database (with the correct name) when the db container is started! Oliver Walters 2022-04-20 22:11:07 +10:00
  • a50f26e84d Adjust naming of nginx production file Oliver Walters 2022-04-20 21:52:25 +10:00
  • e4e735a71b Refactoring docker-compose.postgresql.yml Oliver Walters 2022-04-20 21:44:22 +10:00
  • f0a01587ac Rename default docker-compose file Oliver Walters 2022-04-20 21:18:12 +10:00
  • e37097d62a Pin package versions Oliver 2022-04-20 12:18:39 +10:00
  • 4800b2bf21 Merge pull request #2842 from awiswasi/vulnerability-fix Oliver 2022-04-20 11:11:58 +10:00
  • d1cca52ece Bump version number Oliver 2022-04-20 11:20:07 +10:00
  • aec7d2d0aa Merge pull request #2842 from awiswasi/vulnerability-fix Oliver 2022-04-20 11:11:58 +10:00
  • 761e822a4e Updated jquery v1.12.1 to v1.13.0 to fix a possible XSS vulnerability. #2842 Awf Wiswasi 2022-04-19 17:36:34 -07:00
  • 8d51c592e7 Merge pull request #2843 from matmair/plugin-mark-sample Oliver 2022-04-20 09:20:00 +10:00
  • 756eb4f4ea Merge branch 'inventree:master' into matmair/issue2385 Matthias Mair 2022-04-20 00:05:26 +02:00
  • d2e3d824b0 Merge branch 'inventree:master' into plugin-mark-sample #2843 Matthias Mair 2022-04-20 00:03:42 +02:00
  • ad541903c8 Merge pull request #2841 from SchrodingersGat/x-forwarded-for Oliver 2022-04-20 07:02:52 +10:00
  • 544a590b7a Merge branch 'inventree:master' into plugin-mark-sample Matthias Mair 2022-04-19 18:24:21 +02:00
  • 3e39f99ccb Merge branch 'inventree:master' into matmair/issue2788 Matthias Mair 2022-04-19 18:24:15 +02:00
  • b3dca68c6b Merge branch 'inventree:master' into matmair/issue2694 Matthias Mair 2022-04-19 18:24:12 +02:00
  • 1399b4fbb3 Merge branch 'inventree:master' into matmair/issue2385 Matthias Mair 2022-04-19 18:23:49 +02:00
  • 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 Awf Wiswasi 2022-04-19 05:50:17 -07:00
  • 85c8b94d80 Update nginx conf files #2841 Oliver Walters 2022-04-19 22:09:30 +10:00
  • 7c126ed712 Added x_forwarded_for middleware Oliver Walters 2022-04-19 21:19:25 +10:00
  • 8a82f22378 Merge pull request #2840 from SchrodingersGat/batch-install Oliver 2022-04-19 21:15:42 +10:00
  • db897d5dce JS linting #2840 Oliver Walters 2022-04-19 20:47:37 +10:00
  • 5fe2fb615b Style fixes Oliver Walters 2022-04-19 20:41:08 +10:00
  • 1fb94bf04b Allow "tracked" stock items to be installed, rather than just serialized Oliver Walters 2022-04-19 20:35:54 +10:00
  • 0e67ea8e95 Change ordering of stock item form fields Oliver Walters 2022-04-19 20:28:45 +10:00
  • 7531ef8e5f Prevent annoying error messages when notification request fails Oliver Walters 2022-04-19 20:28:35 +10:00
  • cffeb62bd1 Bug fix for StockItem.clean() Oliver Walters 2022-04-19 20:28:13 +10:00
  • 141f6ccbdf Increase unit testing for StockItem API Oliver Walters 2022-04-19 20:10:07 +10:00
  • 2315d0cb5d Adds ability to filter stock item tables by "tracked" status Oliver Walters 2022-04-19 18:13:48 +10:00
  • d213e1fdc7 Move API version information into a new file Oliver Walters 2022-04-19 18:11:52 +10:00
  • 39a77f7f3a Adds a "stock items" view for a part category Oliver Walters 2022-04-19 18:04:48 +10:00
  • 86c7417296 Remove old template file Oliver Walters 2022-04-19 17:58:54 +10:00
  • 1dfbd30294 Bug fix for displaying batch information Oliver Walters 2022-04-19 17:53:58 +10:00
  • 1519a4f882 Merge remote-tracking branch 'inventree/master' Oliver Walters 2022-04-19 17:45:21 +10:00
  • 3563fd8c25 Merge pull request #2839 from SchrodingersGat/persian-language Oliver 2022-04-19 17:14:30 +10:00
  • e33d970beb Add persian translation files #2839 Oliver 2022-04-19 16:36:52 +10:00
  • 584c06d045 Add support for fa (farsi / persian) Oliver 2022-04-19 16:31:38 +10:00
  • 71b4c64e4d Merge pull request #2837 from SchrodingersGat/variant-tracking Oliver 2022-04-19 16:08:38 +10:00
  • 5f503c7e0f PEP fxies #2837 Oliver 2022-04-19 13:16:45 +10:00
  • 5240c60e0b Render part information in stock item tracking table (if provided) Oliver 2022-04-19 13:14:54 +10:00
  • e5eb1f4513 Adds button to refresh stock item tracking table Oliver 2022-04-19 13:09:14 +10:00
  • 48170ee096 Update stock item variant conversion form to use new function Oliver 2022-04-19 13:04:17 +10:00
  • 87de7e4beb Adds "convert_to_variant" function for the StockItem model Oliver 2022-04-19 12:52:36 +10:00
  • ab114b52e9 Add new CONVERTED_TO_VARIANT tracking code Oliver 2022-04-19 12:46:08 +10:00
  • 65ee15cace Merge pull request #2836 from SchrodingersGat/batch-in-forms Oliver 2022-04-18 23:43:38 +10:00
  • 1cddb565da PEP fixes #2836 Oliver Walters 2022-04-18 23:20:59 +10:00
  • 8a6b16c1d1 Display batch code for stock items in forms Oliver Walters 2022-04-18 23:10:38 +10:00
  • 6beea0a557 Render batch code in stock adjustment dialog Oliver Walters 2022-04-18 22:56:31 +10:00
  • 33401cb207 Adds ability to filter stockitem list by "has_batch" parmeter Oliver Walters 2022-04-18 22:34:00 +10:00
  • 5f455a6ee8 Merge pull request #2834 from rkalman/fix-so-panel-load Oliver 2022-04-17 01:46:08 +10:00
  • 7cbefa5fb7 Fixes loading of SO table on company page #2834 Kálmán Rózsahegyi 2022-04-16 17:09:28 +02:00