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

912 commits

Author SHA1 Message Date
Ivan Nieto Vivanco fbb7c55450 Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models 2023-05-04 03:12:36 -06:00
snipe b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset 
Added ability to auto-add fields to new fieldsets
 2023-05-03 11:04:33 -07:00
snipe ea17fdeba5
Merge pull request #12846 from snipe/features/livewire_location_import 
Location importer via Livewire Importer
 2023-05-03 11:02:06 -07:00
snipe 4a643c1252
Merge pull request #12880 from Godmartinz/asset_total_cost 
Added component costs to asset view
 2023-05-03 10:49:03 -07:00
snipe aa814cf761 Fixed #12946 - warranty lookup url was not nullable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-29 13:47:52 -07:00
snipe 7974c172fd Switch back to “normal” url for support 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:48:38 -07:00
snipe 54a766c4f9 Added dynamic warranty URL to manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:39:15 -07:00
snipe 5eac314f4d
Merge pull request #12906 from akemidx/feature/sc-20622 
Dynamic warranty link for manufacturers' support urls
 2023-04-26 14:49:22 -07:00
akemidx 497d17835f requested edits 2023-04-26 17:06:08 -04:00
akemidx aab53cf683 remove regex, add in starts_with 2023-04-26 15:18:13 -04:00
snipe 22d73f503a
Merge pull request #12756 from dboth/develop 
Fixed #8208, #8896, #8985 and #9789:  Currency issues when using non-english locales (resubmission)
 2023-04-25 22:32:13 -07:00
snipe 970b5e556c
Merge pull request #12903 from marcusmoore/bug/sc-15034 
Fixes sending webhook notifications for checkout and checkin
 2023-04-25 22:22:58 -07:00
snipe d6ea5de5b8 Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset 2023-04-25 22:20:50 -07:00
snipe c8c6f879d4
Merge pull request #12912 from Godmartinz/ldap_location_sync 
added ldap_location to settings
 2023-04-25 21:54:28 -07:00
snipe 27477085fe Merge branch 'develop' into features/auto_add_to_fieldset 2023-04-25 21:31:50 -07:00
snipe 07336bbc6a Added auto_add_to_fieldsets field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:51:36 -07:00
Brady Wetherington 3da5df0127 Change from a standard Eloquent mapping for ID to a custom setRead 2023-04-25 11:50:55 -07:00
Godfrey M 20d8ff2a4f removed a typo 2023-04-25 11:49:33 -07:00
Godfrey M cb68f41d9c added ldap_location to settings 2023-04-25 11:44:04 -07:00
akemidx 9cd2783185 Regex added for link instead 2023-04-24 20:07:21 -04:00
Godfrey M bd212b3108 adds component costs to asset view 2023-04-19 16:35:06 -07:00
Marcus Moore 15280c435e
Merge branch 'develop' into bug/sc-15034 2023-04-19 11:45:16 -07:00
snipe 9da36833be Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:43:44 -07:00
snipe e84ba0c7a0 Revert back to old method name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:06:32 -07:00
snipe de78f8d41f Renamed/refactorered licenses method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:01:44 -07:00
snipe 6ab4314221 Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:01:13 -07:00
Marcus Moore 2d56675ade
Merge branch 'develop' into bug/sc-15034 
# Conflicts:
#	database/factories/SettingFactory.php
 2023-04-17 17:22:55 -07:00
snipe 99cecee4b5
Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui 2023-04-17 14:54:30 -07:00
snipe e0c53d8d09 Remove start/end dates form casts array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 09:33:31 -07:00
snipe 6acce098c9 Added autoassign_licenses on user model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:24:56 -07:00
snipe bceb0b8a47 Allowed slightly longer zip codes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:46:29 -07:00
snipe 6097d534e9 Added eloquent model relationships 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:10:16 -07:00
snipe 74babfa081 Added maxlength="10" 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 08:26:36 -07:00
snipe afd01869a5 Check for Carbon exception 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-11 23:35:41 -07:00
snipe ffdc0d76f7 Fixed accessories verifying that enough remain to be checked out 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 18:40:29 -07:00
snipe 161999fbca Fixed #12772 - use the APP_URL config more consistently 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-05 16:05:40 -07:00
Marcus Moore 6df8f0f35c
Merge branch 'develop' into bug/sc-15034 2023-04-05 11:49:53 -07:00
slong753 8c1c0e81b6 rm deplicates 2023-03-30 13:31:58 -05:00
slong753 e126a75f7a pretty sure this was it 2023-03-29 21:37:26 -05:00
Dominik Both 3271c9dc9f Fix #8208, #8896, #8985, #9789 2023-03-29 09:56:34 +02:00
Marcus Moore fa69a580ab
Start to scaffold license checkout notification test 2023-03-23 17:18:33 -07:00
Marcus Moore 2dcf4e3d16
Standardize on sending anonymous notifications for asset checkouts 2023-03-23 16:31:40 -07:00
Marcus Moore fe6295a5e4
Update slack_* properties to webhook_* 2023-03-22 14:43:00 -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 8dd3ae8a37 Corrected gates, added fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 11:53:20 -07:00
snipe 7f8bdbd252 Added showableAssets() relationship to Category model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:01:38 -08:00
Brady Wetherington 09c1298e03 Merge branch 'develop' into livewire_importer_2_squashed_and_rebased 
I'll be taking in the changes to the importer front-end elsewhere
 2023-03-07 18:51:05 -08:00
snipe ea54f540de Dynamically determine target route for expected checkin emails 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 13:42:51 -08:00
Godfrey M e5deb4b413 doesn't allow months to be zero 2023-03-06 09:41:14 -08:00
Brady Wetherington c48e19d236 Whoops, went a little overboard there. Whoopsie! 2023-02-28 22:51:48 -08:00