Commit graph

11842 commits

Author SHA1 Message Date
snipe d40a03b4c5 Merge remote-tracking branch 'origin/develop' 2023-10-26 13:09:38 +01:00
snipe 05de8a5731 Re-added missing break
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 09:21:27 +01:00
snipe d8a3081128 Merge remote-tracking branch 'origin/develop' 2023-10-25 21:05:28 +01:00
snipe d93e399295
Merge pull request #13797 from Godmartinz/employeeid_search_add
adds employee number as a searchable field to the asset table
2023-10-25 21:04:54 +01:00
Godfrey M 1b614c13fb ugh 2023-10-25 13:03:42 -07:00
Godfrey M 56fd41eee4 removed erroneous code 2023-10-25 13:03:12 -07:00
Godfrey M 33b45898b1 adds to advancedsearch 2023-10-25 12:59:58 -07:00
snipe eabc7479e3 Merge remote-tracking branch 'origin/develop' 2023-10-25 20:58:13 +01:00
snipe 7509d57bf6
Merge pull request #13796 from snipe/feature/sc-23880
Added optional custom fields to requestable assets page
2023-10-25 20:57:54 +01:00
snipe da08f0e26f
Merge pull request #13584 from Godmartinz/Bulk_location_edit_fix_gh-13572
added an option to bulk edit location & fixed location bug
2023-10-25 20:57:18 +01:00
snipe 0feb56d931 Removed period
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:39:15 +01:00
snipe a0cae77278 Fixed weird layout quirk on smaller screens
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:21:07 +01:00
snipe 0f97c0601b Nicer show/hide if encrypted, warn if already encrypted
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:11:06 +01:00
snipe 3916bac95f Added warning translation for encrypted fields
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:10:46 +01:00
snipe 6264d90459 Removed ending period for consistency
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:45:11 +01:00
snipe 57d3b2d2ef Check for encryption
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:44:10 +01:00
snipe a202bf81fa Removed column widths, check for encryption and showable
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:44:02 +01:00
snipe 43da292d60 Used short translation for sr-only text
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:43:34 +01:00
snipe ab3edae0b6 Reverted buttons (this re-introduces the n+1 problem.)
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:43:09 +01:00
snipe 887d013a39 Added listable fields in profile -> requested assets
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:42:33 +01:00
snipe eb82bc290d Clarified translation
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:42:07 +01:00
snipe 8b9b46c562 Removed comment
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:41:59 +01:00
snipe 307f84dff8 Removed extraneous method
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:41:53 +01:00
snipe 3c6b79e807 Added new fields to blades
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:28:55 +01:00
snipe e5bd78a722 Added show_in_requestable_list validation, casting
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:28:35 +01:00
snipe 23a6547ada Added custom fields, fixed n+1
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:28:14 +01:00
snipe 63a86c5622 Added field to controller
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:27:36 +01:00
snipe 933ce61efd Removed eager loading for defaultLoc, added requests loading, sorting
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:26:51 +01:00
snipe 88661a58a7 Make field nullable
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:26:31 +01:00
snipe 08693f09b0 Added requests() method on Assets
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:22:12 +01:00
snipe 3a37b80251 Added translations
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:21:58 +01:00
snipe e7ef7f04f0 Removed periods for consistency
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:21:48 +01:00
snipe c4adc3ccc8 Migration to add show_in_requestable_list boolean
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:18:37 +01:00
snipe 96f7f49b68 Fixed response docblock
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 16:40:49 +01:00
snipe 8c93e79397
Merge pull request #13787 from inietov/fixes/errorexception_undefined_array_key
Fixed ErrorException: Undefined array key in importer blade [sc-23864]
2023-10-25 07:47:48 +01:00
snipe 4d345168d6
Merge pull request #13786 from svpernova09/map-docker-logs-to-storage
Map Snipe-IT logs to storage logs folder
2023-10-25 07:20:22 +01:00
Ivan Nieto Vivanco f2f3931fa9 Formatting correctly 2023-10-24 11:26:37 -06:00
Joe Ferguson c919cd31fa
Map Snipe-IT logs to storage logs folder
For docker-compose.yml usage to prevent error messages.
2023-10-24 11:31:02 -05:00
snipe 4f136920a9 Merge remote-tracking branch 'origin/develop' 2023-10-24 17:03:50 +01:00
snipe 9d2d13bb59
Merge pull request #13784 from snipe/fixes/fixed_accessory_not_found_string
Fixed accessory not found string
2023-10-24 17:03:13 +01:00
snipe 944520bc5d Fixed notification formatting
Signed-off-by: snipe <snipe@snipe.net>
2023-10-24 17:02:16 +01:00
snipe aae289e150 Added missing string
Signed-off-by: snipe <snipe@snipe.net>
2023-10-24 17:02:07 +01:00
snipe c756849497 Removed debug line
Signed-off-by: snipe <snipe@snipe.net>
2023-10-24 17:01:51 +01:00
snipe ec878202f7 Merge remote-tracking branch 'origin/develop' 2023-10-24 11:53:00 +01:00
snipe 29f438123e
Merge pull request #13777 from Robert-Azelis/Robert-Azelis-Cutom_Report_FIX
[FIX] Custom report - date fields error
2023-10-24 10:27:58 +01:00
Ivan Nieto Vivanco 0c5d54dfde Create the language string to show in the importer GUI indicating the file is empty 2023-10-23 22:09:17 -06:00
Ivan Nieto Vivanco 49f6eef9df Places a text indicating that the file is empty and display it as an info text 2023-10-23 21:57:35 -06:00
Ivan Nieto Vivanco 8f8e5cb723 Adds condition to only process CSV if is not empty 2023-10-23 21:47:10 -06:00
snipe d5598b3322
Merge pull request #13778 from Robert-Azelis/Robert-Azelis-Dashboard_impr
[Improvement] Dashboard
2023-10-23 18:00:00 +01:00
Robert-Azelis 7571d45d44
[Improvement[ Dashboard
If multicompany option is enabled much more important for admin is to see on dashboard list of companies instead of locations.  
In other way if multicompanies option is disabled then locations are displayed.
2023-10-22 17:41:33 +02:00