DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11695 commits 96 branches 267 tags 296 MiB
Commit graph

11695 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe f7f2d799f2
Merge pull request #13223 from inietov/fixes/delete_notes_map_from_asset_importer 
Delete notes column map from assets importer
 2023-06-28 20:06:33 +01:00
slong753 8923206ac8 translation string 2023-06-28 13:08:34 -05:00
slong753 3b8ab2d682 clean formatting a little 2023-06-28 13:00:59 -05:00
slong753 2d27941105 added to textarea too 2023-06-28 12:59:54 -05:00
slong753 50a518e5f3 disable input when field is unique 2023-06-28 12:57:23 -05:00
Ivan Nieto Vivanco a4b8723dcb Delete notes column map from assets importer 2023-06-28 11:38:51 -06:00
Ivan Nieto Vivanco e2c2736a9c Delete (gulp) Form for bulk edit since is not used in this view 2023-06-28 11:23:37 -06:00
Ivan Nieto Vivanco 85e717bc4e Fix cancel button style and translate title 2023-06-28 10:38:44 -06:00
snipe 161f4c8d83
Merge pull request #13045 from akemidx/feature/sc-23261 
Checkin/out info on side bar
 2023-06-28 16:41:21 +01:00
slong753 8b8e7cb5ee couple translation strings 2023-06-28 10:17:28 -05:00
snipe e1fdfd01f6
Merge pull request #13211 from marcusmoore/company-scoping 
Improve testing around company scoping
 2023-06-28 16:17:07 +01:00
snipe 4278471d81
Merge pull request #13207 from Godmartinz/half_year_dep_fix 
adds half_year fix from jdickerson71388
 2023-06-28 15:12:30 +01:00
snipe e3f381a1e1
Merge pull request #13212 from marcusmoore/feature/sc-23419 
Allow running tests in parallel
 2023-06-28 15:12:13 +01:00
snipe 8d8adc1639 Use the Helper::parseEscapedMarkedown in notes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-28 15:02:32 +01:00
snipe a455f67d62
Merge pull request #13216 from marcusmoore/bug/sc-23420 
Fix translation string in user importer
 2023-06-28 07:03:11 +01:00
snipe b6a11cde65
Merge pull request #13218 from marcusmoore/chore/sc-23424 
Have ChipperCI run on each PR
 2023-06-28 07:01:14 +01:00
snipe a8d4494e68
Merge pull request #13220 from marcusmoore/bug/sc-23425 
Add missing relationship check in Asset Transformer
 2023-06-28 06:59:33 +01:00
Marcus Moore ab51857854
Check to see if model relationship exists before using it 2023-06-27 19:35:55 -07:00
Ivan Nieto Vivanco 8496e64e16 Adds ternary to set a quantity when needed 2023-06-27 18:37:22 -06:00
Ivan Nieto Vivanco b4b84f91d0 Redirect to correct page after cancel action 2023-06-27 18:25:38 -06:00
Ivan Nieto Vivanco 1c29bd37a6 Added feature to cancel requests from the Requested Assets view 2023-06-27 18:11:10 -06:00
Marcus Moore 6df7be8c13
Have ChipperCI run on each PR 2023-06-27 16:55:20 -07:00
Ivan Nieto Vivanco eb4d764601 Refactor Requestable@cancelRequest() firm to admit a user_id so we can cancel a request of whatever user we want 2023-06-27 17:13:11 -06:00
Ivan Nieto Vivanco b647a8fcd2 Change the inline form HTML label to the Form:: facade 2023-06-27 17:02:25 -06:00
Ivan Nieto Vivanco 62347a56ba Add button with cancel action in requested assets view 2023-06-27 16:41:30 -06:00
Marcus Moore b0177d513a
Fix translation 2023-06-27 12:37:19 -07:00
slong753 e8988bf51e add list 2023-06-26 20:22:27 -05:00
Marcus Moore 3f09e6017b
Install paratest to allow for parallel test running 2023-06-26 16:22:28 -07:00
slong753 2736161909 oops, fixed translation 2023-06-26 16:37:06 -05:00
slong753 8cbff0179c translation strings 2023-06-26 16:35:53 -05:00
slong753 2a352619f7 clean up 2023-06-26 16:25:48 -05:00
Marcus Moore 2abdb8a5fd
Revert unneeded changes 2023-06-26 14:01:09 -07:00
Marcus Moore 7cb22d3d49
Remove incomplete tests 2023-06-26 14:00:53 -07:00
slong753 691faf6340 ok, this kind of works - pr needs some clean up 2023-06-26 14:56:07 -05:00
Marcus Moore 3cb0920411
Merge branch 'develop' into company-scoping 2023-06-26 12:32:10 -07:00
Godfrey M 114d946437 adds half_year fix from jdickerson71388 2023-06-26 11:26:46 -07:00
snipe 49b50d81ee
Merge pull request #13200 from snipe/bug/sc-23417 
Set table alias for model number sort scope
 2023-06-26 08:29:16 +01:00
snipe 4f7b2836b5 Set table alias for model number sort scope 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-26 08:27:17 +01:00
Marcus Moore acd06927ac
Add helper method for authenticating with passport 2023-06-22 17:37:30 -07:00
Spencer Long f646623a5e
Merge branch 'develop' into bulk_edit_custom_fields 2023-06-22 18:00:31 -05:00
Marcus Moore a35d83d14a
Migrate to response macros for readability 2023-06-22 14:41:56 -07:00
akemidx 8df9db76bc column ordering fix 2023-06-22 17:12:40 -04:00
akemidx 8725d40f8d current value added to asset index page. translations for this in reports 2023-06-22 17:00:42 -04:00
snipe 8c6bde335e
Merge pull request #13196 from inietov/fixes/default_status_labels_when_import 
Fixed issue when importing Assets and no status labels exists [sc-23359]
 2023-06-22 21:34:25 +01:00
snipe b2d74f7e95
Merge pull request #13186 from snipe/bug/sc-23386 
Moved logic for tighter constraints when ids are passed
 2023-06-22 21:32:36 +01:00
snipe 78d8e32a22 Fixed weird order number thing 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-22 21:16:24 +01:00
snipe 4029efebfd
Merge pull request #13159 from Godmartinz/audit_image_bug 
fixed audit log image not appearing
 2023-06-22 21:11:39 +01:00
Marcus Moore 8aae5beaba
Add explicit select back to query 2023-06-22 13:09:08 -07:00
Marcus Moore a8133f62e8
Add explicit select back to query 2023-06-22 13:07:49 -07:00
Ivan Nieto Vivanco 67e47a7d8b Add guard clause to obtain the default ID of imported asset's status label 2023-06-22 13:53:58 -06:00