DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 15:44:11 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
7999 commits 97 branches 266 tags 291 MiB
Commit graph

7999 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Nieto Vivanco 0c3972d7b7 Add spaces to the code for consistency 2022-06-09 13:02:31 -05:00
Ivan Nieto Vivanco 4a0eb2b3f1 Add element type of customfield to API response 2022-06-09 12:57:20 -05:00
snipe 728338bfa8
Merge pull request #10824 from inietov/fixes/accessories_consumables_negative_numbers_develop 
Fixes Accessories total quantity shows a negative number for develop branch
 2022-06-08 10:53:57 -07:00
snipe df8834fd88
Merge pull request #11278 from Godmartinz/bug/sc-19134/possible-missing-wrong-translations-in-ldap 
fixes translation references in the users ldap blade
 2022-06-08 10:47:03 -07:00
Godfrey M c8bc0eff11 fixes translation references in the users ldap blade 2022-06-08 09:52:55 -07:00
snipe 8b6e869215
Merge pull request #11276 from snipe/fixes/added_bulk_data_attributes_to_manufacturers 
Added new JS data attributes for assets in manufacturers
 2022-06-08 04:19:38 -07:00
snipe 063893c109 Added new JS data attributes for assets in manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-08 04:18:05 -07:00
snipe 0671e478cd
Merge pull request #11273 from inietov/fixes/eol_without_specified_date_format 
Fixes EOL field doesn't have date formatter applied
 2022-06-07 17:01:46 -07:00
Ivan Nieto Vivanco d2fc27e21d Add formatted date to EOL field in asset detailed view 2022-06-07 18:22:09 -05:00
snipe 7faaa4ce24
Merge pull request #11263 from inietov/fixes/dont_save_update_action_if_nothings_changed 
Fixes log update action even if no changes are made to assets [sc-19131]
 2022-06-06 20:06:19 -07:00
snipe 9583a72016
Merge pull request #11262 from snipe/fixes/11093_use_true_false_in_custom_fields_fieldsets 
Fixed #11093 - Return true/false for custom fields/fieldsets required value in API
 2022-06-06 20:04:52 -07:00
snipe e0102ddbf0 Fixes #11093 Return true/false for custom fields/fieldsets required in API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-06 20:03:20 -07:00
Ivan Nieto Vivanco 1030ad9a27 Early returns if no change is made in the Asset so the 'update' action doesn't log 2022-06-06 22:00:05 -05:00
snipe ab8dcdcc40 Merge remote-tracking branch 'origin/master' into develop 2022-06-06 19:35:29 -07:00
snipe 773997a492
Merge pull request #11261 from snipe/features/11255_add_location_2_to_locations_listing 
Fixed #11255 - add address 2 field to locations listing
 2022-06-06 19:35:07 -07:00
snipe 8333c80b7a Added address2 to column selector for locations listing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-06 19:31:08 -07:00
snipe 96644ab6b9
Merge pull request #11259 from inietov/fixes/history_issues 
Fixes some issues in the asset observer
 2022-06-06 18:25:05 -07:00
Ivan Nieto Vivanco f977c53ecb Fixes some issues in the asset observer 2022-06-06 19:14:32 -05:00
snipe c9e86ac194 Merge remote-tracking branch 'origin/develop' 2022-06-06 10:23:37 -07:00
snipe f7449921e9
Merge pull request #11253 from snipe/features/nicer_locations_ui 
Nicer locations UI
 2022-06-06 10:23:04 -07:00
snipe 5f79534f4a Merge remote-tracking branch 'origin/develop' 2022-06-05 22:44:53 -07:00
snipe 3bcd5d94d6
Merge pull request #11254 from snipe/fixes/11224_only_show_possible_options_in_bulk_menu 
Fixed  #11224 - only show menu options if the user is allowed
 2022-06-05 22:44:26 -07:00
snipe 01348187c8 Fixed #11224 - only show menu options if the user is allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 22:41:53 -07:00
snipe b26a4ad333 Added missing headers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:35:57 -07:00
snipe 89f45d3d05 Removed extra console logs and unused variable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:16:29 -07:00
snipe e83a062eda Use translation string for model editing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:11:50 -07:00
snipe 1ea667e709 Update views with additional data fields 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:56 -07:00
snipe 5326ebd136 Removed toolbar div we weren’t using 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:45 -07:00
snipe 4db9892f8c Use partial in overdue audit screen 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:12 -07:00
snipe 880828379e Update bulki partials with new values 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:02:51 -07:00
snipe 9b54077409 Additional tweaks to BS tables partial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:02:19 -07:00
snipe 9f478b51e2 Additional JS tweaking 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 20:13:51 -07:00
snipe 7c77e03c5a Initial rework of locations display 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 18:08:15 -07:00
snipe 9d3aed42b7 Add @denzfarid as a contributor 2022-06-05 17:16:58 -07:00
snipe 3dedd51b84 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-06-05 17:16:21 -07:00
snipe 711c713ab8 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 17:15:29 -07:00
snipe 5bc5e9f108 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/lang/en/admin/locations/general.php
 2022-06-05 17:14:31 -07:00
snipe 9770692d07
Merge pull request #11251 from denzfarid/fixes/docker-php-redis-extension 
Fixed #10910  : Add php-redis extension
 2022-06-05 17:09:39 -07:00
snipe 133da6569b
Merge pull request #11252 from snipe/fixes/locations_improvements 
Fixes/locations improvements
 2022-06-05 17:05:25 -07:00
snipe 985e683896 Small display improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 16:59:53 -07:00
Raden Farid Nugraha c3698053ea Fixed ( #10910 ) : Add php redis extension 2022-06-06 06:58:07 +07:00
snipe dba06a3a9e Check for valid location before trying to print 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 16:56:15 -07:00
snipe 07b1062fb2 Better handle API calls to nonexistent users 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 16:55:23 -07:00
snipe be0933a708
Merge pull request #11249 from snipe/fixes/better_handle_bad_date_values 
Fixed crashing on date formatting helper when value is not actually a date
 2022-06-03 16:46:09 -07:00
snipe d31f185cce Display the actual value 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 15:36:52 -07:00
snipe 5901182885 Removed stray character 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 15:30:34 -07:00
snipe f033aeda83 Fixed typo in comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 15:28:00 -07:00
snipe 53f9e2bc7a Wrap the Carbon method in a try/catch to prevent crashing on bad data 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 15:25:39 -07:00
snipe 514db05770 Merge remote-tracking branch 'origin/develop' 2022-06-03 13:29:04 -07:00
snipe 7ca617f077
Merge pull request #11246 from snipe/fixes/clearer_placeholder_text_for_ldap 
Added explicit “Example:” text in placeholders
 2022-06-03 13:28:40 -07:00