Commit Graph

9845 Commits

Author SHA1 Message Date
Matthias Mair
c02a087044
Merge branch 'inventree:master' into matmair/issue2201 2021-10-31 23:04:40 +01:00
Oliver
360f0406b5 CSS updates
- Add template for filter lists
- Filter lists now layout horizontally
- Change flex-row to flex-wrap
2021-11-01 08:38:24 +11:00
Oliver
fd2a26c8fa
Merge pull request #2219 from SchrodingersGat/submodule-fix
Remove submodule
2021-11-01 08:36:12 +11:00
Oliver
b8d6a2830e Remove submodule 2021-11-01 08:17:29 +11:00
Matthias
7719a07f19
remove data 2021-10-31 14:10:07 +01:00
Matthias
487bab5162
cleanup 2021-10-31 14:02:24 +01:00
Matthias
9fd66e9f22
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-10-31 13:56:14 +01:00
Matthias
ec17bbcb95
mkaeuser setting tighter 2021-10-31 13:54:12 +01:00
Matthias
06822303bc
refactor user settings 2021-10-31 13:42:41 +01:00
Matthias
dd74cf19a7
fix middleware to not interupt flow 2021-10-31 13:42:27 +01:00
Oliver
9057462588
Merge pull request #2212 from matmair/matmair/issue2210
Fix for actions wrapping on smaller screens
2021-10-31 09:09:27 +11:00
Oliver
b2dd3da518
Merge pull request #2215 from matmair/matmair/issue2213
[BUG] Auth screens broken
2021-10-31 09:05:26 +11:00
Matthias Mair
6ce10736af
Merge branch 'inventree:master' into matmair/issue2210 2021-10-30 17:23:55 +02:00
Matthias Mair
108f715ef6
Merge branch 'inventree:master' into matmair/issue2213 2021-10-30 17:23:51 +02:00
Matthias Mair
14680531f0 [BUG] Auth screens broken
Fixes #2213
2021-10-30 14:05:40 +00:00
Oliver
fe5cb3ddca
Merge pull request #2214 from SchrodingersGat/sales-order-export-fix
convert sale_price to string before exporting
2021-10-31 00:34:28 +11:00
Oliver
3423cb9d7c
Merge pull request #2209 from matmair/test-branch
Update README.md
2021-10-31 00:06:11 +11:00
Oliver
a151a68e58 convert sale_price to string before exporting 2021-10-31 00:05:20 +11:00
Matthias Mair
6af866557d fixes missing wraping on iPdas and iPhones
Fixes #2210
2021-10-30 12:34:31 +00:00
Matthias Mair
ceb457a837
Update README.md
added a button in REadme to open up a env in gitpod directly
2021-10-30 14:16:11 +02:00
Oliver
2a58ad97dc
Merge pull request #2206 from matmair/gitpod
Add definition for Gitpod.io
2021-10-30 23:06:40 +11:00
Oliver
2bbeab38ff
Merge pull request #2205 from SchrodingersGat/bootstrap-5
Bootstrap 5
2021-10-30 23:03:12 +11:00
Oliver
75c8faa09f Tweaks 2021-10-30 22:30:04 +11:00
Oliver
638c9d4007 Enable bootstrap-5 theme for select2 2021-10-30 22:16:40 +11:00
Oliver
2830fc3c7f Fixes 2021-10-30 14:11:03 +11:00
Oliver
29c913b553 Improvements for stock item test result table 2021-10-30 13:31:13 +11:00
Oliver
79434bb4e0 Handle missing report template 2021-10-30 13:28:08 +11:00
Oliver
a689b77cfb More tweaks 2021-10-30 13:18:11 +11:00
Oliver
eb18ad6c4c
Merge pull request #2164 from nwns/feature/postgrestimeouts
Set some sensible postgres timeouts
2021-10-30 13:14:13 +11:00
Oliver
c4c533bee0 JS linting 2021-10-30 13:03:52 +11:00
Oliver
c2a8cfd183 PEP style fixes 2021-10-30 12:57:49 +11:00
Oliver
8e1d9c281a Adds tree view for stock locations 2021-10-30 12:53:25 +11:00
Oliver
be23634c5d Refactor display toggle for part list and part category list 2021-10-30 12:45:07 +11:00
Matthias Mair
6a21541566
get inventree-data at startup (#26)
* Gitpod (#25)

* Create .gitpod.yml

* split up command

* monolythic may be better

* set envs per export

* use dev for data

* trying the split again

* added sync command

* cleanup

* Update .gitpod.yml

settings for prebuilds

* add dataset import

* remove check - might block PRs

* switch execution flow

* do not block in execution

* for deletion in script

* Update .gitpod.yml

added in github RSA fingerprint

* Update .gitpod.yml

update key format

* Update .gitpod.yml

maybe https will work?

* Update .gitpod.yml

move dataset-update into init

* Update .gitpod.yml

a dir needs a -r flag :-)
2021-10-30 01:27:31 +02:00
Matthias Mair
cab1b0dc46
Update .gitpod.yml
added in github RSA fingerprint
2021-10-30 00:22:43 +02:00
Matthias Mair
6e1c42374c
Merge branch 'master' into gitpod 2021-10-30 00:12:47 +02:00
Matthias Mair
cbb6d466cc download data before migrating 2021-10-29 22:11:53 +00:00
Matthias Mair
2246633628
Gitpod (#24)
* Create .gitpod.yml

* split up command

* monolythic may be better

* set envs per export

* use dev for data

* trying the split again

* added sync command

* cleanup

* Update .gitpod.yml

settings for prebuilds

* add dataset import

* remove check - might block PRs

* switch execution flow

* do not block in execution

* for deletion in script
2021-10-30 00:03:34 +02:00
Matthias Mair
19980bda5e
Merge branch 'master' into gitpod 2021-10-30 00:03:26 +02:00
Matthias Mair
c58de2ef19 Merge branch 'gitpod' of https://github.com/matmair/InvenTree into gitpod 2021-10-29 22:02:22 +00:00
Matthias Mair
9fa0680b97 for deletion in script 2021-10-29 22:02:18 +00:00
Matthias Mair
d17a48c9d3 do not block in execution 2021-10-29 22:01:55 +00:00
Oliver
3bd59728db CSS tweaks 2021-10-30 08:59:40 +11:00
Matthias Mair
83b74b2566
Gitpod (#23)
* Create .gitpod.yml

* split up command

* monolythic may be better

* set envs per export

* use dev for data

* trying the split again

* added sync command

* cleanup

* Update .gitpod.yml

settings for prebuilds

* add dataset import

* remove check - might block PRs

* switch execution flow
2021-10-29 18:23:27 +02:00
Matthias Mair
fee22be0e0
Merge branch 'master' into gitpod 2021-10-29 18:23:19 +02:00
Matthias Mair
6efd8cadcd switch execution flow 2021-10-29 16:20:37 +00:00
Matthias Mair
62ffffea9b remove check - might block PRs 2021-10-29 16:17:18 +00:00
Matthias Mair
079119e8c0 add dataset import 2021-10-29 16:17:02 +00:00
Matthias Mair
59951a12e2
Gitpod (#22)
* Create .gitpod.yml

* split up command

* monolythic may be better

* set envs per export

* use dev for data

* trying the split again

* added sync command

* cleanup

* Update .gitpod.yml

settings for prebuilds
2021-10-29 18:05:25 +02:00
Matthias Mair
c35eeca19d
Update .gitpod.yml
settings for prebuilds
2021-10-29 18:02:49 +02:00