DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
6309 commits 101 branches 268 tags 320 MiB
Commit graph

6309 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Nieto Vivanco ea1d7a42e2 Add condition to check if action_date have value and if it have assign it to created_at parameter 2021-09-01 13:08:08 -05:00
snipe 4293674f4a Added a few more fields to the users API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-31 12:36:06 -07:00
snipe aeae681326 Fixecd copypasta from state to zip 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-31 12:28:20 -07:00
snipe 4794f93224 Added additional fields for user search 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-31 12:24:53 -07:00
snipe f58ed6bd1f
Merge pull request #9982 from Shankschn/master 
Fixes: When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.
 2021-08-31 11:08:52 -07:00
snipe 96c0dba92b
Merge pull request #10011 from inietov/fixes/quotations_turn_into_html_entity 
Fixes Quotations turn into HTML entity
 2021-08-31 11:00:38 -07:00
Ivan Nieto Vivanco d917ae51b7 Remove e() function from other input fields 2021-08-31 04:01:20 -05:00
Ivan Nieto Vivanco e7470b5545 Remove e() function from the saved notes when updating an asset maintenance 2021-08-31 03:50:57 -05:00
snipe 7e2def7896
Merge pull request #9880 from inietov/bug/fd18463/cannot_edit_departments 
Fixes: Can't update departments if Full Company Support is activated
 2021-08-30 19:40:59 -07:00
snipe a02534b6c8
Merge pull request #10009 from inietov/fixes/blank_results_for_non_superadmins 
Fixes #9985. Error 500 when using the asset search - blank results for non super-admins
 2021-08-30 13:29:18 -07:00
snipe 5c92ddb2c6 Fixed version back to develop from master downmerge 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-30 12:57:06 -07:00
snipe 6d3a82aacf
Merge pull request #10008 from uberbrady/fix_unlink_error_ldap 
Fixed rb445 and rb446 - the unlink calls for the client-side certs...
 2021-08-30 12:47:38 -07:00
Brady Wetherington da0b375773 Fixed rb445 and rb446 - the unlink calls for the client-side certs 
need to be wrapped around a file-existence check
 2021-08-30 12:29:16 -07:00
Ivan Nieto Vivanco d1304cc975 Add sentence to infer the table's name according to the query passed 2021-08-30 13:44:26 -05:00
snipe 085be16966 Merge remote-tracking branch 'origin/develop' 2021-08-25 14:45:41 -07:00
snipe 127a3e41bd
Merge pull request #9993 from inietov/fixes/exception_when_checkin_licenses_from_assets 
Fixes Exception when Checkin Licenses from Assets
 2021-08-25 14:45:14 -07:00
Ivan Nieto Vivanco 4a79c77630 Add a condition to checkin licenses assigned to Assets 2021-08-25 16:38:34 -05:00
snipe e21b21fbde
Merge pull request #9990 from inietov/fixes/cannot_upload_files_to_assets 
Fixed #9440 Change condition to return the actual max upload size allowed to files
 2021-08-25 13:39:23 -07:00
Ivan Nieto Vivanco 137f55e4ce Change condition to return the actual max upload size allowed to files 2021-08-25 15:27:25 -05:00
snipe 4abb9baa95 Merge remote-tracking branch 'origin/develop' 2021-08-24 15:29:41 -07:00
snipe 36ddc7dea7
Merge pull request #9980 from inietov/fixes/display_custom_field_not_holding_value 
Fixes:  Display custom field not holding value
 2021-08-24 15:12:15 -07:00
snipe 80b411c94b
Merge pull request #9986 from uberbrady/fix_client_side_ldap_cert_settings 
Make the LDAP Client-side certificate fields Nullable
 2021-08-24 15:10:49 -07:00
Brady Wetherington ae65e2a0a0 Adding explicit default(null), and removing the nullable() attribute on the down() migration 2021-08-24 14:15:55 -07:00
Brady Wetherington 2d578a9864 Make the LDAP Client-side certificate fields Nullable 2021-08-24 12:52:03 -07:00
Shanks 961e80404a
Update AssetsController.php 
Fix：When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.
 2021-08-24 16:39:58 +08:00
Ivan Nieto Vivanco 830ba470dd Change the used function to only affect single and double quotes 2021-08-23 22:10:59 -05:00
Ivan Nieto Vivanco 80fb24e861 Fix issue caused for single and double quotes when used as listbox's values 2021-08-23 22:00:01 -05:00
snipe 70f6753f50
Merge pull request #9979 from uberbrady/add_client_side_ldap_certs 
Add client side ldap certs
 2021-08-23 16:30:46 -07:00
snipe 9285697611 Merge remote-tracking branch 'origin/develop' 2021-08-20 17:30:52 -07:00
snipe 9687bcb41c Fixed issue where consumables model number was not searchable 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-20 17:30:35 -07:00
snipe 4ec4e0f44e Merge remote-tracking branch 'origin/develop' 2021-08-19 12:09:48 -07:00
snipe ff8faab3be
Merge pull request #9960 from uberbrady/fix_null_sum_totals 
Fix regression for NULL valued numbers in the summary calculation
 2021-08-19 12:08:33 -07:00
Brady Wetherington e28db2d221 Fix regression for NULL valued numbers in the summary calculation 2021-08-19 12:01:47 -07:00
snipe 24af2ab67a Merge remote-tracking branch 'origin/develop' 2021-08-18 14:31:53 -07:00
snipe 7b447a2f16 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-08-18 14:31:38 -07:00
snipe f5112b47cd
Merge pull request #9953 from uberbrady/fix_bootstrap_sum_formatter 
Fixed ch17133 - Fixed sum total calculation on Bootstrap Table pages -
 2021-08-18 14:31:10 -07:00
Brady Wetherington 4519f6e180 Fixed sum total calculation on Bootstrap Table pages 2021-08-18 14:13:31 -07:00
snipe 6f7718dd0e
Merge pull request #9950 from inietov/fixes/ch945/status_colors_are_not_displaying_correctly 
Looks great, thanks!
 2021-08-18 14:09:26 -07:00
Ivan Nieto Vivanco f04e23cacb Add a small refactor so we not repeat logic 2021-08-18 15:22:53 -05:00
Brady Wetherington 1b66f7f719 Add new client-side LDAP SSL certs to .gitignore 2021-08-18 13:22:36 -07:00
Ivan Nieto Vivanco 4207858a14 Fix the count in StatuslabelsController@getAssetsCountByStatuslabel() function that allows it to pass the correct index 
Also edit the default color for assets with the Pending label, so it match the color in the docs
 2021-08-18 14:08:35 -05:00
snipe b88fde5dae Nicer comment formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 12:07:09 -07:00
snipe 04fa5f2022 Merge remote-tracking branch 'origin/develop' 2021-08-18 01:05:25 -07:00
snipe 923d2a79ae Fixed weird layout on bulk audit [ch17146] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 01:05:09 -07:00
snipe c970464690 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 00:48:05 -07:00
snipe f99602c039 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2021-08-18 00:47:33 -07:00
snipe 0aa328f908 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 00:45:35 -07:00
snipe f8562e5835 Recompiled assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 00:45:02 -07:00
snipe 8a6c7269d3 Fixed border radius for bulk checkout field [ch16936] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 00:44:55 -07:00
snipe 37f2c7beac Nicer bulk asset select width 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 00:44:16 -07:00