snipe
|
b9dc7f88d0
|
Fix qty requirements for Components API checkout
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-09 16:32:30 +01:00 |
|
snipe
|
f6527e0b42
|
Merge pull request #13727 from snipe/security/huntr_43206801-9862-48da-b379-e55e341d78bf
Set resend acceptance to POST
|
2023-10-09 16:15:27 +01:00 |
|
snipe
|
866bbe5e11
|
Removed extra debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-09 16:15:14 +01:00 |
|
snipe
|
6d55d78280
|
Set resend acceptance to POST
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-09 16:13:41 +01:00 |
|
snipe
|
2789f67bb4
|
Merge remote-tracking branch 'origin/develop'
|
2023-10-09 15:19:29 +01:00 |
|
snipe
|
7a0d3f788f
|
Merge pull request #13726 from snipe/fixes/tighter_checkin_on_log_match
Added tighter controls for matching log ID and item_id
|
2023-10-09 15:19:10 +01:00 |
|
snipe
|
e5f5802235
|
Added tighter controls for matching log ID and item_id
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-09 15:17:03 +01:00 |
|
snipe
|
a1f3a5c624
|
Merge remote-tracking branch 'origin/develop'
|
2023-10-07 11:34:49 +01:00 |
|
snipe
|
d2dc3253ab
|
Cast the request limit to intval before we try to abs()
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-07 11:34:37 +01:00 |
|
snipe
|
d9a1dab827
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2023-10-06 20:17:59 +01:00 |
|
snipe
|
5277f7cc5c
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-06 20:14:44 +01:00 |
|
snipe
|
25a5507d9d
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-06 20:07:35 +01:00 |
|
snipe
|
a95fae0e94
|
Merge remote-tracking branch 'origin/develop'
|
2023-10-06 20:00:12 +01:00 |
|
snipe
|
890efb18d8
|
Merge pull request #13720 from snipe/security/huntr_dev_d6ed5ac1-2ad6-45fd-9492-979820bf60c8
Fixed missing escaping asset history old/new values
|
2023-10-06 19:59:42 +01:00 |
|
snipe
|
eea2eabaee
|
Escaping asset history old/new values
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-06 19:45:23 +01:00 |
|
snipe
|
9596826259
|
Merge branch 'master' of https://github.com/snipe/snipe-it
|
2023-10-06 19:04:44 +01:00 |
|
snipe
|
cd3b4754e8
|
Merge pull request #13704 from Godmartinz/feature/sc-23571_v2
Added a check-in button on components tab of Asset view
|
2023-10-05 14:28:37 +01:00 |
|
snipe
|
1dab4b59e9
|
Merge pull request #13693 from Godmartinz/bug/sc-9955
added proper margin-top to sidebar menu on bigger resolutions
|
2023-10-05 14:27:25 +01:00 |
|
snipe
|
05dd2b4008
|
Merge pull request #13709 from spencerrlongg/eol-migration
Speed up EOL Migration
|
2023-10-05 14:26:47 +01:00 |
|
snipe
|
b809625856
|
Merge pull request #13713 from snipe/security/13685
[Snyk] Security upgrade css-loader from 4.3.0 to 5.0.0 #13685
|
2023-10-05 14:13:35 +01:00 |
|
snipe
|
8d921359ca
|
[Snyk] Security upgrade css-loader from 4.3.0 to 5.0.0 #13685
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-05 14:12:36 +01:00 |
|
spencerrlongg
|
c07c0c0f74
|
cleanup
|
2023-10-04 16:55:35 -05:00 |
|
spencerrlongg
|
cc82e86eeb
|
one more check
|
2023-10-04 16:54:56 -05:00 |
|
spencerrlongg
|
8c9961aba8
|
refactor
|
2023-10-04 15:40:42 -05:00 |
|
spencerrlongg
|
46af40bd02
|
?????
|
2023-10-04 15:20:16 -05:00 |
|
spencerrlongg
|
6cda9056b8
|
oops
|
2023-10-04 14:56:18 -05:00 |
|
spencerrlongg
|
101bd9c404
|
kill transaction, try update array
|
2023-10-04 14:47:14 -05:00 |
|
spencerrlongg
|
ad6b502005
|
comments
|
2023-10-04 14:37:18 -05:00 |
|
spencerrlongg
|
cb10c7af27
|
oops
|
2023-10-04 14:33:35 -05:00 |
|
spencerrlongg
|
99d409c0a5
|
transaction
|
2023-10-04 14:32:28 -05:00 |
|
Godfrey M
|
37c1d6fc04
|
removed unnecessary changes
|
2023-10-03 12:45:13 -07:00 |
|
Godfrey M
|
c69958d95d
|
removed dead space
|
2023-10-03 12:32:24 -07:00 |
|
Godfrey M
|
92776adb93
|
remove unnecessary changes
|
2023-10-03 12:31:58 -07:00 |
|
Godfrey M
|
dee36fc294
|
adds component checkin to asset tab
|
2023-10-03 12:30:08 -07:00 |
|
snipe
|
a2773aa895
|
Merge pull request #13696 from marcusmoore/bug/sc-23796
Fixed potential call to a member function toArray() on null
|
2023-10-03 11:01:40 +01:00 |
|
Marcus Moore
|
e82fec2a5f
|
Grammar fix
|
2023-10-02 16:19:20 -07:00 |
|
Marcus Moore
|
db4c86a4f4
|
Filter null field options before attempting to process them
|
2023-10-02 16:14:20 -07:00 |
|
snipe
|
8384786e8b
|
Merge pull request #13695 from marcusmoore/bug/sc-23795-to-master
Log non-compliant barcode error as debug message
|
2023-10-02 22:22:26 +01:00 |
|
Marcus Moore
|
a5fd218c23
|
Log non-compliant barcode error as debug message
|
2023-10-02 14:19:52 -07:00 |
|
snipe
|
d2435c6f86
|
Merge remote-tracking branch 'origin/develop'
|
2023-10-02 22:14:08 +01:00 |
|
snipe
|
1abcc8b802
|
Merge pull request #13694 from marcusmoore/bug/sc-23795
Logs non-compliant barcode error as debug message
|
2023-10-02 22:13:19 +01:00 |
|
Marcus Moore
|
724c054838
|
Log non-compliant barcode error as debug message
|
2023-10-02 12:06:24 -07:00 |
|
Godfrey M
|
1e8f90bcf0
|
gives proper margin-top to sidebar menu on bigger resolutions
|
2023-10-02 11:46:08 -07:00 |
|
snipe
|
129e9b90dc
|
Merge pull request #13585 from spencerrlongg/eol_2
Standardize Asset EOL Date
|
2023-10-02 16:09:22 +01:00 |
|
snipe
|
4e6764428e
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-10-02 14:29:59 +01:00 |
|
snipe
|
c7b8880d69
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-02 14:28:59 +01:00 |
|
snipe
|
228f21ed91
|
Merge pull request #13690 from snipe/localization/all
Updated language strings
|
2023-10-02 14:24:52 +01:00 |
|
snipe
|
b7c390a257
|
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-02 14:23:22 +01:00 |
|
snipe
|
c45ede2d17
|
Merge remote-tracking branch 'origin/develop'
|
2023-09-29 19:00:27 +01:00 |
|
snipe
|
758d808772
|
Merge pull request #13683 from snipe/bug/sc-17602
Fixed consumable user view route name
|
2023-09-29 15:17:23 +01:00 |
|