snipe
0595867500
Fixes #2856 - add status to asset detail view
...
(Not sure how we missed this… oops)
2016-10-31 17:41:15 -07:00
snipe
a4ae3b0091
Show whether device is enabled and/or 2FA is active
2016-10-31 17:16:26 -07:00
snipe
cbfcf959f9
Allow certain users to override 2FA with permission
2016-10-31 16:52:25 -07:00
snipe
e065d18227
Possible fix for integer weird typing
2016-10-31 13:50:00 -07:00
snipe
adc3ebee41
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-10-31 13:25:54 -07:00
snipe
41defb312b
Moved CSRF token
2016-10-31 13:25:50 -07:00
Frank
10ea5daabd
Harden PragmaRX secret to 32 bytes ( #2859 )
...
This is needed at all but that extra security is always good.
2016-10-31 11:20:31 -07:00
itsupportcmsukorg
140bac2b53
Fix missing 'filename' field in asset_log to action_log migration ( #2854 )
...
Merging this anyway, to stop the bleeding for new upgraders.
2016-10-31 11:18:48 -07:00
snipe
dce5afde78
Use config URL for links in user list
2016-10-29 07:33:33 -07:00
snipe
38b188f6ff
Fixes #2448 - redirect to intended page
2016-10-29 07:32:48 -07:00
snipe
fe041b66c6
Adds two-factor to users listing
2016-10-29 07:21:34 -07:00
snipe
32c439d979
Tidy up login form
2016-10-29 06:45:24 -07:00
snipe
62f5a1b2c7
Tidy up login form
2016-10-29 06:44:24 -07:00
snipe
2fe71f3ebc
Fixes #2833 - changed minimum qty to 0
2016-10-29 06:08:13 -07:00
snipe
9b714a5af5
Updated Github issue template with correct doc URL
2016-10-29 06:06:49 -07:00
snipe
408aab112b
Removed unneeded else
2016-10-29 06:06:32 -07:00
snipe
2f6fcadd05
Fixes #2838 - removed duplicate requestabe field in asset models
2016-10-29 05:53:50 -07:00
snipe
cea255995c
Fixes #106 - adds Google Authenticator support ( #2842 )
...
* refactor to clean up LDAP login, and make the login method easier to handle.
* Login refactor cleanup
* Google 2FA package
* Adds Google Authenticator two-factor
* Removed unused blade
* Added optin setting in profile
* Removed dumb comments
* Made lock_passwords check more consistent
* Additional two factor strings
* Lock passwords check
* Display feature disabled text if in demo mode
* Two factor admin reset options
* Translation strings
2016-10-29 05:50:55 -07:00
Daniel Meltzer
3a8edfdf58
Eager load many more things. Fixes a lot of n+1 queries in ajax/bootstrap tables requests ( #2832 )
2016-10-28 14:15:13 -07:00
snipe
46b00b6fb6
Merge remote-tracking branch 'origin/develop'
2016-10-27 22:17:52 -07:00
snipe
86ef44b43d
Bumped version
2016-10-27 22:17:30 -07:00
snipe
5a835a5b6e
Removed old test DB schema dump
2016-10-27 21:41:27 -07:00
snipe
0f47ddbeb1
Merge remote-tracking branch 'origin/develop'
2016-10-27 21:40:06 -07:00
snipe
066d947f1a
Fixes #2535 - increased varachar limit to 2048 for serial
2016-10-27 21:39:46 -07:00
snipe
683b3bcdc1
Merge remote-tracking branch 'origin/develop'
2016-10-27 15:34:03 -07:00
snipe
a929b635ff
Fixes #2809 - adds serial number to components
2016-10-27 15:33:48 -07:00
snipe
d7296462ac
Merge remote-tracking branch 'origin/develop'
2016-10-27 15:03:03 -07:00
snipe
9c3c611b37
Fixes #2825 - columns misaligned when older display_asset_name field set to 1
2016-10-27 15:02:32 -07:00
snipe
2f72d97f24
Merge remote-tracking branch 'origin/develop'
2016-10-27 14:33:24 -07:00
snipe
3e701c6dd1
Fixes #2814 - adds job title to users listing display
2016-10-27 14:29:07 -07:00
snipe
e4140f4c48
Fixes #2817 - adds EOL to custom report
2016-10-27 14:20:55 -07:00
snipe
61ecbf91bc
Merge remote-tracking branch 'origin/develop'
2016-10-26 11:28:14 -07:00
snipe
691f9b621e
Fixes #2821
2016-10-26 11:27:37 -07:00
snipe
52b6298098
Merge remote-tracking branch 'origin/develop'
2016-10-26 11:23:03 -07:00
snipe
ccb844acd6
Fixed #2800 - use DBTablePrefix() for raw queries
2016-10-26 11:21:36 -07:00
snipe
a0a6a23232
Merge remote-tracking branch 'origin/develop'
2016-10-26 10:32:50 -07:00
snipe
43404e427d
Bumped version
2016-10-26 10:31:13 -07:00
snipe
d7222ae1f0
Fix for defaultLoc in asset view
2016-10-26 10:12:16 -07:00
snipe
ad1d6529a7
Merge branch 'master' of github.com:snipe/snipe-it
2016-10-26 10:09:59 -07:00
Daniel Meltzer
7790f9e91f
Fix #2813 ( #2819 )
...
Looks like a copypasta miss. Should fix the exception thrown in #2813 .
2016-10-26 10:01:24 -07:00
Daniel Meltzer
a418dece80
Better checking for empty values when updating. ( #2811 )
...
* Better checking for empty values when updating. There's a lot of conditionals in here that we may want to look at cleaning up over time
* Fix typo. No manfacturers here.
* Fix model update/import. Also hardcode the status id of unset assets to the first existing one instead of an id that may not exist... Still not ideal, but better.
* Let requests to .env through the middleware. We check to see if this is readable during setup as a warning, and as it stands it triggers an infinite loop trying to hit the file.
2016-10-25 19:51:13 -07:00
snipe
f30631efb6
Fixed parens on target
2016-10-25 12:53:07 -07:00
snipe
f156ec58b6
Bumped version
2016-10-25 12:38:18 -07:00
snipe
f9a06a183e
Updated language strings
2016-10-25 12:30:52 -07:00
snipe
da0b6d4d90
Merge branch 'hotfixes/fix_typo_in_permissions_for_accessories_create' into develop
2016-10-25 11:40:34 -07:00
snipe
40befa7b37
Fixes #2792 - corrected typo in permissions array for creating accessories
2016-10-25 11:38:24 -07:00
snipe
66585bcc40
Merge branch 'hotfixes/eagerload_license_checkout' into develop
2016-10-25 11:12:32 -07:00
snipe
d57135c81b
Removed unused helper methods, added docblocks
2016-10-25 11:11:47 -07:00
snipe
f976f440ef
Fixes #2808 - eager loading user objects for licenses
2016-10-25 10:52:37 -07:00
snipe
0728a991a8
Merge branch 'hotfixes/datepicker_for_date_custom_field' into develop
...
# Conflicts:
# resources/views/models/custom_fields_form.blade.php
2016-10-25 05:18:55 -07:00