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

5390 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe b0e9875a50 Counting is hard. :( 2020-09-24 14:20:29 -07:00
snipe 7314bc4c4e Bumped hash for newest RC 2020-09-24 14:19:34 -07:00
snipe ba70e07637
Merge pull request #8466 from benwa/gmaps-8465 
Changes Google Map to be a bit more detailed
 2020-09-22 17:59:45 -07:00
Bennett Blodinger 83dfa2a28c
Merge branch 'develop' into gmaps-8465 2020-09-22 17:41:38 -05:00
Blodinger 471e0fd2fc Changes the Google Maps window to be a bit more detailed 2020-09-22 14:30:38 -05:00
snipe 4bd140c324
Merge pull request #8451 from snipe/fixes/fix_ldap_js 
No longer toggle the 'disabled' attribute for ldap_server based on is_ad
 2020-09-17 14:14:23 -07:00
Brady Wetherington 0e823a962b Fix for #8424 - where the ldap_server setting was grayed out 2020-09-17 13:32:14 -07:00
snipe 002ca52c83 Standardize feature disabled messages in UI 2020-09-16 15:09:58 -07:00
snipe 9793d75947
Merge pull request #8445 from snipe/improve_slack_test_flow_js 
Improve slack test flow js
 2020-09-16 13:28:10 -07:00
Brady Wetherington 8331be05aa Some fancy JS to enable/disable Slack-test based on field values 2020-09-16 13:15:39 -07:00
snipe e8dfb71682 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 
# Conflicts:
#	resources/views/settings/slack.blade.php
 2020-09-16 12:40:23 -07:00
snipe 7de685a1c1 Added demo disabled text on slack screen 2020-09-16 12:36:33 -07:00
snipe b508482441
Merge pull request #8438 from snipe/features/nicer_slack_ui 
Nicer slack settings UI
 2020-09-16 12:29:58 -07:00
snipe 30f8431bfb Added required field indicator 2020-09-16 12:29:20 -07:00
snipe 81548e581d Fixed #8443 - wrong value for array_key_exists on location import 2020-09-16 11:45:47 -07:00
snipe a3e738b283 Fixed #8442 - wrong CSS url path on /setup 2020-09-16 11:20:59 -07:00
snipe ed3afd1e2e Removed debugging 2020-09-15 23:19:52 -07:00
snipe 74b96a7413 UI tweaks and updated JS to disable the save button if the settings are not correct 2020-09-15 23:14:10 -07:00
snipe 3ceff29e04 Added some translations for Slack integration 2020-09-15 23:05:42 -07:00
snipe 7736f12eb4 Switch to Guzzle for the Slack test 2020-09-15 23:05:27 -07:00
snipe b1dda88c9d Removed SlackTest notification 2020-09-15 23:05:05 -07:00
snipe 440ca686e4 More verbose warning for data purge 2020-09-15 20:53:07 -07:00
snipe 4fd5358aa8 Changed login attempts icon so it’s not the same as SAML 2020-09-15 20:27:01 -07:00
snipe 2855a9b2e8 Added debugging to file upload for easier diagnostics 2020-09-15 20:07:46 -07:00
snipe e8befe9afd Increased favicon filesize max 2020-09-15 20:07:29 -07:00
snipe d5f8e93d7c Moved delete logo option higher for nicer layout 2020-09-15 19:52:34 -07:00
snipe 303388e1f5 Added a space between favicon help text blocks 2020-09-15 19:50:15 -07:00
snipe b9e19468e5
Bumped version for v4.9.5 2020-09-15 18:43:19 -07:00
snipe 9601bf6edd
Make “remove image” text clearer 2020-09-15 11:57:40 -07:00
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