snipe
|
630b6496ec
|
Merge pull request #13231 from snipe/fixes/small_fix_for_error_during_seeding
Redirect if the license can’t be found
|
2023-06-29 21:18:02 +01:00 |
|
snipe
|
7937542dcb
|
Redirect if the license can’t be found
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 21:15:50 +01:00 |
|
akemidx
|
d0212d4bda
|
formatting fix
|
2023-06-29 15:39:19 -04:00 |
|
snipe
|
e236bf412c
|
Merge pull request #13230 from snipe/fixes/windows_backup_filename_colon_wtf_issue
Fixed windows backup filename - swapped colon in timestamp to hyphen to handle windows filesystems
|
2023-06-29 20:37:09 +01:00 |
|
snipe
|
fb9b3a5453
|
Switched from a colon to a hyphen to handle windows filesystems
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 20:32:20 +01:00 |
|
snipe
|
faf2a235fb
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 20:31:13 +01:00 |
|
snipe
|
9f99f8275c
|
Merge pull request #13229 from Godmartinz/status_label_color
fixed custom fields labels being unreadable
|
2023-06-29 20:21:46 +01:00 |
|
Godfrey M
|
f83effbb85
|
removed unnecessary css rule
|
2023-06-29 11:25:40 -07:00 |
|
Godfrey M
|
d4cddebba5
|
fixes custom fields labels being unreadable
|
2023-06-29 11:21:21 -07:00 |
|
snipe
|
825e988dfa
|
Merge pull request #13228 from snipe/bug/sc-23434
Use proper alias for table scope
|
2023-06-29 17:11:50 +01:00 |
|
snipe
|
bcefe73c9c
|
Use proper alias for table scope
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 16:52:09 +01:00 |
|
snipe
|
a3096e1b47
|
Merge pull request #13219 from inietov/features/cancel_request_asset
Cancel requested assets without checkin/out [ch-17606]
|
2023-06-29 16:18:13 +01:00 |
|
snipe
|
16ce06a3cc
|
Merge pull request #13222 from snipe/feature/sc-23427
Fixed #13213 - Use the Helper::parseEscapedMarkedown in notes
|
2023-06-29 16:16:25 +01:00 |
|
snipe
|
8be3a6985b
|
Merge pull request #13227 from snipe/bug/sc-23433
More reshuffling of scopes in assets API
|
2023-06-29 16:10:26 +01:00 |
|
snipe
|
4c3a306a6e
|
More shuffling of scopes
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 13:35:41 +01:00 |
|
Ivan Nieto Vivanco
|
011726154c
|
Set rtd_location if a location is given at checkin
|
2023-06-29 03:16:59 -06:00 |
|
akemidx
|
af03b9f140
|
user department clarification & translation for that phrase. will be used in a later PR
|
2023-06-28 17:45:13 -04:00 |
|
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 |
|
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 |
|
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 |
|
Marcus Moore
|
3f09e6017b
|
Install paratest to allow for parallel test running
|
2023-06-26 16:22:28 -07: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 |
|
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 |
|
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 |
|