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

5773 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 5e6db0b219 Removed platform req 2021-02-02 20:30:33 -08:00
snipe 124343911f Merge remote-tracking branch 'origin/develop' 2021-02-02 16:57:18 -08:00
Brady Wetherington 462f8c791f
Hotfix to develop to yank extraneous e() (#9080) 2021-02-02 16:44:54 -08:00
Brady Wetherington 9a224a07ba
Modified how we do Select2 dynamic drop-down menus to be more secure (#9079) 
* Modified how we do Select2 dynamic drop-down menus to be more secure

As noted by the author of select2, the more-secure way of creating
rich Select-dropdowns is to use jquery to create HTML snippets and
carefully modify text attributes within there. This prevents any
XSS from being brought to the page. As a side-effect, the extra
escaping that we had to do in all of the internal selectlist calls
is now no longer necessary, and has been removed. Rebased and
squashed from the original.

* Rebuilt all assets, but this still feels like it's too much stuff in here.

* Whoops, need to run that in dev, not prod
 2021-02-02 15:55:21 -08:00
Ivan Nieto df4686bc96
Added a clause that lets the function that updates the department to fail gracefully if no dept. name is provided in the CSV passed to the Importer. (#9078) 2021-02-02 12:23:36 -08:00
snipe b6c432a596 One more line of logging for purges 2021-02-02 02:20:30 -08:00
snipe de9f487664 Merge remote-tracking branch 'origin/develop' 2021-02-02 01:59:13 -08:00
snipe ef668317a9 Log user initiating a purge 2021-02-02 01:58:50 -08:00
Godfrey Martinez cf368a4577
fixed an issue with links colors (#9073) 
* fixed an issue with links colors

* corrected btn-default's color
 2021-02-01 13:50:37 -08:00
snipe 2e71968c04 Merge remote-tracking branch 'origin/develop' 2021-01-27 17:44:36 -08:00
snipe fdb5b3baf1
Depreciation detail view fixes [ch15776] (#9059) 
* Allow sorting by months for depreciation list view

* Added dataTableLayout to standardize the list display table

* Implement the dataTableLayout() on the list view blade

* Split the view into tabs so we can combine asset depreciations and license depreciations

* Updated depreciation view to use tabbed interface for assets and licenses

* Added asset models to depreciation details page

* Make asset model category sortable

* Added cateory as allowed to be sorted on

* Added category sort scope

* Removed offset variable

* Small fixes to asset modes display in depreciation to bulk edit models
 2021-01-27 17:44:05 -08:00
snipe c745fa095b Merge remote-tracking branch 'origin/develop' 2021-01-27 15:38:15 -08:00
Brady Wetherington 70e6a6ced6
Fix issue where users with edit permission cannot invoke LDAP sync (#9058) 
* Fix issue where users with edit permission cannot invoke LDAP sync

* Make User::class consistent with usage elsewhere in the same directory
 2021-01-27 15:36:43 -08:00
Ivan Nieto 6772835efc
Added support for radio buttons in Custom Fields. (#9053) 2021-01-27 14:41:58 -08:00
snipe fb482b0dd6 Fixed translation string in Depreciation view [ch15776] 2021-01-27 14:09:01 -08:00
snipe 9f43d3345f Merge remote-tracking branch 'origin/develop' 2021-01-27 12:49:33 -08:00
Ivan Nieto 6e83679528
Instead of return a JSON response, redirect back to the previous screen (#9055) 2021-01-27 12:01:42 -08:00
snipe a050aba72f Merge remote-tracking branch 'origin/develop' 2021-01-27 01:34:57 -08:00
snipe 0031fab0fe
Added termination date, depreciation in license column selection [ch14505] (#9052) 2021-01-27 01:34:32 -08:00
snipe 585bdff364 Added other logo for demo 2021-01-27 00:35:32 -08:00
snipe 1d9741a49e Merge remote-tracking branch 'origin/develop' 2021-01-26 22:12:39 -08:00
snipe 9f7f1460e9 Simplified availableForCheckout() on asset 2021-01-26 22:12:24 -08:00
snipe f871759753 Bumped version to 5.0.13-pre 2021-01-26 20:08:44 -08:00
snipe 8e17818f1e Bumped version to 5.0.13-pre 2021-01-26 20:08:08 -08:00
snipe d19c6ab8e7 Use fadeIn/fadeOut for password reset page for nicer look 2021-01-26 20:05:01 -08:00
snipe d14b1e3825
Added better visual cues for login (#9051) 
* Added better visual cues for login

* Changed box header class to box-header with-border to match other screens

* Since we have all.js now, added class=“minimal” to use icheck
 2021-01-26 19:57:39 -08:00
snipe ba12ee9954 Specifically call out username in forgotten password 2021-01-26 18:00:50 -08:00
Evgeny d8bb69533c
To eliminate 12/24hours ambiguity fix. This fix prevents loss of time accuracy. (#8887) 
Its a tiny fix to eliminate 12/24hours ambiguity. Fix prevents time accuracy loss in field "last_audit_date" for assets.
 2021-01-26 12:22:59 -08:00
snipe 01d3606c42 Merge remote-tracking branch 'origin/develop' 2021-01-26 12:20:57 -08:00
sigmoidal 208f1db3b2
Update .htaccess (#9001) 
.htaccess will work on both apache v2.2 and v2.4 (without this change, on upgrade, an internal error on the server occurs)
 2021-01-26 12:20:03 -08:00
Peter Dave Hello e5b02da54b
Fix apk add usage in Dockerfile.alpine (#9032) 
There is no need to use `--update` when `--no-cache` is already
specified. Use `--no-cache` only will make `apk` leave no local cache
and make the image smaller.
 2021-01-26 12:12:00 -08:00
Vincent Lainé d6ead5ae17
Added #8931: add health controller without session (#8978) 
* Added health controller

* Trying to move session middleware to web and api group to have health controller without session

* Fix health route store the session

Co-authored-by: Vincent Lainé <v.laine@dental-monitoring.com>
 2021-01-26 12:10:54 -08:00
Ian Littman 1d7d31b9ae
Optimize target type + ID index for more realistic use cases (#8923) 
Per https://youtu.be/EOXgHH4-WX4?t=1378 or thereabouts
 2021-01-26 12:08:25 -08:00
Brady Wetherington 2a817c2123
Add migration for ldap_server URL's to ensure they at least start with ldap:// or ldaps:// (#8936) 2021-01-26 12:07:32 -08:00
Lucas Pleß f3a7467235
Added today as default Date for checkout Form. (#8938) 2021-01-26 12:06:58 -08:00
Ivan Nieto 2da6f9136f
Add 'Last Audit Date/Next Audit Date' filter to custom report (#8989) 
* Add 'Last Audit Date/Next Audit Date' filter to custom report

* Added a constraint: cannot require a report with a Last Audit Date in the future.
 2021-01-26 12:05:31 -08:00
Ivan Nieto 79549dbfb9
Use the correct env variables in config/auth.php file. (#9048) 2021-01-26 12:04:41 -08:00
snipe a48d09f37e
Fixed non-superadmin gate permissions for kits (#9029) 2021-01-26 11:56:42 -08:00
Godfrey Martinez 0dc78fdea6
fixed color schema on dark mode skins for links (#9034) 2021-01-21 14:41:42 -08:00
snipe 75a8639a20 Fixed weird checkbox display 
TODO: fix the 500 on the save
 2021-01-12 18:16:42 -08:00
snipe 380c6171b7 Check if the asset is deployed before prompting for an expected checkin date 2021-01-12 18:02:10 -08:00
snipe d36d6b8e07 Added expected_checkout as editable field in asset edit 2021-01-12 16:48:49 -08:00
snipe c00a1fa21b Added new generic datepicker partial 2021-01-12 16:48:32 -08:00
snipe bbcd215ea4 Suppress OAuth token errors 2021-01-12 08:58:40 -08:00
Godfrey Martinez 444f9a81da
Bug/ch15603/read only text field in saml screen dark (#8993) 
* fixed dark mode skins read only color schema

* fixed dark mode skins read only color schema
 2021-01-11 14:07:55 -08:00
snipe b4eee5a9b7 Merge remote-tracking branch 'origin/develop' 2021-01-05 19:40:25 -08:00
Ivan Nieto 72f9fe444d
Fix for default parameters in JS functions IE (#8973) 
* Small fix for IE which doesn't support default parameters in the function definition

* Stylistic changes for better comprehension
 2021-01-05 19:25:30 -08:00
snipe eb423c252a Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2021-01-04 09:09:39 -08:00
snipe 382fb31670 Updated translations (Finnish, Polish, Japanese, Turkish, Spanish) 2020-12-30 12:51:09 -08:00
snipe e6ba4a423d Fixed #8721 - duplicate asset tags in select list when asset has name 2020-12-21 13:43:54 -08:00