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 Walters
|
1c3878829d
|
Merge remote-tracking branch 'inventree/master'
|
2020-05-04 09:39:19 +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 |
|
Oliver Walters
|
af6dd83f05
|
Rename .js files to .html
This is required so they are parsed by the translation engine
|
2020-05-02 22:13:14 +10:00 |
|
Oliver Walters
|
314b8fdbff
|
regenerate translation files
|
2020-05-02 22:08:25 +10:00 |
|
Oliver Walters
|
853ba825c0
|
Translation layer for bom.js
|
2020-05-02 22:07:24 +10:00 |
|
Oliver Walters
|
6c3dc2a25d
|
Translation layer for company.js
|
2020-05-02 22:01:40 +10:00 |
|
Oliver Walters
|
2c9b76575e
|
Add translation layer for order.js
|
2020-05-02 21:55:09 +10:00 |
|
Oliver Walters
|
23bd9afaf8
|
Add translation layer for build.js
|
2020-05-02 21:48:28 +10:00 |
|
Oliver Walters
|
24a816e9a2
|
More translations for part.js and stock.js
|
2020-05-02 21:43:07 +10:00 |
|
Oliver Walters
|
b1a642918c
|
Add translation layer for stock.js
|
2020-05-02 21:36:18 +10:00 |
|
Oliver Walters
|
9b1e387a8b
|
Translations for part.js
|
2020-05-02 21:27:45 +10:00 |
|
Oliver Walters
|
5160165669
|
Add endpoint for dynamic javascript files
|
2020-05-02 21:19:34 +10:00 |
|
Oliver Walters
|
fb0ebbb1e4
|
Merge remote-tracking branch 'inventree/master'
|
2020-05-02 21:05:00 +10:00 |
|
Oliver
|
e998098e4f
|
Merge pull request #775 from SchrodingersGat/sentry-integration
Add option for sentry.io integration
|
2020-05-02 21:04:07 +10:00 |
|
Oliver Walters
|
b1d33ef3bc
|
Add option for sentry.io integration
|
2020-05-02 20:58:29 +10:00 |
|
Oliver
|
873c03376a
|
Merge pull request #774 from SchrodingersGat/part-display
Part display
|
2020-05-02 20:32:33 +10:00 |
|
Oliver Walters
|
b39283a18f
|
Separate allocation counters
|
2020-05-02 20:29:20 +10:00 |
|
Oliver Walters
|
26f0338f1d
|
Auto-select a purchase order when ordering parts
|
2020-05-02 20:25:47 +10:00 |
|
Oliver Walters
|
0199760e1c
|
Bug fix
|
2020-05-02 20:10:12 +10:00 |
|
Oliver Walters
|
b89002a450
|
Add button to order a supplier part
|
2020-05-02 20:10:00 +10:00 |
|
Oliver Walters
|
937211288e
|
Merge remote-tracking branch 'inventree/master'
|
2020-05-02 17:30:08 +10:00 |
|
Oliver
|
0b2c6cfd70
|
Merge pull request #773 from SchrodingersGat/moar-speed-fix-plz
Reduce company list from 100 queries to 4 queries
|
2020-05-02 15:41:39 +10:00 |
|
Oliver Walters
|
6912899f41
|
Merge remote-tracking branch 'inventree/master'
|
2020-05-02 15:37:24 +10:00 |
|
Oliver Walters
|
b0f4475a83
|
Fixes
|
2020-05-02 15:36:48 +10:00 |
|
Oliver Walters
|
094ef38e27
|
Merge remote-tracking branch 'inventree/master'
|
2020-05-02 15:29:47 +10:00 |
|
Oliver Walters
|
a8e3a3f1ac
|
Reduce company list from 100 queries to 4 queries
|
2020-05-02 15:23:28 +10:00 |
|
Oliver
|
5f6599a950
|
Merge pull request #772 from SchrodingersGat/new-logo
New logo
|
2020-05-02 15:19:52 +10:00 |
|