Commit graph

1034 commits

Author SHA1 Message Date
snipe
d0d9d82579 Add model number to accessories 2016-11-17 19:57:53 -08:00
snipe
54848b5edf Added enum conversion 2016-11-17 16:56:08 -08:00
snipe
554a6e4fd6 Make length match validation 2016-11-17 16:18:15 -08:00
snipe
f77cb3d0f5 Increase DB size of state field in locations 2016-11-17 16:16:33 -08:00
snipe
5c70898dbf Derp. Not a string. 2016-11-16 17:32:25 -08:00
snipe
08c7701f17 Make purchase cost longer and more standardized 2016-11-16 17:31:11 -08:00
snipe
84e06f4642 Add postal code to locations listing 2016-11-16 08:22:54 -08:00
snipe
2ef4b58a8c Bumped version 2016-11-15 17:49:24 -08:00
snipe
91caba05b7 Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	Dockerfile
#	resources/views/auth/login.blade.php
2016-11-15 17:46:05 -08:00
snipe
37a6599978 Adds expected checkin to custom reports 2016-11-15 01:55:27 -08:00
snipe
cbabcb9197 Fixes #2875 - use leftJoin so as to not filter out unassigned assets when sorting by assigned 2016-11-11 20:50:10 -08:00
snipe
369715b7c7 Starter text search scope for activity report
(This will be messy)
2016-11-11 20:30:26 -08:00
snipe
e74a0171a6 Fixes dockerfile for persistent assets 2016-11-11 20:30:04 -08:00
snipe
b854689d3d Urlencode username in case it has spaces 2016-11-11 20:09:22 -08:00
snipe
1543c03624 Removed stray foo 2016-11-11 20:09:07 -08:00
snipe
7667fca691 Fixes #2894 - set whether or not the user was originally a superuser 2016-11-11 19:48:39 -08:00
snipe
9db28cf6d6 Fixed dumb indenting 2016-11-11 19:46:25 -08:00
snipe
2ddee9b44c Fixes #2906 - adds manufacturer searching to licenses 2016-11-11 19:46:18 -08:00
snipe
49ce630bb8 Make company name sortable 2016-11-11 19:33:13 -08:00
fvleminckx
10d37abe6c fix: persistency in docker of assets, barcodes, logo (#2902) 2016-11-11 19:24:16 -08:00
snipe
2f05b83e0b Fixes #2912 - Reordering of custom fields now saving correctly 2016-11-11 18:33:59 -08:00
Daniel Meltzer
f4fc783026 Check for setup to have completed before running the 2fa middleware. Otherwise new installs fail (#2885) 2016-11-06 18:08:13 +01:00
itsupportcmsukorg
96ad5fb77b Add back forgotten filename to Action Logs with a migration (#2865)
This fixes the issue where the filename wasn't migrated when people who upgraded from 3.4 to 3.5.
This only updates the new log's "filename" field where it's missing a value, so no danger of overwriting anything.

Commit 140bac2 already fixed it for new upgraders (see pull #2854) but didn't help anyone who had already upgraded.
2016-11-02 01:17:42 -07:00
snipe
4747a4c03f Added urlencode to site name 2016-10-31 22:34:57 -07:00
snipe
af97d8ed24 Bumped version 2016-10-31 21:05:07 -07:00
snipe
a914dacf8e Adds drawn signature to asset acceptance (#2846)
* Adds digital signature to asset acceptance

This is still a little broken - the history is displaying “Deleted user”, since there is no item type listed. Saving the item_type as App\Models\User tries to update accepted on the users table, which obviously doesn’t exist.

* Use asset facade for folks in subdirs

* Possible fix for weird accepted/declined display

* Display signature in modal popup if sigs are required

* Wrap that display file in auth middleware, just to be sure.

It shoudl fail if you’re not authorized since you’re not logged in, but better safe than sorry

* Fixed header section of layout

* Removed extra drop from migration rollback
2016-10-31 21:00:30 -07:00
snipe
a182d8c924 Fixes #1348 - LDAP sync in artisan command
TODO:

Make the LDAP sync page work using this command to avoid code duplication
2016-10-31 20:59:46 -07:00
snipe
6400557901 Check if the edited users permissioms are superuser before edit 2016-10-31 19:37:24 -07:00
snipe
26d14b2338 Let superadmins edit their own groups 2016-10-31 19:18:06 -07:00
snipe
3dac20c20f Unset superadmin by non-superadmins on user create 2016-10-31 19:08:24 -07:00
snipe
429afc6b3f Only save user permissions if the user is a superadmin 2016-10-31 19:07:55 -07:00
snipe
8323ed27c2 Do not makes group editable if the user is not an admin
This fixes a bug where the field was (correctly) disabled if the editing user isn’t a superadmin, but because the field was disabled, it would clear the permission groups.
2016-10-31 18:57:35 -07:00
snipe
c47d391946 Feature - allow search on group names 2016-10-31 18:27:34 -07:00
snipe
25bd1acab5 Fixes permission for non-superadmin assigning user permissions 2016-10-31 18:19:55 -07:00
snipe
7c6bdcb6b2 Fix width of warning message 2016-10-31 18:15:00 -07:00
snipe
13450aa961 Include asset status type in asset detail view 2016-10-31 17:44:39 -07:00
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