Commit graph

4029 commits

Author SHA1 Message Date
akemidx 9cd2783185 Regex added for link instead 2023-04-24 20:07:21 -04:00
akemidx 16a5a883e5 new request, preparing support_url for validation 2023-04-20 16:34:25 -04:00
snipe ead5293ee0
Merge pull request #12765 from spencerrlongg/chore/sc-20230
Change protected $dates to casts
2023-04-04 01:29:24 -07:00
snipe cfef9d8cca
Merge pull request #12763 from inietov/fixes/call_to_member_function_licenses_on_null
Fixed Call to a Member Function Licenses() on null [sc-20606]
2023-03-30 14:20:13 -07:00
snipe 9ca5285781
Merge pull request #12762 from spencerrlongg/feature/sc-20304
Bulk Restore from Deleted
2023-03-30 12:37:50 -07:00
slong753 0f72554a9f translations for messages 2023-03-30 13:57:18 -05:00
slong753 382d849ee1 added catch for no assets selected 2023-03-30 13:52:29 -05:00
slong753 8c1c0e81b6 rm deplicates 2023-03-30 13:31:58 -05:00
snipe 10c1e923dc
Merge pull request #12764 from marcusmoore/fixes/importer-fix
Fixes potential unwanted overwrites in asset imports
2023-03-30 09:40:58 -07:00
slong753 e126a75f7a pretty sure this was it 2023-03-29 21:37:26 -05:00
Ivan Nieto Vivanco d10b7fd6af Use firstorfail on eloquent query to return error if asset is not found 2023-03-29 19:11:28 -06:00
Marcus Moore 0998c70a92
Remove unneeded import 2023-03-29 16:59:26 -07:00
Marcus Moore 9f8b8f6cc1
Remove unneeded variable 2023-03-29 16:58:55 -07:00
slong753 e4c76f454c this is good, just needs translations done in view 2023-03-29 18:24:56 -05:00
slong753 162b70d5a9 wireframed, needs a view and should work 2023-03-29 17:34:36 -05:00
Marcus Moore e05546d1fa
Display helpful messages when importing assets 2023-03-29 13:23:45 -07:00
Marcus Moore 4cbe683a1a
Explicitly cast asset tag to string when querying 2023-03-29 11:28:04 -07:00
snipe c9d1274edc
Merge pull request #12753 from snipe/fixes/lang_for_group_not_found
Fixes/lang for group not found
2023-03-28 16:45:22 -07:00
snipe 32922e6461 Use corrected language string
Signed-off-by: snipe <snipe@snipe.net>
2023-03-28 16:39:52 -07:00
Ivan Nieto Vivanco 77d513f80b Assign target variable as the other checkout types 2023-03-28 17:25:57 -06:00
Ivan Nieto Vivanco d70b7dbf41 Checks if exist on API checkout 2023-03-28 16:12:48 -06:00
snipe feef06e7bf Changed log level to debug vs info/error
Signed-off-by: snipe <snipe@snipe.net>
2023-03-28 06:54:41 -07:00
snipe 4d1e28ad03
Merge pull request #12727 from snipe/fixes/add_json_to_mimes
Fixed #12641 - added JSON to mimes
2023-03-24 07:22:30 -07:00
snipe 150a2b572e Use single “accessory” translation
Signed-off-by: snipe <snipe@snipe.net>
2023-03-24 07:14:02 -07:00
snipe 6bc0df73e8
Merge pull request #12661 from Godmartinz/gh12655_missing_translations
Adds translations for category types to index and edit of categories
2023-03-24 07:09:40 -07:00
snipe 16dcc2d3ed Fixed #12641 - add JSON to mimes
Signed-off-by: snipe <snipe@snipe.net>
2023-03-24 06:57:43 -07:00
snipe e869b1fd53 Fixed #12724 - fieldset not saving on model
Signed-off-by: snipe <snipe@snipe.net>
2023-03-24 06:11:24 -07:00
snipe 642d1e9f36
Merge pull request #12720 from inietov/fixes/undefined_array_key_266
Fixed Undefined array key 266 rollbar 17086
2023-03-24 04:50:47 -07:00
Ivan Nieto Vivanco fbb3684022 Add a condition to 'restart' the color index for the status pie chart 2023-03-23 12:43:02 -06:00
Marcus Moore fe6295a5e4
Update slack_* properties to webhook_* 2023-03-22 14:43:00 -07:00
snipe 545d023a18 Handled a few more hard-coded strings
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 23:56:07 -07:00
snipe 473211397f
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent
Livewire importer without subcomponent
2023-03-21 23:07:04 -07:00
snipe e08327be95 Ability to remove user location from users
Rework of #9677 - sorry @godmartinez - I suck :(

Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 23:03:57 -07:00
snipe 418ce75a9f
Merge pull request #11431 from ntbutler-nbcs/develop
[Fix / Minor Change] Asset checkinbytag now consistent with existingAPI
2023-03-21 22:40:21 -07:00
Brady Wetherington 6fe520a55d Hooked various the contents of the components together 2023-03-21 22:26:32 -07:00
snipe 41eb2464e2 Forgot the static method declaration - derp
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 21:21:01 -07:00
snipe e40762cf7f Small anal-retentive spacing/indenting tweaks
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 21:00:43 -07:00
snipe 637438ccf6 Added select2 to slack settings
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 20:00:11 -07:00
snipe 647f47cdfe Check for demo mode in the clear method for the controller
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 19:27:05 -07:00
snipe a14d1b981d Switched singleton to static helper method
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 19:22:18 -07:00
snipe 5217141dfb Yuck, but added helper function to return the demo mode form warning
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 18:59:34 -07:00
snipe b28a25f544 Normalize the flash session to the way we do it elsewhere
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 18:59:18 -07:00
snipe d55ae44638 Helper method to make it easier (shorter) to determine if the app is in demo mode
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 18:59:03 -07:00
snipe 35bef6625a
Merge pull request #12703 from Godmartinz/webhook_clean_up
adds clear and save button, save button updates accordingly
2023-03-21 17:02:33 -07:00
snipe c229d69cec Added next audit date override in bulk asset edit
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 16:01:41 -07:00
Godfrey M 3c28242a2e save button updates accordingly 2023-03-21 15:53:09 -07:00
snipe ecb11c3a12 Fixed #12682 - add default location to maintenance report
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 13:52:21 -07:00
snipe 4f8542b71b
Merge pull request #12680 from akemidx/clone_accessories
Clone accessories
2023-03-21 13:37:04 -07:00
akemidx 3134279a95 small edits 2023-03-21 15:48:53 -04:00
Brady Wetherington 704a2ad858 WIP: trying to merge two LW components into one, not working yet 2023-03-18 20:31:56 -07:00