2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-18 13:47:44 +00:00

Commit Graph

  • 45eb2f6f26 Merge pull request #1669 from matmair/so-total Oliver 2021-06-17 09:10:57 +10:00
  • af2cfe55be missed a translation there #1669 Matthias 2021-06-17 00:51:53 +02:00
  • ddd84dcd7c Merge branch 'master' of https://github.com/inventree/InvenTree into so-total Matthias 2021-06-17 00:50:39 +02:00
  • 69c253bee5 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 #1668 Oliver 2021-06-17 08:50:32 +10:00
  • bbe7edbf82 totals like in #1666 Matthias 2021-06-17 00:50:10 +02:00
  • a8ae62e133 Merge remote-tracking branch 'inventree/master' into l10 Oliver 2021-06-17 08:49:00 +10:00
  • 0f53a03aae Fix: New translations django.po from Crowdin #1667 Oliver 2021-06-17 08:41:06 +10:00
  • d85fe7cf4c Fix: New translations django.po from Crowdin Oliver 2021-06-17 08:41:04 +10:00
  • e1e3608700 Fix: New translations django.po from Crowdin Oliver 2021-06-17 08:41:03 +10:00
  • 431ae69ee9 Fix: New translations django.po from Crowdin Oliver 2021-06-17 08:41:02 +10:00
  • 5704dcc551 Fix: New translations django.po from Crowdin Oliver 2021-06-17 08:41:00 +10:00
  • 42ecb11dbc Fix: New translations django.po from Crowdin Oliver 2021-06-17 08:40:59 +10:00
  • b59de2a9ba Fix: New translations django.po from Crowdin Oliver 2021-06-17 08:40:58 +10:00
  • 716167d4d0 Fix: New translations django.po from Crowdin Oliver 2021-06-17 08:40:57 +10:00
  • 7fd9dd4f12 Fix: New translations django.po from Crowdin Oliver 2021-06-17 08:40:55 +10:00
  • 7eb420409b updated translation base github-actions[bot] 2021-06-16 22:40:13 +00:00
  • 5bbc44e816 Merge pull request #1666 from matmair/po-total Oliver 2021-06-17 08:38:51 +10:00
  • 5d3360e63b added quantity total #1666 Matthias 2021-06-17 00:23:08 +02:00
  • dac112d908 added footer total for price Matthias 2021-06-17 00:22:32 +02:00
  • 2fc185bd71 show footer Matthias 2021-06-16 23:57:33 +02:00
  • 70e0933336 total price column as per #1660 Matthias 2021-06-16 23:52:00 +02:00
  • 70f3c03b64 Merge remote-tracking branch 'upstream/l10_crowdin' into l10 Oliver Walters 2021-06-17 00:37:50 +10:00
  • 4703fdf1b3 Merge remote-tracking branch 'upstream/master' Oliver Walters 2021-06-17 00:34:29 +10:00
  • 0781ad525e Fix: New translations django.po from Crowdin #1654 Oliver 2021-06-17 00:02:35 +10:00
  • f44959b9a8 Fix: New translations django.po from Crowdin Oliver 2021-06-17 00:02:34 +10:00
  • 626019323b Fix: New translations django.po from Crowdin Oliver 2021-06-17 00:02:31 +10:00
  • 1f10ab699f Fix: New translations django.po from Crowdin Oliver 2021-06-17 00:02:29 +10:00
  • e01a3b7c5f Fix: New translations django.po from Crowdin Oliver 2021-06-17 00:02:27 +10:00
  • dcb2078572 Fix: New translations django.po from Crowdin Oliver 2021-06-17 00:02:25 +10:00
  • 10a0eb8d70 Fix: New translations django.po from Crowdin Oliver 2021-06-17 00:02:23 +10:00
  • 2f9f9bd99c Fix: New translations django.po from Crowdin Oliver 2021-06-17 00:02:21 +10:00
  • d5014bb08a Fix: New translations django.po from Crowdin Oliver 2021-06-17 00:02:19 +10:00
  • 21ccf7c4a1 updated translation base github-actions[bot] 2021-06-16 13:55:59 +00:00
  • 9386332de1 Update version.py Oliver 2021-06-16 23:54:42 +10:00
  • a0a1ff6837 updated translation base github-actions[bot] 2021-06-16 13:54:22 +00:00
  • 731ea0238e Update version.py 0.2.3 Oliver 2021-06-16 23:53:58 +10:00
  • b2247b3830 Merge pull request #1664 from SchrodingersGat/docker-production Oliver 2021-06-16 23:52:52 +10:00
  • 8e9bf2aadd Fix typo in docker-compose.yml #1664 Oliver Walters 2021-06-16 23:31:36 +10:00
  • 513449e13c Whoops, missed one Oliver Walters 2021-06-16 23:03:38 +10:00
  • 725d26d76f Fix default paths in InvenTree settings Oliver Walters 2021-06-16 23:03:09 +10:00
  • d85b906560 Fix comment in docker-compose.yml file Oliver Walters 2021-06-16 22:57:31 +10:00
  • 7dd63b36da Simplify dockerfile / docker-compose Oliver Walters 2021-06-16 22:36:05 +10:00
  • acd7322ff0 Files under /media require session to be authenticated Oliver Walters 2021-06-16 21:30:25 +10:00
  • 058fc57ff1 Serve media files via nginx Oliver Walters 2021-06-16 20:57:24 +10:00
  • 0821ead024 Only provide static redirects if in DEBUG mode Oliver Walters 2021-06-15 23:51:37 +10:00
  • 632ea593fe Fix default port association Oliver Walters 2021-06-15 23:40:50 +10:00
  • 8bfdb0bec6 Comment fix Oliver Walters 2021-06-15 23:19:50 +10:00
  • 01328075ea All "development" related stuff now goes under ./dev Oliver Walters 2021-06-15 23:05:03 +10:00
  • b8df6038fb Fix: New translations django.po from Crowdin Oliver 2021-06-15 07:34:13 +10:00
  • d2661ed5c2 Fix: New translations django.po from Crowdin Oliver 2021-06-15 07:34:12 +10:00
  • cacb3d5f3c Fix: New translations django.po from Crowdin Oliver 2021-06-15 07:34:11 +10:00
  • f0769d3298 Fix: New translations django.po from Crowdin Oliver 2021-06-15 07:34:09 +10:00
  • c1499a7748 Fix: New translations django.po from Crowdin Oliver 2021-06-15 07:34:08 +10:00
  • e2b529743a Fix: New translations django.po from Crowdin Oliver 2021-06-15 07:34:07 +10:00
  • 71cf41e7cd Fix: New translations django.po from Crowdin Oliver 2021-06-15 07:34:05 +10:00
  • 27a5d6843f Fix: New translations django.po from Crowdin Oliver 2021-06-15 07:34:04 +10:00
  • 36a3ed563f Fix: New translations django.po from Crowdin Oliver 2021-06-15 07:34:03 +10:00
  • aa4cfc4c53 updated translation base github-actions[bot] 2021-06-14 21:21:17 +00:00
  • 8da00c6106 Merge pull request #1662 from eeintech/fix-1661 Oliver 2021-06-15 07:20:03 +10:00
  • 08fbdf660b Fix for #1661 #1662 eeintech 2021-06-14 14:19:10 -04:00
  • ed34a85b14 Merge remote-tracking branch 'upstream/master' Oliver Walters 2021-06-14 21:49:55 +10:00
  • a9636b7ec5 updated translation base github-actions[bot] 2021-06-14 11:41:16 +00:00
  • 8e6691ce36 Merge pull request #1658 from matmair/fix-whitespace-paths Oliver 2021-06-14 21:39:51 +10:00
  • ec19d77523 fix whitespaces in paths #1658 Matthias 2021-06-13 20:08:42 +02:00
  • f03dfa8131 Fix: New translations django.po from Crowdin Oliver 2021-06-14 00:47:23 +10:00
  • 3e11fc3437 Fix: New translations django.po from Crowdin Oliver 2021-06-13 23:49:06 +10:00
  • 447a7dd4e4 style fix Matthias 2021-06-13 15:04:57 +02:00
  • 3f04a57452 added test for internal prices Matthias 2021-06-13 15:01:03 +02:00
  • 3fb95bea7e added test for sell price breaks Matthias 2021-06-13 13:31:31 +02:00
  • 8b6dceb599 Fix: New translations django.po from Crowdin Oliver 2021-06-12 08:09:58 +10:00
  • 0f30d9961a Fix: New translations django.po from Crowdin Oliver 2021-06-12 08:09:57 +10:00
  • 8001a1a794 Fix: New translations django.po from Crowdin Oliver 2021-06-12 08:09:56 +10:00
  • 9e70674700 Fix: New translations django.po from Crowdin Oliver 2021-06-12 08:09:54 +10:00
  • 0dae3a1057 Fix: New translations django.po from Crowdin Oliver 2021-06-12 08:09:53 +10:00
  • 08d3058ad7 Fix: New translations django.po from Crowdin Oliver 2021-06-12 08:09:52 +10:00
  • 3be1f99380 Fix: New translations django.po from Crowdin Oliver 2021-06-12 08:09:51 +10:00
  • 26c682f016 Fix: New translations django.po from Crowdin Oliver 2021-06-12 08:09:50 +10:00
  • c519578a21 Fix: New translations django.po from Crowdin Oliver 2021-06-12 08:09:49 +10:00
  • e0c5ef3f04 updated translation base github-actions[bot] 2021-06-11 22:02:48 +00:00
  • 2e1db9d0bc Merge pull request #1653 from matmair/display-serial Oliver 2021-06-12 08:01:34 +10:00
  • c0e50128dd display latest serial on all part-views #1648 #1653 Matthias 2021-06-11 23:43:23 +02:00
  • 1e10f0e373 updated translation base github-actions[bot] 2021-06-10 22:16:57 +00:00
  • deb8f0df2a Merge pull request #1652 from inventree/dependabot/pip/django-3.2.4 Oliver 2021-06-11 08:15:41 +10:00
  • 0bc190bca5 Build(deps): Bump django from 3.2.2 to 3.2.4 #1652 dependabot[bot] 2021-06-10 17:36:17 +00:00
  • 9b30dc71b8 updated translation base github-actions[bot] 2021-06-10 01:07:39 +00:00
  • 3a91156b01 Merge pull request #1651 from inventree/dependabot/pip/django-3.2.2 Oliver 2021-06-10 11:05:47 +10:00
  • 6e2abc4cde Build(deps): Bump django from 3.2.1 to 3.2.2 #1651 dependabot[bot] 2021-06-09 17:26:23 +00:00
  • f8e4a5ac2e test: improve coverage of new get_destination #1587 Nigel 2021-05-14 14:32:03 -06:00
  • cd07ea835d feat(purchase orders): show the preferred location for each PO Line Nigel 2021-05-14 13:17:31 -06:00
  • 481a056327 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 Oliver 2021-06-09 16:18:13 +10:00
  • fae90d19d5 Merge remote-tracking branch 'inventree/master' Oliver 2021-06-09 16:16:09 +10:00
  • adfbcf6055 updated translation base github-actions[bot] 2021-06-09 01:56:02 +00:00
  • 0076c0cec5 Merge pull request #1649 from SchrodingersGat/typo-fix Oliver 2021-06-09 11:54:50 +10:00
  • bde2902798 updated translation base github-actions[bot] 2021-06-09 01:48:18 +00:00
  • fb52115fe3 Merge pull request #1646 from inventree/dependabot/pip/pillow-8.2.0 Oliver 2021-06-09 11:47:03 +10:00
  • 0c14457598 Fix typo in getStockItemThumbnail #1649 Oliver 2021-06-09 11:16:37 +10:00
  • cd2fcdd436 Fix: New translations django.po from Crowdin #1639 Oliver 2021-06-09 10:23:03 +10:00
  • 96776fc9fe Fix: New translations django.po from Crowdin Oliver 2021-06-09 10:23:02 +10:00
  • a1b48428dd Fix: New translations django.po from Crowdin Oliver 2021-06-09 10:22:59 +10:00
  • 3e9014646f Fix: New translations django.po from Crowdin Oliver 2021-06-09 10:22:58 +10:00