snipe
|
9a73f5eca3
|
Updated production assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
|
2023-04-17 20:27:49 -07:00 |
|
|
snipe
|
9698c3b07b
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 20:14:50 -07:00 |
|
|
snipe
|
3153013715
|
Fixed semicolon parse error from #12832
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 20:14:45 -07:00 |
|
|
snipe
|
c12ac9912c
|
Merge pull request #12832 from Godmartinz/fix_footer_space
Fixed footer space when customized
|
2023-04-17 20:11:15 -07:00 |
|
|
snipe
|
2b10357c4e
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 19:06:27 -07:00 |
|
|
snipe
|
c70cb36c80
|
Merge pull request #12828 from Godmartinz/bug/sc-20783
Fixed dark themes pagination and notification drop menu
|
2023-04-17 16:26:36 -07:00 |
|
Godfrey M
|
247f47ce69
|
adjusts button color
|
2023-04-17 15:29:53 -07:00 |
|
|
Godfrey M
|
aabd5e92a8
|
surrounding text aligns correctly
|
2023-04-17 12:44:06 -07:00 |
|
|
Godfrey M
|
247c881d87
|
add back casts
|
2023-04-17 12:10:54 -07:00 |
|
|
Godfrey M
|
1001b52c4f
|
removes unncessary files
|
2023-04-17 12:01:09 -07:00 |
|
|
Godfrey M
|
0cca45d858
|
footer now uses flex
|
2023-04-17 11:57:35 -07:00 |
|
|
snipe
|
b22cad9ced
|
Merge pull request #12855 from koelle25/fixes/last_component_checkout
Allow checkout of available components down to zero stock (fixes #12854)
|
2023-04-17 09:49:14 -07:00 |
|
|
snipe
|
071a620144
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-17 09:36:07 -07:00 |
|
|
snipe
|
920711dd16
|
Merge pull request #12857 from snipe/fixes/wtf_datetime_stuff
Remove start/end dates form casts array
|
2023-04-17 09:35:03 -07:00 |
|
|
snipe
|
e0c53d8d09
|
Remove start/end dates form casts array
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 09:33:31 -07:00 |
|
Kevin Köllmann
|
04f3c4bf69
|
Fixed #12854: Allow checkout of available components down to zero stock
|
2023-04-17 11:45:11 +02:00 |
|
|
snipe
|
b093e428b3
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-16 08:54:38 -07:00 |
|
|
snipe
|
144a6f28ec
|
Added intval
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 08:54:23 -07:00 |
|
|
snipe
|
65ac877918
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-16 08:50:20 -07:00 |
|
|
snipe
|
f50b958b63
|
Merge pull request #12848 from snipe/fixes/make_limit_into_singletons
Used a singleton to filter API limit value
|
2023-04-16 08:48:28 -07:00 |
|
|
snipe
|
64256351d8
|
Used a singleton to filter API limit value
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 08:46:39 -07:00 |
|
|
snipe
|
62edc0ab7d
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-16 08:02:44 -07:00 |
|
|
snipe
|
2c6d4d6b7f
|
Merge pull request #12847 from snipe/features/moar_labels
Adds a few more auto-labels
|
2023-04-16 08:01:06 -07:00 |
|
|
snipe
|
2b11c96ce0
|
Adds a few more auto-labels
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 08:00:25 -07:00 |
|
|
snipe
|
46cce0115e
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2023-04-16 05:46:26 -07:00 |
|
|
snipe
|
485f5f3a45
|
Merge pull request #12845 from snipe/security/update_bs_tables
Upgrade bootstrap-table from 1.20.2 to 1.21.3 (Formerly #12733)
|
2023-04-16 05:44:52 -07:00 |
|
|
snipe
|
21f5d39fa1
|
Upgrade bootstrap-table from 1.20.2 to 1.21.3 (Formerly #12733)
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 05:43:42 -07:00 |
|
|
snipe
|
21e78bee71
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# package-lock.json
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2023-04-15 21:05:18 -07:00 |
|
|
snipe
|
2eeb7ddf58
|
Merge pull request #12844 from snipe/fixes/small_blade_parial_fixes
Small blade parial fixes
|
2023-04-15 21:04:35 -07:00 |
|
|
snipe
|
589f7fa183
|
Larger qty box
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 21:03:09 -07:00 |
|
|
snipe
|
9ff62c966e
|
Check for $item (matters mostly in custom report blade)
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 21:03:00 -07:00 |
|
|
snipe
|
86b04c7294
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 20:50:36 -07:00 |
|
|
snipe
|
2d03ea943b
|
Applied webpack change from master to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 20:49:34 -07:00 |
|
|
snipe
|
20ab412e1e
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 20:45:35 -07:00 |
|
|
snipe
|
513b95e8d7
|
Merge pull request #12768 from snipe/snyk-upgrade-291b556667d6ffe966495405775b3255
[Snyk] Upgrade tableexport.jquery.plugin from 1.26.0 to 1.27.0
|
2023-04-15 20:44:57 -07:00 |
|
|
snipe
|
50153717f6
|
Merge pull request #12798 from snipe/snyk-upgrade-cec198178187b64d2348f74ddc10c797
[Snyk] Upgrade webpack from 5.76.1 to 5.76.2
|
2023-04-15 20:36:48 -07:00 |
|
|
snipe
|
32030c4f71
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-15 18:44:25 -07:00 |
|
|
snipe
|
955539807c
|
Merge pull request #12830 from snipe/features/adds_supplier_id_to_components
Added supplier to components and consumables
|
2023-04-15 18:42:23 -07:00 |
|
|
snipe
|
8c09226b76
|
Merge pull request #12834 from marcusmoore/mxm/improve-test-setup
Introduced improved way to interact with settings in tests
|
2023-04-15 18:37:34 -07:00 |
|
|
snipe
|
b73aed2b69
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-15 18:30:21 -07:00 |
|
|
snipe
|
b9a5a8a500
|
Merge pull request #12843 from snipe/fixes/temp_fix_seeder
Temp fix for the seeders
|
2023-04-15 18:30:00 -07:00 |
|
|
snipe
|
8ae14c43f3
|
This is a temp fix for the seeders
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 18:27:53 -07:00 |
|
|
snipe
|
fc7f1f907d
|
Fixed variable name
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 17:37:25 -07:00 |
|
|
snipe
|
f6cfec1e49
|
Merge pull request #12842 from snipe/fixes/take_two_better_handling_limits
Use abs() instead of max
|
2023-04-15 17:33:12 -07:00 |
|
|
snipe
|
4cbb9c2409
|
Use abs() instead of max
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 17:28:25 -07:00 |
|
|
snipe
|
a97b2d141d
|
Merge pull request #12827 from snipe/fixes/tighter_handling_of_offset_and_limit
Better handling for weird data passed to the API via limit and offset
|
2023-04-15 16:52:33 -07:00 |
|
|
snipe
|
f407a551da
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2023-04-15 16:48:07 -07:00 |
|
|
snipe
|
36665fde31
|
Merge pull request #12833 from svpernova09/bump-dockerfile-22-04-php81
Update Dockerfile to Ubuntu 22.04 and PHP 8.1
|
2023-04-14 17:16:42 -07:00 |
|
Joe Ferguson
|
785d2f3558
|
Update alpine Dockerfiles to PHP 8.1 and Snipe-IT v6.1.0
|
2023-04-14 13:35:36 -05:00 |
|
|
Joe Ferguson
|
1d8a4ca090
|
Update Dockerfile to Ubuntu 22.04 and PHP 8.1
|
2023-04-14 07:59:16 -05:00 |
|