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

5411 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 3b6fb68ff1
Added space between padlock icon and demo warning text 2020-09-15 11:40:36 -07:00
snipe bfd024fdfd
Merge pull request #8434 from inietov/bug/ch15182/make-all-of-the-this-feature-has-been-disabled 
Thanks!
 2020-09-15 11:21:35 -07:00
snipe 4d6a8d48ee
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-09-15 10:15:17 -07:00
snipe e464f0edf3
Small UI tweaks for kits 2020-09-15 10:15:14 -07:00
snipe 426897c902
Bumped hash 2020-09-15 10:13:55 -07:00
snipe cfd78fa870
Merge pull request #8435 from inietov/bug/ch15188/v5-500-server-error-in-update-general-settings 
Looks great, thank you!
 2020-09-15 02:34:59 -07:00
Ivan Nieto 501d5680ea Fix [ch15188] 500 error 2020-09-15 03:51:10 -05:00
Ivan Nieto 291997c915 Change the class of a reusable element so the icon changes from a warning to a padlock 2020-09-15 01:32:46 -05:00
snipe 912401a0a0
Change warning icon to padlock icon 2020-09-12 12:07:56 -07:00
snipe ec5daa387b
Better explanation for demo mode 2020-09-12 10:04:57 -07:00
snipe 24a52eaeae
Bumped hash 2020-09-12 10:04:36 -07:00
snipe e448b626e2
Removed pagaination from dashboard 2020-09-12 08:37:37 -07:00
snipe ac2403e8fc
Fixed markdown issue in markdown notifications 2020-09-11 17:12:33 -07:00
snipe cf545f0ed1
Fixed form layout on accessory checkin page 2020-09-11 16:20:56 -07:00
snipe 52848ca8d8
Fixed checkin/checkout notification crashing 2020-09-11 16:10:18 -07:00
snipe a91e81fc42
Added checkin_email to category listing 2020-09-11 16:06:38 -07:00
snipe e750b2b2da
Added envelope css to overrides for table header 2020-09-11 16:06:19 -07:00
snipe d3d64bd85c
Removed asset tag from accessory checkin markdown notification 2020-09-11 16:06:02 -07:00
snipe 514e7ca072
Added boolean has_eula to categories 2020-09-11 16:05:42 -07:00
snipe 0f22cf6807
Fixed #8428 - Added purchase cost column to user tabs 2020-09-11 11:48:51 -07:00
snipe 2f435a57c1
Fixed #8426 - show model number in custom fields model listing 2020-09-11 11:27:30 -07:00
snipe f949a95cfb
Merge pull request #8423 from snipe/fix_ldap_test_php74 
Fix ldap test php74
 2020-09-09 14:38:26 -07:00
Brady Wetherington f3f7d714a6 Fix ldap test button for php 7.4 (suppressing errors) 2020-09-09 14:18:05 -07:00
snipe b258f34bce
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop 2020-09-09 12:27:01 -07:00
snipe 3d4e1d4641
Merge pull request #8419 from snipe/fixes/ldap_init_fix_for_migrations 
Hopefully fixes #8418 - migrations on new install go wonky because of…
 2020-09-09 12:26:01 -07:00
snipe cb5104c27d
Hopefully fixes #8418 - migrations on new install go wonky because of LDAP service provider 2020-09-08 21:13:24 -07:00
snipe 5e3ccd1004
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-09-08 18:29:38 -07:00
snipe 82e0b1ffd8
Fixed [ch15130] - update the seeder to clear requested assets table 2020-09-08 18:29:02 -07:00
snipe 5b68a321a6
Added comapny formatter to asset maintenance report - fixes [ch15119] 2020-09-08 18:15:45 -07:00
snipe 251ef82741
Added company formatter to asset maintenance report 2020-09-08 18:14:21 -07:00
snipe 327583f055
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop 2020-09-04 16:24:17 -07:00
snipe acd15bc3e4
Fixed DB seeder to truncate the asset_maintenances table 
This wouldn’t have affected anything in production, but could cause some weird behavior if re-seeding often, since the suppliers table gets stomped on but the old maintenances remained, leaving ghost entries and associating the wrong (old, now defunct) supplier with the maintenance as new supplier IDs get generated.
 2020-09-04 16:23:58 -07:00
snipe aabf9b6f9c
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop 2020-09-04 16:02:38 -07:00
snipe 10648de9af
Bulk Checkin and Delete also edit users [ch15107] 2020-09-04 16:02:25 -07:00
snipe 97743160ef
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop 2020-09-04 15:45:03 -07:00
snipe 1bea83ee5a
Fixed missing setting call 
This is still broken further down the line in the event handler for license checkin, but this gets us closer
 2020-09-04 15:44:37 -07:00
snipe d9e7a457d4
Fixed regression on select menus [ch15093] 
Custom report doesn’t pass an $item, so we have to check for that in that required check
 2020-09-04 15:43:49 -07:00
snipe 5f5b80acae
Added maintained and reassignable to license listing 2020-09-04 10:02:04 -07:00
snipe ba06507e10
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop 2020-09-03 19:47:50 -07:00
snipe 69d7000922
Fixed [ch15085] - duplicate use statements in Consumables controller 2020-09-03 19:47:15 -07:00
snipe 96abe54aad
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop 2020-09-03 19:41:09 -07:00
snipe 249b9b7509
Fixed [ch15086] - [object object] in companies date displays 2020-09-03 19:40:17 -07:00
snipe 25cb489b76
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop 2020-09-03 17:00:26 -07:00
snipe 0eeeb24cae
Added data-validation=“required" to appropriate field partials 2020-09-03 16:59:42 -07:00
snipe 0503a51cae
Corrected validation to match model 2020-09-03 16:58:45 -07:00
snipe 2e0f7921a8
Removed commented out javascript 2020-09-03 16:58:16 -07:00
snipe c29ec6a100
Removed duplicate state field 2020-09-03 16:00:26 -07:00
snipe a57ab29af6
Accessibility features for custom fields icons 2020-09-03 15:55:52 -07:00
snipe b8ddbadd2b
Use icons for 2FA, LDAP, etc info on user view 2020-09-03 15:55:41 -07:00
snipe 3e120812e3
Removed 2FA reset button if the user is not enrolled in 2FA 2020-09-03 15:55:20 -07:00