inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 20:46:08 +00:00
Code Activity
5,156 Commits 9 Branches 164 Tags
ec6affa9c778868edddf906c827122b7ef04ab32
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub fbdcefba12 New Crowdin updates (#1570) 
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
 2021-05-11 08:39:53 +10:00
OliverandGitHub 765ecc443c New Crowdin updates (#1568) 
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
 2021-05-10 15:33:17 +10:00
OliverandGitHub 0f6515d400 New Crowdin updates (#1552) 
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
 2021-05-06 15:26:44 +10:00
OliverandGitHub 224d9c03d0 New Crowdin updates (#1551) 
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
 2021-05-06 11:39:34 +10:00
Oliver Walters e83b62bd55 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
 2021-05-06 09:06:00 +10:00
Oliver a7ca1f4296 Fix: New translations django.po from Crowdin 2021-05-05 18:08:32 +10:00
Oliver ce0b33e27e Fix: New translations django.po from Crowdin 2021-05-05 10:08:04 +10:00
OliverandGitHub d42506becb Merge pull request #1541 from inventree/l10_crowdin 
New Crowdin updates
 2021-05-05 08:49:45 +10:00
Oliver ac78bb3acf Fix: New translations django.po from Crowdin 2021-05-05 05:47:36 +10:00
Oliver cf9624c94e Fix: New translations django.po from Crowdin 2021-05-04 19:36:58 +10:00
OliverandGitHub a2983370a1 Merge pull request #1534 from inventree/l10n_l10 
New Crowdin updates
 2021-04-30 20:55:10 +10:00
Oliver Walters c56261746d Merge remote-tracking branch 'inventree/l10' into l10n_l10 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
 2021-04-30 20:26:14 +10:00
Oliver e650e6dc7b Fix: New translations django.po from Crowdin 2021-04-30 16:09:15 +10:00
Oliver 0bdd98cae7 Fix: New translations django.po from Crowdin 2021-04-30 01:08:21 +10:00
Oliver Walters d0ea535cd0 Adds a commit message 2021-04-26 20:36:55 +10:00
OliverandGitHub 12954f885c Merge pull request #1507 from SchrodingersGat/report-permissions 
Allow 'admin' account access to the report models
 2021-04-22 17:20:54 +10:00
Oliver Walters 4a522bb05a Allow 'admin' account access to the report models 2021-04-22 14:53:42 +10:00
OliverandGitHub 022219e3cf Merge pull request #1506 from SchrodingersGat/docker-compose-fixes 
docker-compose improvements
 2021-04-22 13:34:51 +10:00
Oliver Walters 0c572486ba Revert volume path 2021-04-22 12:49:11 +10:00
Oliver Walters 52deb20e85 docker-compose improvements 
- Prepend "inventree" to the name of each container
- Explicitly expose more env variables required for InvenTree db lookup
- Adjust server name in nginx-conf file
 2021-04-22 12:15:25 +10:00
OliverandGitHub 99060159e3 Merge pull request #1495 from matmair/feature/performance-op 
performance improvments docker
 2021-04-22 08:53:00 +10:00
OliverandGitHub c5b6e22a58 Merge pull request #1505 from eeintech/email_reset 
Enabled default email sender setting
 2021-04-22 08:50:05 +10:00
OliverandGitHub 34341c31f2 Merge pull request #1504 from SchrodingersGat/turkish 
Added skeleton for Turkish translation
 2021-04-22 08:46:31 +10:00
OliverandGitHub 6259d73583 Merge pull request #1503 from matmair/l10n_trans 
added german translations
 2021-04-22 08:46:15 +10:00
Oliver Walters d9cf721589 Added skeleton for Turkish translation 2021-04-21 22:36:57 +10:00
OliverandGitHub 8d8ef22b8d Update README.md 
Typo fix
 2021-04-21 22:19:05 +10:00
OliverandGitHub 2583ab12ae Update README.md 2021-04-21 22:04:46 +10:00
Oliver ae51b1d9ee Update Crowdin configuration file 2021-04-21 20:41:39 +10:00
Oliver 4b069f83bf Update Crowdin configuration file 2021-04-21 20:39:51 +10:00
Oliver 53f2060c40 Update Crowdin configuration file 2021-04-21 20:27:44 +10:00
OliverandGitHub 2d59c0a119 Merge pull request #1499 from SchrodingersGat/ci-fixes 
Change file just to re-run CI
 2021-04-21 17:51:22 +10:00
Oliver Walters 3e63334125 Change file just to re-run CI 2021-04-21 17:34:56 +10:00
OliverandGitHub cfddaadccf Merge pull request #1492 from SchrodingersGat/build-order-simplification 
Build order simplification
 2021-04-21 17:29:24 +10:00
Oliver Walters c0ab2d1da9 Unit test fixes 2021-04-21 17:16:07 +10:00
Oliver Walters 59341397ba Fixes 2021-04-21 16:44:18 +10:00
Oliver Walters 9b763ca715 Adds ability to specify "status" of a build output at time of completion 2021-04-21 16:44:18 +10:00
Oliver Walters 0722aea58a Further fixes for unit tests 2021-04-21 16:44:18 +10:00
Oliver Walters debc086f89 Unit test improvements 2021-04-21 16:44:17 +10:00
Oliver Walters 715d912137 Bug fixes 2021-04-21 16:44:17 +10:00
Oliver Walters 5a44a50f3b Fix date in build table 2021-04-21 16:44:17 +10:00
Oliver Walters 76e2b67f36 Fix logic for completing builds 
- Display better messages to the user, too
 2021-04-21 16:44:17 +10:00
Oliver Walters 4420557863 Refactor various functions for assessing build allocation 2021-04-21 16:44:17 +10:00
Oliver Walters 05e2b62305 Bug fix - calculate button PK at run time!! 2021-04-21 16:44:17 +10:00
Oliver Walters 16b01ed772 significant rework of the build allocation tables / views 2021-04-21 16:44:16 +10:00
Oliver Walters f0595cc052 Fix for display of "outstanding" allocations 2021-04-21 16:44:16 +10:00
Oliver Walters 9e470d4064 Add separate section for "untracked" part allocation 2021-04-21 16:44:16 +10:00
OliverandGitHub 852cc9c4fa Merge pull request #1498 from SchrodingersGat/new-locales 
Add some new (empty) locale translation entries
 2021-04-21 13:27:52 +10:00
Oliver Walters 64c29d73cc gettext required for translation 2021-04-21 13:11:57 +10:00
Oliver Walters 043d929dbb Fix proper good 2021-04-21 12:57:54 +10:00
Oliver Walters 096403b429 CI file fixes 2021-04-21 12:37:20 +10:00
Oliver Walters a1e835e01b Add some new (empty) locale translation entries 
- fr
- it
- ja
- pl
- ru
- zh

Also fixes the `invoke translate` command (maybe it was changed with the recent update to Django 3.2?)

The CI pipeline now runs the translation and static collection steps, to check those for errors.
 2021-04-21 12:33:56 +10:00
OliverandGitHub 45d23bd606 Merge pull request #1497 from SchrodingersGat/docker-push 
Changes to docker workflow
 2021-04-21 11:27:45 +10:00
Oliver Walters b20c832702 Changes to docker workflow 2021-04-21 11:13:37 +10:00
OliverandGitHub 4903826be1 Merge pull request #1494 from matmair/feature/js_translation 
Translating JS-Files once
 2021-04-20 22:58:43 +10:00
OliverandGitHub 9addad9b46 Merge pull request #1493 from SchrodingersGat/multi-location-print 
Split "part category" view into separate pages
 2021-04-20 21:10:46 +10:00
Oliver Walters 4d1eb51bc4 Fixes 2021-04-20 20:42:55 +10:00
Oliver Walters 2bb86ff22b Adds missing template file 2021-04-20 20:20:00 +10:00
Oliver Walters fd3e59650a Style fixes 2021-04-20 20:15:51 +10:00
Oliver Walters c5fa0bb459 Improved API filtering for PartCategory 2021-04-20 20:15:06 +10:00
Oliver Walters 38eea21f4f Enable printing of multiple stock location labels 2021-04-20 20:06:13 +10:00
Oliver Walters 412b05d76c Allow API filtering by "cascading" stock locations 2021-04-20 20:00:15 +10:00
Oliver Walters 6986709fb8 Reorganized stock location view 2021-04-20 19:49:07 +10:00
Oliver Walters f578f68001 Split "part category" view into separate pages 2021-04-20 19:30:43 +10:00
OliverandGitHub 21708dabaf Merge pull request #1490 from SchrodingersGat/django-3.2 
Update to django 3.2
 2021-04-20 11:25:25 +10:00
Oliver Walters 0fbf39f1bc More fixes 2021-04-20 10:59:28 +10:00
Oliver Walters 6b9145ae56 Fixes required for v3.2 compatibility 
- Specify DEFAULT_AUTO_FIELD
- Specify output_field for annotations
 2021-04-20 09:14:08 +10:00
Oliver Walters 12f1fb9526 Update to django 3.2 2021-04-20 08:15:43 +10:00
OliverandGitHub 6c159e91cc Merge pull request #1489 from eeintech/stock_fixes 
Stock return to customer fix
 2021-04-20 07:38:32 +10:00
OliverandGitHub 5f04802ead Merge pull request #1487 from inventree/dependabot/pip/django-3.1.8 
Bump django from 3.1.7 to 3.1.8
 2021-04-19 21:11:08 +10:00
OliverandGitHub ebf3f6f542 Merge pull request #1488 from SchrodingersGat/suppress-warning 
Do not print EMAIL warning if in TEST mode
 2021-04-19 21:10:49 +10:00
Oliver Walters 252abb920f Do not print EMAIL warning if in TEST mode 2021-04-19 20:49:24 +10:00
OliverandGitHub afca4f244d Merge pull request #1422 from SchrodingersGat/django-latest-version 
Update requirements
 2021-04-19 20:47:57 +10:00
Oliver Walters 98be42846c Update requirements 2021-04-19 12:21:43 +10:00
OliverandGitHub 157d58b157 Merge pull request #1481 from matmair/instance-name-in-title 
Instance name in title
 2021-04-18 21:48:37 +10:00
OliverandGitHub 3bb0f7dde0 Merge pull request #1480 from SchrodingersGat/docker-build-fix 
Fix directory
 2021-04-18 20:24:16 +10:00
OliverandGitHub 26c19dc77d Merge pull request #1479 from matmair/feature/translations 
Feature/translations
 2021-04-18 20:23:51 +10:00
Oliver Walters e057d6d161 Fix directory 2021-04-18 20:00:03 +10:00
OliverandGitHub 724ecebb4c Update version.py 2021-04-18 19:54:16 +10:00
OliverandGitHub 0b5557395b Update version.py 2021-04-18 19:53:15 +10:00
OliverandGitHub 6c410521a1 Merge pull request #1476 from SchrodingersGat/docker-improvements 
Cleanup docker files
 2021-04-18 19:52:42 +10:00
Oliver Walters 9d88d38bf8 Enforce line-endings for more file types 2021-04-18 19:39:03 +10:00
Oliver Walters 4531030551 Fix line endings 2021-04-18 19:37:11 +10:00
Oliver Walters aced0e73c7 compose file cleanup 2021-04-18 18:58:00 +10:00
Oliver Walters 61eba2f7fc Typo fix 2021-04-18 18:54:21 +10:00
Oliver Walters 0926992b4f Updated nginx conf 2021-04-18 18:53:30 +10:00
Oliver Walters d8e1e18f4d change web -> inventree 2021-04-18 17:21:06 +10:00
OliverandGitHub b7247284a6 Merge pull request #1478 from SchrodingersGat/log-fix 
Remove log output which was leaking password into the logs
 2021-04-18 17:20:43 +10:00
Oliver Walters 1502a07b81 Remove log output which was leaking password into the logs 2021-04-18 16:54:35 +10:00
Oliver Walters eb108edb60 Adds entrypoint for starting a development server 2021-04-18 16:26:32 +10:00
Oliver Walters 270c0ea85d Cleanup docker files 2021-04-18 15:24:33 +10:00
OliverandGitHub 83002a5d51 Merge pull request #1475 from SchrodingersGat/docker-fixes 
Add binaries for database dumping
 2021-04-18 15:23:55 +10:00
Oliver Walters 9eb559bec5 More install fixes 2021-04-18 15:09:01 +10:00
Oliver Walters 69473b9bff Fix install 
Also make the web port configurable
 2021-04-18 15:05:52 +10:00
Oliver Walters c07aef7f75 Remove commented line 2021-04-18 14:58:02 +10:00
Oliver Walters cbb94d2ff7 sqlite3 -> sqlite 2021-04-18 14:57:25 +10:00
Oliver Walters 75054f870e Fix 2021-04-18 14:50:22 +10:00
Oliver Walters 124db01b63 Add binaries for database dumping 2021-04-18 14:45:41 +10:00
OliverandGitHub 2be78f5d4c Merge pull request #1469 from eeintech/stock_item_template_fix 
Fixed stock item template for items without manufacturer part
 2021-04-17 08:05:21 +10:00
OliverandGitHub d3da262687 Merge pull request #1470 from eeintech/hide_system_alert_nostaff 
Hide system alert for non-staff users
 2021-04-17 08:04:45 +10:00
OliverandGitHub d4529ec1c4 Merge pull request #1464 from matmair/translation_improv 
Translation improvments
 2021-04-16 21:46:07 +10:00