Matthias Mair
|
d1e1be4253
|
Merge branch 'inventree:master' into plugin-2037
|
2021-11-08 18:41:16 +01:00 |
|
Oliver
|
1520c296dd
|
Merge pull request #2270 from SchrodingersGat/navbar-fix
Fixes navbar menu positioning for smaller screens
|
2021-11-08 17:44:21 +11:00 |
|
Oliver
|
8fee117870
|
Merge pull request #2273 from SchrodingersGat/owner-filter
Adds search capability to "owner" API
|
2021-11-08 17:11:20 +11:00 |
|
Oliver
|
f1eaeef949
|
PEP fixes
|
2021-11-08 16:53:43 +11:00 |
|
Oliver
|
ca0619a482
|
Adds API filtering for the "user" list
|
2021-11-08 16:53:15 +11:00 |
|
Oliver
|
3d553cf7de
|
Adds search capability to "owner" API
- Currently a bit of a hack, but it works...
|
2021-11-08 16:49:15 +11:00 |
|
Oliver
|
2c889fbcff
|
Merge pull request #2272 from SchrodingersGat/convert-to-variant-fix
Convert to variant fix
|
2021-11-08 15:56:45 +11:00 |
|
Oliver
|
619c029d3d
|
Merge pull request #2271 from SchrodingersGat/stock-actions-fix
Fix missing actions for stock item
|
2021-11-08 15:10:46 +11:00 |
|
Oliver
|
cb075ed2c2
|
Fix logic for converting stock items to applicable variants
|
2021-11-08 15:10:41 +11:00 |
|
Oliver
|
64f5007d3a
|
Fix missing actions for stock item
(cherry picked from commit c128438ebf)
|
2021-11-08 14:50:03 +11:00 |
|
Oliver
|
c128438ebf
|
Fix missing actions for stock item
|
2021-11-08 14:47:14 +11:00 |
|
Oliver
|
bcc086657a
|
Merge pull request #2269 from SchrodingersGat/bo-form
Improvements for build order forms
|
2021-11-08 14:28:34 +11:00 |
|
Oliver
|
35cfa387d1
|
Fixes navbar menu positioning for smaller screens
|
2021-11-08 13:38:03 +11:00 |
|
Oliver
|
b2ae346343
|
Provide model-level default function option
|
2021-11-08 13:30:59 +11:00 |
|
Oliver
|
8d5c3ab18a
|
add extra icons for build order form
|
2021-11-08 13:10:33 +11:00 |
|
Oliver
|
9c2193a4cc
|
Merge pull request #2265 from matmair/matmair/issue2257
Matmair/issue2257
|
2021-11-08 11:10:53 +11:00 |
|
Oliver
|
a12baadc09
|
Merge pull request #2266 from SchrodingersGat/login-tweaks
Login tweaks
|
2021-11-08 10:19:23 +11:00 |
|
Oliver
|
96e8c499fc
|
Merge pull request #2262 from matmair/ui-tweaks
Small UI tweaks
|
2021-11-08 10:00:20 +11:00 |
|
Oliver
|
ac97edd18b
|
JS linting
|
2021-11-08 09:58:55 +11:00 |
|
Oliver
|
c9924470ad
|
Replace dialog messages with alerts
|
2021-11-08 09:44:45 +11:00 |
|
Oliver
|
ef75838ab8
|
Properly display notifications when logging in
|
2021-11-08 09:34:57 +11:00 |
|
Oliver
|
079c08ef7d
|
Tweaks to account screens css
|
2021-11-08 09:34:42 +11:00 |
|
|
|
87539c7aac
|
select for languages should be wide enough
|
2021-11-06 20:59:02 +00:00 |
|
|
|
30aa072537
|
fix message
|
2021-11-06 20:49:09 +00:00 |
|
|
|
45b7bc0c51
|
always show the current language
|
2021-11-06 20:41:52 +00:00 |
|
|
|
dccc832779
|
fix logic
|
2021-11-06 20:41:29 +00:00 |
|
|
|
cea466973a
|
Check if language has enough translations
Fixes #2257
|
2021-11-06 19:55:02 +00:00 |
|
|
|
857cdd5aea
|
Enlsigh is the base - always translated!
Fixes #2257
|
2021-11-06 17:41:11 +00:00 |
|
|
|
bbd723a176
|
fix QR code alingment
|
2021-11-06 15:11:31 +00:00 |
|
|
|
ad5ba96278
|
move toggler to the end
|
2021-11-06 15:07:01 +00:00 |
|
|
|
19a3568511
|
fix nav arranging on mobile
|
2021-11-06 15:02:40 +00:00 |
|
|
|
d604b2afff
|
make padding uniform
|
2021-11-06 14:44:46 +00:00 |
|
|
|
5550c89b9a
|
make padding uniform
|
2021-11-06 14:44:31 +00:00 |
|
Matthias Mair
|
0d36cb7c0d
|
Merge branch 'inventree:master' into plugin-2037
|
2021-11-06 15:44:01 +01:00 |
|
Matthias Mair
|
7cd04f289c
|
Merge branch 'inventree:master' into matmair/issue2201
|
2021-11-06 15:43:59 +01:00 |
|
Oliver
|
7ee5f6c71b
|
Merge pull request #2261 from SchrodingersGat/shadow
Adds a fancy shadow
|
2021-11-05 14:21:14 +11:00 |
|
Oliver
|
42155b2e05
|
Adds a fancy shadow
|
2021-11-05 13:51:26 +11:00 |
|
Oliver
|
174100ed6d
|
Merge pull request #2260 from SchrodingersGat/sales-order-reference-fix
Check if customer exists when rendering sales order template
|
2021-11-05 11:23:13 +11:00 |
|
Oliver
|
1743111613
|
Check if customer exists when rendering sales order template
Fixes https://github.com/inventree/InvenTree/issues/1742
|
2021-11-05 11:03:38 +11:00 |
|
Oliver
|
f970255066
|
Merge pull request #2259 from SchrodingersGat/dialog-escapes
Allow escape key on barcode modal
|
2021-11-05 10:58:57 +11:00 |
|
Oliver
|
cb990af3a9
|
Merge pull request #2258 from SchrodingersGat/typo-fix
Typo fix
|
2021-11-05 10:43:49 +11:00 |
|
Oliver
|
1f1cf9f9e4
|
Allow escape key on barcode modal
|
2021-11-05 10:39:03 +11:00 |
|
Oliver
|
bf4de526ac
|
Typo fix
|
2021-11-05 10:20:47 +11:00 |
|
Matthias
|
df72cb2608
|
merge upstream
|
2021-11-04 23:44:41 +01:00 |
|
Matthias Mair
|
f5fa64d9a9
|
Merge branch 'inventree:master' into plugin-2037
|
2021-11-04 23:42:07 +01:00 |
|
Oliver
|
46fc1e19d5
|
Merge pull request #2254 from SchrodingersGat/docker-stable
Target production docker-compose script to inventree:stable
|
2021-11-05 08:15:49 +11:00 |
|
Oliver
|
ab3acc4601
|
Target production docker-compose script to inventree:stable
|
2021-11-05 07:52:15 +11:00 |
|
Oliver
|
083967b156
|
Merge pull request #2198 from SchrodingersGat/stock-item-forms
Stock item forms
|
2021-11-05 07:37:33 +11:00 |
|
Matthias
|
f49800d5b8
|
make attr - test safer
|
2021-11-04 14:54:15 +01:00 |
|
Oliver
|
185924e1f8
|
More linting
|
2021-11-05 00:35:47 +11:00 |
|
