DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 09:34:10 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
5850 commits 95 branches 267 tags 295 MiB
Commit graph

5850 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 6234c6e5fc Fixed typo 2020-10-05 20:35:27 -07:00
snipe 0cd19c87bf Added utility to delete barcode cache from labels/barcodes setting 2020-10-05 20:34:17 -07:00
snipe 14a10f60d9 Undo previous change (it was an intentional choice) 2020-09-29 15:24:50 -07:00
snipe 186e229190 Make date example reflect actual date 2020-09-28 19:01:58 -07:00
snipe dafac4ceb3 Disable ldap_enabled on demo, fixed some incorrect error messages 2020-09-25 19:04:38 -07:00
snipe 98b9ee9b25 Only save LDAP settings if not in demo mode 2020-09-25 18:38:26 -07:00
snipe 01548ba39d Add ad_append_domain to settings controller 2020-09-25 18:27:22 -07:00
snipe 695774a3fb Corrected throttle string 2020-09-24 23:39:32 -07:00
snipe 98246de4c7 Disable SAML on the demo 2020-09-24 19:25:28 -07:00
snipe da9896b59a Remove SAML settings on demo reset 2020-09-24 19:13:31 -07:00
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