2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-16 21:02:17 +00:00

Commit Graph

  • d5fb699016 Merge pull request #2226 from SchrodingersGat/navbar-fix Oliver 2021-11-01 12:42:29 +11:00
  • f607841601 Fix navbar spacing when "sticky-header" is enabled #2226 Oliver 2021-11-01 12:07:07 +11:00
  • ad0277a8c3 Merge branch 'master' into stock-item-forms Oliver 2021-11-01 12:00:40 +11:00
  • 94a86e52f8 Merge pull request #2224 from matmair/remove-breadrcumb-space Oliver 2021-11-01 11:57:21 +11:00
  • 05a86c863f Update page_base.html #2224 Matthias Mair 2021-11-01 01:38:21 +01:00
  • b64f0e1f54 Merge pull request #2222 from matmair/ui-navbar Oliver 2021-11-01 11:30:27 +11:00
  • 338e85ff52 remove breadcrub div where no breadcrumb Matthias 2021-11-01 01:09:08 +01:00
  • 9a346dd3e2 Revert "remove breadcrub div where no breadcrumb" #2222 Matthias 2021-11-01 01:07:13 +01:00
  • f137d06dd5 Merge branch 'inventree:master' into matmair/issue2201 Matthias Mair 2021-11-01 01:06:29 +01:00
  • d89cb0936c Merge branch 'inventree:master' into plugin-2037 Matthias Mair 2021-11-01 01:06:26 +01:00
  • c775d030f9 Merge branch 'inventree:master' into matmair/issue2181 Matthias Mair 2021-11-01 01:06:18 +01:00
  • 67debc3a7b Merge pull request #2223 from matmair/ui-settings-header Oliver 2021-11-01 11:06:07 +11:00
  • 481a1088ee fix adapters to use OTP Matthias 2021-11-01 01:05:29 +01:00
  • 9d68d6bdca added setting to anable MFA Matthias 2021-11-01 00:34:00 +01:00
  • a8e18a7972 handle modelnames / permissions with underscores Matthias 2021-11-01 00:24:57 +01:00
  • fc566621b7 add rulesets Matthias 2021-11-01 00:24:21 +01:00
  • b7d6ca12e8 PEP fixes Matthias 2021-11-01 00:16:30 +01:00
  • 8da2865299 setting sidebar header different color to items #2223 Matthias 2021-11-01 00:11:01 +01:00
  • 62aa014f6b add button for navbar toogle Matthias 2021-11-01 00:09:38 +01:00
  • 2c9b03944f remove breadcrub div where no breadcrumb Matthias 2021-11-01 00:08:39 +01:00
  • f0a558c1e2 remove unneeded spacing Matthias 2021-11-01 00:06:08 +01:00
  • b5fb67ee76 Merge branch 'matmair/issue2201' of https://github.com/matmair/InvenTree into matmair/issue2201 Matthias 2021-10-31 23:42:40 +01:00
  • d8fb6d44ec adds faktors to user settings Matthias 2021-10-31 23:42:31 +01:00
  • 5de85d893c Merge pull request #2220 from SchrodingersGat/flex-wrap Oliver 2021-11-01 09:41:37 +11:00
  • 80e741fe1b Further improvements for filter elements #2220 Oliver 2021-11-01 09:21:42 +11:00
  • 1f537a50b2 Fix weird height issue for filter tag Oliver 2021-11-01 09:11:08 +11:00
  • 85da98a004 use auth screen to make more clear this is about security Matthias 2021-10-31 23:07:25 +01:00
  • 037f2a9438 Merge branch 'inventree:master' into matmair/issue2181 Matthias Mair 2021-10-31 23:04:55 +01:00
  • 0d836530e4 Merge branch 'inventree:master' into plugin-2037 Matthias Mair 2021-10-31 23:04:50 +01:00
  • c02a087044 Merge branch 'inventree:master' into matmair/issue2201 Matthias Mair 2021-10-31 23:04:40 +01:00
  • 360f0406b5 CSS updates Oliver 2021-11-01 08:38:24 +11:00
  • fd2a26c8fa Merge pull request #2219 from SchrodingersGat/submodule-fix Oliver 2021-11-01 08:36:12 +11:00
  • b8d6a2830e Remove submodule #2219 Oliver 2021-11-01 08:17:29 +11:00
  • 7719a07f19 remove data Matthias 2021-10-31 14:10:07 +01:00
  • 487bab5162 cleanup Matthias 2021-10-31 14:02:24 +01:00
  • 9fd66e9f22 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 Matthias 2021-10-31 13:56:14 +01:00
  • ec17bbcb95 mkaeuser setting tighter Matthias 2021-10-31 13:54:12 +01:00
  • 06822303bc refactor user settings Matthias 2021-10-31 13:42:41 +01:00
  • dd74cf19a7 fix middleware to not interupt flow Matthias 2021-10-31 13:42:27 +01:00
  • 60c2aab06d remove unused imports rocheparadox 2021-10-31 11:30:14 +05:30
  • 40da41959b Created part.tasks file and moved notify_low_stock function to the same from InvenTree.tasks. The argument type is changed from StockItem to Part rocheparadox 2021-10-31 11:26:41 +05:30
  • fca15a0439 added arbitrary args and arbitrary keyword args while executing a function synchronously from offload_task() in inventree.tasks rocheparadox 2021-10-31 11:21:06 +05:30
  • 9057462588 Merge pull request #2212 from matmair/matmair/issue2210 Oliver 2021-10-31 09:09:27 +11:00
  • b2dd3da518 Merge pull request #2215 from matmair/matmair/issue2213 Oliver 2021-10-31 09:05:26 +11:00
  • 199254dfe9 adjust navigation integration to new style Matthias 2021-10-30 22:35:47 +02:00
  • 0ae514e7be hide breadcrumb section Matthias 2021-10-30 22:15:21 +02:00
  • 13cc329dc6 remove unneeded headers Matthias 2021-10-30 22:14:57 +02:00
  • b31a1aa4cc fix plugin rendering in settings nav Matthias Mair 2021-10-30 18:10:56 +00:00
  • 584f53b85e Merge branch 'plugin-2037' of https://github.com/matmair/InvenTree into plugin-2037 Matthias 2021-10-30 18:23:14 +02:00
  • 703c8a31b1 Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 Matthias 2021-10-30 18:23:09 +02:00
  • 20a129f396 Merge branch 'inventree:master' into matmair/issue2181 Matthias Mair 2021-10-30 17:24:03 +02:00
  • 6ce10736af Merge branch 'inventree:master' into matmair/issue2210 #2212 Matthias Mair 2021-10-30 17:23:55 +02:00
  • 108f715ef6 Merge branch 'inventree:master' into matmair/issue2213 #2215 Matthias Mair 2021-10-30 17:23:51 +02:00
  • 6ec2801fce Facilitated translation for low stock notification subject moved the message/content of low stock notification to html template Facilitated translation in low stock notification html template file rocheparadox 2021-10-30 20:32:10 +05:30
  • 14680531f0 [BUG] Auth screens broken Fixes #2213 Matthias Mair 2021-10-30 14:05:40 +00:00
  • fe5cb3ddca Merge pull request #2214 from SchrodingersGat/sales-order-export-fix Oliver 2021-10-31 00:34:28 +11:00
  • 3423cb9d7c Merge pull request #2209 from matmair/test-branch Oliver 2021-10-31 00:06:11 +11:00
  • a151a68e58 convert sale_price to string before exporting #2214 Oliver 2021-10-31 00:05:20 +11:00
  • 361f4498df Fix broken tables removed by conflict Oliver 2021-10-30 23:51:59 +11:00
  • eaa315e726 Merge branch 'master' into partial-shipment Oliver 2021-10-30 23:44:06 +11:00
  • 6af866557d fixes missing wraping on iPdas and iPhones Fixes #2210 Matthias Mair 2021-10-30 12:34:31 +00:00
  • ceb457a837 Update README.md #2209 Matthias Mair 2021-10-30 14:16:11 +02:00
  • 2a58ad97dc Merge pull request #2206 from matmair/gitpod Oliver 2021-10-30 23:06:40 +11:00
  • 2bbeab38ff Merge pull request #2205 from SchrodingersGat/bootstrap-5 Oliver 2021-10-30 23:03:12 +11:00
  • 75c8faa09f Tweaks #2205 Oliver 2021-10-30 22:30:04 +11:00
  • 638c9d4007 Enable bootstrap-5 theme for select2 Oliver 2021-10-30 22:16:40 +11:00
  • 2830fc3c7f Fixes Oliver 2021-10-30 14:11:03 +11:00
  • e0cd02ee60 added dispatch_uid to post_save signal of StockItem rocheparadox 2021-10-30 08:30:39 +05:30
  • 83309fd054 Fixed the order of fixtures installation for testing rocheparadox 2021-10-30 08:16:42 +05:30
  • f2207cc6f8 Merge remote-tracking branch 'upstream/master' rocheparadox 2021-10-30 08:14:53 +05:30
  • 29c913b553 Improvements for stock item test result table Oliver 2021-10-30 13:31:13 +11:00
  • 79434bb4e0 Handle missing report template Oliver 2021-10-30 13:28:08 +11:00
  • a689b77cfb More tweaks Oliver 2021-10-30 13:18:11 +11:00
  • eb18ad6c4c Merge pull request #2164 from nwns/feature/postgrestimeouts Oliver 2021-10-30 13:14:13 +11:00
  • c4c533bee0 JS linting Oliver 2021-10-30 13:03:52 +11:00
  • c2a8cfd183 PEP style fixes Oliver 2021-10-30 12:57:49 +11:00
  • 8e1d9c281a Adds tree view for stock locations Oliver 2021-10-30 12:53:25 +11:00
  • be23634c5d Refactor display toggle for part list and part category list Oliver 2021-10-30 12:45:07 +11:00
  • 6a21541566 get inventree-data at startup (#26) #2206 Matthias Mair 2021-10-30 01:27:31 +02:00
  • cab1b0dc46 Update .gitpod.yml Matthias Mair 2021-10-30 00:22:43 +02:00
  • 6e1c42374c Merge branch 'master' into gitpod Matthias Mair 2021-10-30 00:12:47 +02:00
  • cbb6d466cc download data before migrating Matthias Mair 2021-10-29 22:11:53 +00:00
  • 2246633628 Gitpod (#24) Matthias Mair 2021-10-30 00:03:34 +02:00
  • 19980bda5e Merge branch 'master' into gitpod Matthias Mair 2021-10-30 00:03:26 +02:00
  • c58de2ef19 Merge branch 'gitpod' of https://github.com/matmair/InvenTree into gitpod Matthias Mair 2021-10-29 22:02:22 +00:00
  • 9fa0680b97 for deletion in script Matthias Mair 2021-10-29 22:02:18 +00:00
  • d17a48c9d3 do not block in execution Matthias Mair 2021-10-29 22:01:55 +00:00
  • 3bd59728db CSS tweaks Oliver 2021-10-30 08:59:40 +11:00
  • 83b74b2566 Gitpod (#23) Matthias Mair 2021-10-29 18:23:27 +02:00
  • fee22be0e0 Merge branch 'master' into gitpod Matthias Mair 2021-10-29 18:23:19 +02:00
  • 6efd8cadcd switch execution flow Matthias Mair 2021-10-29 16:20:37 +00:00
  • 62ffffea9b remove check - might block PRs Matthias Mair 2021-10-29 16:17:18 +00:00
  • 079119e8c0 add dataset import Matthias Mair 2021-10-29 16:17:02 +00:00
  • 59951a12e2 Gitpod (#22) Matthias Mair 2021-10-29 18:05:25 +02:00
  • c35eeca19d Update .gitpod.yml Matthias Mair 2021-10-29 18:02:49 +02:00
  • fcc1e9fe8f Fixes Oliver 2021-10-30 01:00:37 +11:00
  • 4eea8c8193 Remove old tree classes Oliver 2021-10-30 00:18:41 +11:00
  • a792903a79 Catch sidebar error Oliver 2021-10-30 00:15:19 +11:00
  • a15cc1f3ba linting fixes Oliver 2021-10-30 00:07:51 +11:00
  • 57240865e8 More tweaking Oliver 2021-10-30 00:05:32 +11:00