Giuseppe Iannello
5edbb4b229
Support Google Cloud IAP ( #8768 )
...
Following up on 7c2da81700
2021-02-03 11:59:55 -08:00
ThoBur
c40b8334fc
Update edit.blade.php ( #8876 )
...
Fix issue #8518
2021-02-03 11:59:05 -08:00
snipe
0a37c9564a
Merge remote-tracking branch 'origin/develop'
2021-02-03 01:30:11 -08:00
snipe
985193ffff
Fixed #9082 - allow deployable status type on checkout
2021-02-03 01:29:54 -08:00
snipe
721add5bc1
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
2021-02-03 00:57:58 -08:00
snipe
ff8fa6ec77
Production assets for better contrast in dark mode skins
2021-02-03 00:52:23 -08:00
snipe
e0a6f22489
Small fixes to dark mode skins
2021-02-03 00:49:09 -08:00
snipe
030fdd60ff
Switched branch name to master
2021-02-02 21:49:21 -08:00
snipe
fdde844ce5
Bumped version to 5.1.0
2021-02-02 21:48:42 -08:00
snipe
d263990401
Updated min requirements in composer.json
2021-02-02 21:29:09 -08:00
snipe
bf7a856fa6
Update minimum PHP requirements to 7.2.5
2021-02-02 21:05:37 -08:00
snipe
1e062d4fc8
Re-applying laravel update with PHP min 7.2.5
2021-02-02 20:58:15 -08:00
snipe
ca37de5e45
Ugh. Rolling back composer.lock
...
Everything sucks
2021-02-02 20:44:07 -08:00
snipe
9ba2fd93c1
Reverted Laravel upgrade :(
2021-02-02 20:34:23 -08:00
snipe
a2e177e754
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-02-02 20:30:36 -08:00
snipe
5e6db0b219
Removed platform req
2021-02-02 20:30:33 -08:00
Brady Wetherington
b09ded2a3b
Upgrade laravel ( #9081 )
...
* Hotfix to develop to yank extraneous e()
* Upgrade Laravel release only to a later 6.18.x version
* Upgrade Laravel to 6.x and Passport 9.x, the recommended versions
2021-02-02 20:22:36 -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
