Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code structure refactor #5582

Merged
merged 105 commits into from
Apr 3, 2024
Merged
Changes from 1 commit
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
2684b7b
moved docker files to /contrib/container
matmair Sep 21, 2023
b82c638
changed code owners to make more precise
matmair Sep 21, 2023
590cc4a
updated CI to use new subdirs
matmair Sep 21, 2023
f3a67a7
added manual trigger for testing
matmair Sep 21, 2023
36dee59
moved ci files
matmair Sep 21, 2023
c204e74
moved assets into subdir
matmair Sep 21, 2023
3039cc5
moved deploy template file to contrib
matmair Sep 21, 2023
e603f06
moved django files to src/backend
matmair Sep 21, 2023
92e9270
updated paths in scripts etc
matmair Sep 21, 2023
08f110a
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Sep 27, 2023
b948110
updated reqs path
matmair Sep 27, 2023
c41bd25
fixed version file path
matmair Sep 27, 2023
8932a19
fixed flake8 path
matmair Sep 27, 2023
a38caa8
fixed path to node ressources
matmair Sep 28, 2023
ecb9711
fixed task paths
matmair Sep 28, 2023
6417f01
added dep path for node
matmair Sep 28, 2023
9eddc6f
removed unused yarn lockfile
matmair Sep 28, 2023
8ff63c4
removed unused ci script
matmair Sep 28, 2023
c523a3c
updated internal backend paths for tasks
matmair Sep 28, 2023
b2c069c
updated translation stats path
matmair Sep 28, 2023
5a77615
fixed source path for coverage
matmair Sep 28, 2023
d527443
fixed main commit repo path
matmair Sep 28, 2023
211b644
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Sep 28, 2023
62de738
[FR] Restructure code
matmair Oct 3, 2023
6df2aec
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Oct 4, 2023
25c718a
[FR] Restructure code
matmair Oct 11, 2023
0cb0f03
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Oct 16, 2023
f5592b3
fit in changes from testing
matmair Oct 16, 2023
40a6e7e
gather packager improvements (#149)
matmair Oct 16, 2023
66ea021
Added docs for file structure
matmair Oct 16, 2023
c406875
Merge branch 'matmair/issue5578' of https://github.com/matmair/InvenT…
matmair Oct 16, 2023
968fb94
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Oct 26, 2023
f492e8e
Fixed style errors
matmair Oct 26, 2023
23fad6d
updated deepsource paths
matmair Oct 26, 2023
23be254
fix deepsource paths
matmair Oct 26, 2023
3006d3e
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Nov 4, 2023
35f31cd
fixed reqs
matmair Nov 4, 2023
ef9b45a
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Nov 29, 2023
f6d8588
[FR] Restructure code
matmair Dec 16, 2023
a004fdd
merge fixes
matmair Dec 16, 2023
27d8606
move newly added dirs too
matmair Dec 16, 2023
53f2c10
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Dec 16, 2023
e8131ad
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 1, 2024
c1ba7a8
fix reqs files
matmair Jan 1, 2024
9d0bfd5
another dep fix
matmair Jan 1, 2024
584aa36
merge upstream/master
matmair Jan 10, 2024
ccbb3ca
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 10, 2024
4dc8309
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 11, 2024
fdb72bd
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 14, 2024
23cd6be
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 15, 2024
af8b86a
revert removal of tags
matmair Jan 15, 2024
fb918cf
merge upstream
matmair Jan 17, 2024
53d7ba0
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 17, 2024
4859d43
enabled detection of old config files
matmair Jan 17, 2024
897c73e
adapt coverage src
matmair Jan 17, 2024
773431f
also detect and support old location for plugins.txt
matmair Jan 17, 2024
1e52c07
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 17, 2024
5f58030
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 24, 2024
9aeb641
style fix
matmair Jan 24, 2024
c48995f
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 31, 2024
a2dc63a
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Feb 9, 2024
b4c1ef4
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Feb 13, 2024
da7c161
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Feb 28, 2024
59db188
fix ~/init.sh location
matmair Mar 15, 2024
21f7e34
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Mar 16, 2024
e3c9423
Merge branch 'matmair/issue5578' of https://github.com/matmair/InvenT…
matmair Mar 16, 2024
a3f8eca
fix requirements path
matmair Mar 16, 2024
91910c5
fix config to current master
matmair Mar 16, 2024
fc4e0e4
move new folders
matmair Mar 16, 2024
328f20b
fix import order
matmair Mar 16, 2024
2e02556
fix paths for qc_check
matmair Mar 16, 2024
66504f7
fix docs build
matmair Mar 16, 2024
2251f33
fix fix path
matmair Mar 16, 2024
b6d4044
set docker project dir
matmair Mar 16, 2024
4f41fa1
just use a cd
matmair Mar 16, 2024
be67a14
set image path?
matmair Mar 16, 2024
c35f621
set file correct
matmair Mar 16, 2024
1c22e03
fix copy path
matmair Mar 16, 2024
e02e446
fix tasks dir
matmair Mar 16, 2024
65c3a37
fix init path
matmair Mar 16, 2024
ad0d65d
fix copy path
matmair Mar 16, 2024
488581e
set prject dir
matmair Mar 16, 2024
c5fc567
fix paths
matmair Mar 16, 2024
2f3a969
remove old prod files
matmair Mar 16, 2024
a9c1dfe
fix dev env path
matmair Mar 16, 2024
affda78
set docker file
matmair Mar 16, 2024
f65f68e
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Mar 26, 2024
f1b9a2e
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Mar 27, 2024
fa68360
Merge branch 'master' into code-structure
SchrodingersGat Mar 27, 2024
ded7558
Fix devcontainer docker compose file
SchrodingersGat Mar 28, 2024
90c2779
fix login attempt values
matmair Mar 28, 2024
532ef4f
fix init.sh path
matmair Mar 28, 2024
c2d5172
Merge remote-tracking branch 'matmair/matmair/issue5578' into code-st…
SchrodingersGat Mar 28, 2024
386c252
Fix pathing for Docker
SchrodingersGat Mar 28, 2024
5328406
Docker build fix
SchrodingersGat Mar 28, 2024
120b9b7
Update init.sh
SchrodingersGat Mar 28, 2024
6614373
Merge branch 'master' into code-refactor
SchrodingersGat Apr 2, 2024
8e6f572
Fix path
SchrodingersGat Apr 2, 2024
99f7462
Merge remote-tracking branch 'origin/master' into code-refactor
SchrodingersGat Apr 2, 2024
caada8e
Update requirements.txt
SchrodingersGat Apr 2, 2024
58d79f8
Merge remote-tracking branch 'origin/master' into code-refactor
SchrodingersGat Apr 2, 2024
b8c4aab
merge
matmair Apr 2, 2024
32da46c
Merge branch 'matmair/issue5578' of https://github.com/matmair/InvenT…
matmair Apr 2, 2024
1c7d6ce
fix rq merge
matmair Apr 2, 2024
1e320d0
fix docker compose usage
matmair Apr 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
set docker file
matmair committed Mar 16, 2024
commit affda786a248c51dc199e41770e56e8ffc1b7445
1 change: 1 addition & 0 deletions contrib/container/dev-docker-compose.yml
Original file line number Diff line number Diff line change
@@ -40,6 +40,7 @@ services:
- inventree-dev-db
build: &build_config
context: .
dockerfile: contrib/container/Dockerfile
target: dev
# Cache the built image to be used by the inventree-dev-worker process
image: inventree-dev-image
Loading
Oops, something went wrong.