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
5964 commits 101 branches 268 tags 288 MiB
Commit graph

5964 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 6373ef3283 Bumped version 2021-02-25 16:53:37 -08:00
snipe 00a7c1e9e2 Merge remote-tracking branch 'origin/develop' 2021-02-25 16:44:55 -08:00
snipe f37d5d3d03 Fixed #9085 - asset models not showing proper pagination 
Huge thanks to @inietov for catching this one
 2021-02-25 16:43:38 -08:00
snipe 57e52f0ba4 Fixed extraneous closing </i> 2021-02-25 13:35:05 -08:00
snipe dc8e06fc65 Merge remote-tracking branch 'origin/develop' 2021-02-24 09:12:27 -08:00
snipe db3f80bb9b Fixed #9198 - added stdout as a log driver 2021-02-24 09:10:03 -08:00
snipe f5dda06c55
Develop to master (#9195) 
* Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD (#9187)

* [FIX] Lite test email won't use the mail component (#9092)

* [FIX] Lite test email won't use the mail component

* Revert "[FIX] Lite test email won't use the mail component"

This reverts commit 6dab9aa1a8.

* Fix check for snipeSettings

* Remove random text from message template

* Revert "Fix check for snipeSettings"

This reverts commit 887dcc7bbc.

* Fix test notification with setupCompleted

Co-authored-by: johnson-yi <63399474+johnson-yi@users.noreply.github.com>
Co-authored-by: Oliver Walerys <owalerys@users.noreply.github.com>
 2021-02-23 14:53:55 -08:00
Oliver Walerys c3166d491a
[FIX] Lite test email won't use the mail component (#9092) 
* [FIX] Lite test email won't use the mail component

* Revert "[FIX] Lite test email won't use the mail component"

This reverts commit 6dab9aa1a8.

* Fix check for snipeSettings

* Remove random text from message template

* Revert "Fix check for snipeSettings"

This reverts commit 887dcc7bbc.

* Fix test notification with setupCompleted
 2021-02-23 14:49:40 -08:00
johnson-yi 763e17f491
Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD (#9187) 2021-02-23 11:05:22 -08:00
snipe 47b2fe571e Merge remote-tracking branch 'origin/develop' 2021-02-19 10:52:33 -08:00
snipe c8f6318aba Fixed funky layout in asset model modal window (broken HTML) 2021-02-19 10:51:56 -08:00
snipe adbb3a8f31 Merge remote-tracking branch 'origin/develop' 2021-02-19 10:20:07 -08:00
snipe 1f142fde8a Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-02-19 10:19:37 -08:00
Brady Wetherington 44eee019d9
Add variable declaration for $result (#9168) 2021-02-19 10:19:24 -08:00
snipe f636aac2dd Add @sw-mreyes as a contributor 2021-02-19 10:11:52 -08:00
snipe 54fd1b993b Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2021-02-19 10:11:23 -08:00
snipe a5731a3088 Updated hash 2021-02-19 10:09:22 -08:00
snipe 6449d0aaf9 Sigh. Real assets 2021-02-19 10:06:06 -08:00
snipe 931e2df3bd Updated production assets 
# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
 2021-02-19 10:05:29 -08:00
snipe 7f8eddede6 Updated compiled assets 2021-02-19 10:02:30 -08:00
snipe 4ddab03792 Merge branch 'develop' of https://github.com/sw-mreyes/snipe-it into sw-mreyes-develop 
# Conflicts:
#	public/mix-manifest.json
 2021-02-19 10:00:35 -08:00
snipe ff341caf34 Merge remote-tracking branch 'origin/develop' 2021-02-18 14:21:34 -08:00
snipe 5754f0aa3f Revert "Added logic to handle the CLI importer. (#9088)" 
This reverts commit 2e2d087639.
 2021-02-18 14:21:19 -08:00
snipe 785bc40d9d Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	public/css/dist/skins/skin-black.css
#	public/css/dist/skins/skin-blue.css
#	public/css/dist/skins/skin-green.css
#	public/css/dist/skins/skin-orange.css
#	public/css/dist/skins/skin-purple.css
#	public/css/dist/skins/skin-red.css
#	public/css/dist/skins/skin-yellow.css
#	public/mix-manifest.json
 2021-02-17 13:50:14 -08:00
snipe 9d50e0e8d0 Fixed weird table formatting in expected checkin report 2021-02-17 13:44:35 -08:00
snipe 9deb4204c8 Fixed #9116 - incorrect parameter name sent to hardware.show in expected assets report 2021-02-17 13:41:08 -08:00
snipe 1ab349a63d Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-02-17 13:34:59 -08:00
Ivan Nieto 2e2d087639
Added logic to handle the CLI importer. (#9088) 2021-02-17 13:13:17 -08:00
snipe bfadb2cea6 Add @koelle25 as a contributor 2021-02-17 12:58:57 -08:00
Kevin Köllmann 44eb67440a
Fixed #9115: Duplicate column name 'provider' (#9137) 2021-02-17 12:57:08 -08:00
Godfrey Martinez 8fb97da314
Color of asset selection in bulk checkout [ch15525] (#9145) 2021-02-17 12:56:26 -08:00
Ivan Nieto 12ff465cdb
Added feature: Checkbox Custom Fields as list of values. (#9112) 
* Added functionality for checkboxes in custom fields. Similar to how radio buttons work.

* Added the same functionality when the custom fieldset is encrypted.

* Added missing bits, so the edit custom assets view shows what values have been already stored in database
 2021-02-16 17:20:29 -08:00
Ivan Nieto f89d789832
Fixes #8918 The validation rules on Manufacturer Model 'name' attribute are malformed. (#9133) 
* Fixes the validation rules on Manufacturer Model

* Fixes a little issue; if the manufacturer is active soft-deletes it, if is already deleted permanently deletes it
 2021-02-16 12:52:55 -08:00
Marcelo Reyes 4c3b46ea88 Fixed #9129: add missing function formatDatalistSafe to snipeit_modals.js 2021-02-16 13:50:00 +01:00
snipe 834e0a9dd5 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2021-02-05 14:29:13 -08:00
snipe 681c41bd18 Bumped version 2021-02-05 14:28:31 -08:00
snipe 74488ddceb Added provider column to oauth_clients table for passport upgrade 2021-02-05 14:27:56 -08:00
snipe 19820f1b42 Merge remote-tracking branch 'origin/develop' 2021-02-03 16:08:36 -08:00
snipe 2a88781cd5 Add @Kurokat as a contributor 2021-02-03 16:07:25 -08:00
snipe f96c867bd3 Update @ghost as a contributor 2021-02-03 16:07:06 -08:00
snipe 06f8e8620a Add @EDVLeer as a contributor 2021-02-03 16:06:28 -08:00
snipe 95d907c9e9 Add @sean-borg as a contributor 2021-02-03 16:06:14 -08:00
snipe d990152856 Add @andres-baller as a contributor 2021-02-03 16:05:45 -08:00
snipe 05609230b2 Add @ncareau as a contributor 2021-02-03 16:05:21 -08:00
snipe 220c254093 Add @benwa as a contributor 2021-02-03 16:05:06 -08:00
snipe 02313ce361 Add @fashberg as a contributor 2021-02-03 16:04:47 -08:00
snipe e70f7c610a Add @winstan as a contributor 2021-02-03 16:03:20 -08:00
snipe 32f77c3285 Add @alek13 as a contributor 2021-02-03 16:02:49 -08:00
snipe 0a639f4fcc Add @ThoBur as a contributor 2021-02-03 16:02:38 -08:00
snipe f2b55fb641 Add @PauloLuna as a contributor 2021-02-03 16:02:27 -08:00