Oliver
|
18fbe2d2dd
|
Merge pull request #798 from SchrodingersGat/transa
Typo fix
|
2020-05-12 07:11:20 +10:00 |
|
Oliver Walters
|
ac5e26ca0e
|
Typo fix
|
2020-05-12 07:07:29 +10:00 |
|
Oliver
|
d2a7961895
|
Merge pull request #795 from SchrodingersGat/attachment-api
Attachment api
|
2020-05-12 00:10:13 +10:00 |
|
Oliver
|
65fe6bfaca
|
Merge pull request #796 from SchrodingersGat/newer-icon
Newer icon
|
2020-05-12 00:09:42 +10:00 |
|
Oliver Walters
|
3151612962
|
PEP fix
|
2020-05-12 00:07:08 +10:00 |
|
Oliver Walters
|
693af04c11
|
Export large version of the logo
|
2020-05-12 00:06:26 +10:00 |
|
Oliver Walters
|
4b1d96faad
|
Icon tweaks
|
2020-05-12 00:01:56 +10:00 |
|
Oliver Walters
|
645e5b6449
|
Add "larger" version of the icon
|
2020-05-11 23:58:35 +10:00 |
|
Oliver Walters
|
99af98c5a7
|
Update iconset
|
2020-05-11 23:58:27 +10:00 |
|
Oliver Walters
|
cfc0145180
|
Add some unit tests
|
2020-05-11 23:44:22 +10:00 |
|
Oliver Walters
|
a7e5a79f4c
|
Expose salesorder and purchaseorder attachments to the API
|
2020-05-11 23:41:57 +10:00 |
|
Oliver Walters
|
17d0a015f2
|
Add API endpoint for StockItem attachment items
|
2020-05-11 23:32:40 +10:00 |
|
Oliver Walters
|
f36c5137dd
|
Add ability to add part file attachments via the API
|
2020-05-11 23:25:55 +10:00 |
|
Oliver
|
f71bfb5700
|
Update version.py
|
2020-05-07 10:08:37 +10:00 |
|
Oliver
|
00ccfdf11b
|
Update version.py
|
2020-05-07 10:08:20 +10:00 |
|
Oliver
|
5747a07f7b
|
Merge pull request #792 from SchrodingersGat/stock-item-attachment
Stock item attachment
|
2020-05-07 10:07:31 +10:00 |
|
Oliver Walters
|
003b384abd
|
Slight adjustment to page tabs for StockItem view
|
2020-05-07 10:04:16 +10:00 |
|
Oliver Walters
|
ea0d32fd3d
|
PEP fixes
|
2020-05-07 09:58:29 +10:00 |
|
Oliver Walters
|
14132a6efa
|
Add views / models / etc etc to support StockItem attachment
|
2020-05-07 09:57:54 +10:00 |
|
Oliver Walters
|
64f6238351
|
Add StockItemAttachment model
|
2020-05-07 09:39:28 +10:00 |
|
Oliver
|
e83a0610af
|
Merge pull request #790 from SchrodingersGat/secondary-dialog
Add "new manufacturer" button
|
2020-05-04 20:05:10 +10:00 |
|
Oliver Walters
|
6318b0bddf
|
Hide a silly button which does nothing
|
2020-05-04 19:51:06 +10:00 |
|
Oliver Walters
|
0933cf859c
|
Add "new manufacturer" button
|
2020-05-04 19:48:09 +10:00 |
|
Oliver
|
7afb2a6a75
|
Merge pull request #786 from SchrodingersGat/stats-fix
Table colspan fix
|
2020-05-04 10:01:05 +10:00 |
|
Oliver Walters
|
ec3e02af94
|
Table colspan fix
|
2020-05-04 09:52:50 +10:00 |
|
Oliver
|
9823c3c81b
|
Merge pull request #785 from SchrodingersGat/bug-icon
Update icon
|
2020-05-04 09:46:19 +10:00 |
|
Oliver Walters
|
ce610490b6
|
Update icon
- Simple test to see if the travis integration is working correctly now
|
2020-05-04 09:43:09 +10:00 |
|
Oliver
|
78cc3a9cf3
|
Merge pull request #783 from SchrodingersGat/redirect-tweaks
Redirect tweaks
|
2020-05-04 08:58:35 +10:00 |
|
Oliver Walters
|
436fb3bf30
|
PEP fixes
|
2020-05-04 08:54:16 +10:00 |
|
Oliver Walters
|
2c44104c9c
|
Small tweak for login redirect
|
2020-05-04 08:53:47 +10:00 |
|
Oliver
|
461d694cf8
|
Merge pull request #782 from andyseracuse/redirect-after-login
after a login redirect and a successful login, the user is now redirected to the originally desired url
|
2020-05-04 08:49:13 +10:00 |
|
Oliver
|
779c1e1d58
|
Merge pull request #780 from SchrodingersGat/rejected-stock
Rejected stock
|
2020-05-04 08:41:34 +10:00 |
|
Oliver Walters
|
5a100962fe
|
Merge remote-tracking branch 'inventree/master' into rejected-stock
# Conflicts:
# InvenTree/locale/de/LC_MESSAGES/django.po
# InvenTree/locale/en/LC_MESSAGES/django.po
# InvenTree/locale/es/LC_MESSAGES/django.po
|
2020-05-04 08:10:14 +10:00 |
|
Oliver
|
c505080527
|
Merge pull request #781 from chschlue/updloc2
Update de translation
|
2020-05-04 08:07:37 +10:00 |
|
Oliver Walters
|
53149ab4dc
|
Merge remote-tracking branch 'inventree/master' into rejected-stock
# Conflicts:
# InvenTree/locale/de/LC_MESSAGES/django.po
# InvenTree/locale/en/LC_MESSAGES/django.po
# InvenTree/locale/es/LC_MESSAGES/django.po
|
2020-05-04 08:06:50 +10:00 |
|
Andy Seracuse
|
85c948ef67
|
made changed middleware and made necessary changes to settings and urls fles so that the user is redirected to their desired page after a login redirect unless the desired page was logout, in which case the user will be redirect
|
2020-05-03 14:11:57 -06:00 |
|
Christian Schlüter
|
0a5a1ec5fd
|
Update de translation
|
2020-05-03 11:37:51 +02:00 |
|
Oliver Walters
|
54c903f637
|
translation updates
|
2020-05-03 09:51:59 +10:00 |
|
Oliver Walters
|
7430abc237
|
Add ability to set stock status when receiving goods
|
2020-05-03 09:50:00 +10:00 |
|
Oliver Walters
|
fe87bba577
|
Link fix for purchase order table
|
2020-05-03 09:46:42 +10:00 |
|
Oliver
|
ca1b9e6403
|
Merge pull request #778 from SchrodingersGat/dynamic-js
Update translations
|
2020-05-03 09:29:34 +10:00 |
|
Oliver Walters
|
29335fa665
|
Add "rejected" status code for StockItem
|
2020-05-03 09:09:17 +10:00 |
|
Oliver
|
45fc8ce6bd
|
Merge pull request #779 from SchrodingersGat/translation-helper
Translation helper
|
2020-05-03 09:03:06 +10:00 |
|
Oliver Walters
|
275cd063e1
|
PEP fixes
|
2020-05-03 08:59:44 +10:00 |
|
Oliver Walters
|
88e28edba9
|
Script now manually adjusts the translation file
|
2020-05-02 23:10:18 +10:00 |
|
Oliver Walters
|
979cf10c66
|
First pass at a translation helper script
|
2020-05-02 22:52:32 +10:00 |
|
Oliver Walters
|
034f70c491
|
Update translations
|
2020-05-02 22:39:56 +10:00 |
|
Oliver
|
9ee9664e65
|
Merge pull request #777 from SchrodingersGat/dynamic-js
Fix stock thing
|
2020-05-02 22:22:28 +10:00 |
|
Oliver Walters
|
d59f22febb
|
Fix stock thing
|
2020-05-02 22:18:08 +10:00 |
|
Oliver
|
1a4f5cf719
|
Merge pull request #776 from SchrodingersGat/dynamic-js
Add endpoint for dynamic javascript files
|
2020-05-02 22:16:35 +10:00 |
|