snipe
64e7ab3a12
Fixes #4182 - empty names for assets when checking out to asset
2017-10-11 01:31:37 -07:00
snipe
f64c02ce12
Fix for ambiguous query on models
2017-10-10 23:12:16 -07:00
snipe
bed7b29417
Fixes group search
2017-10-10 22:59:32 -07:00
Richard Hofman
adca7cb0c5
Fix LDAP location sync issue in #3993 ( #4181 )
...
* Ensure locations with the most specific OUs take precedence during user assignment.
* Save 'ldap_ou' Location attribute during creation.
2017-10-09 13:06:47 -07:00
snipe
e29d878d4f
Remove unused method arguments
2017-10-07 15:09:50 -07:00
snipe
d4e3ea1412
Derp
2017-10-07 15:07:31 -07:00
snipe
c5462c5f1f
Not sure why this isn’t working… commenting it out for now
2017-10-07 14:52:00 -07:00
snipe
8c406e8e55
Additional auth policies
2017-10-07 14:49:47 -07:00
snipe
6e33f36595
Set snipe-logo as default
2017-10-07 14:49:36 -07:00
snipe
9dc79f7165
Demo Settings reset artisan command
...
We’ll set this as a cron job to reset the language back to english
2017-10-07 07:43:57 -07:00
snipe
a69a939034
Small barcode tweaks
2017-10-07 07:15:28 -07:00
snipe
834c6ad8f9
Removed extra space
2017-10-07 06:56:47 -07:00
snipe
2ce48fbc7e
Use components transformer in API method
2017-10-07 06:56:39 -07:00
snipe
5d18937e94
Standardized component API output
2017-10-07 06:56:18 -07:00
snipe
b3186ba5ea
Removed old getDataTable methods
...
These are no longer used because of the API
2017-10-07 06:56:02 -07:00
snipe
a03207e5b4
Show license notes
2017-10-07 04:42:53 -07:00
snipe
e2f4685a55
Added notes back to list view
2017-10-07 03:36:50 -07:00
snipe
064a4ebe33
Ability to skip deleting/generating new users
...
This will behave unpredictably if there is not a user id 1
2017-10-07 00:02:37 -07:00
snipe
a84da88114
Demo seeder
2017-10-06 22:58:00 -07:00
snipe
282b3b5b0a
Remove catch-all “deployed” from pie chart
2017-10-06 18:41:10 -07:00
snipe
1dcff8d463
Remove eager loading on pie
...
This was causing memory issues for large asset sets
2017-10-06 18:15:01 -07:00
snipe
e461c25428
Apply model image fix to update method
2017-10-06 17:03:51 -07:00
snipe
554ea8bb95
Fixed asset model image validation
2017-10-06 16:56:43 -07:00
Richard Hofman
f2be409914
LDAP sync improvements and DB query fix. ( #4148 )
...
* Set 'ldap_ou' Location field to NULL when an empty string is submitted.
* Consolidate LDAP user import logic in LdapSync.php.
2017-10-06 16:15:14 -07:00
snipe
f580e20bc3
Fixed custom fields filter for advanced search
2017-10-05 23:09:02 -07:00
snipe
f6d8642799
Fix $search variable to $search_var for new filter
2017-10-05 00:35:37 -07:00
snipe
f66e222f3d
Fixes #4132 - associated accessory users
2017-10-03 21:03:00 -07:00
snipe
6dd4282f1f
Fixes #4130 - show deleted asset models
2017-10-03 17:53:08 -07:00
snipe
3f44987799
Small logo size tweaks
2017-10-03 14:15:03 -07:00
snipe
512632ce60
Make the export button contextual for requested status
2017-10-03 12:50:18 -07:00
snipe
54671af7f0
Small export assets fix
2017-10-03 11:49:41 -07:00
snipe
8e73cacf4e
Fixes custom report to include assigned to names, etc
2017-10-03 10:38:28 -07:00
snipe
c721fdd793
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-10-03 08:46:25 -07:00
Daniel Meltzer
d119372ff0
Fix License Import. ( #4121 )
...
The license name is not unique, so keying by license alone was causing issues. Match using name + serial instead.
2017-10-03 08:46:06 -07:00
snipe
3a470ce789
Only report exceptions we want to see
2017-10-03 07:28:00 -07:00
snipe
3687cbfdb3
Added rollbar support
2017-10-02 20:27:45 -07:00
snipe
8a7abba427
Slash url
2017-10-02 17:21:18 -07:00
snipe
9df648b428
Fix Session path
2017-10-02 17:19:22 -07:00
snipe
ff38cdd09b
Comment out the nullable middleware until we have a chance to check all model validators
2017-10-02 16:36:43 -07:00
snipe
59225701b5
Redirect to previous after login
2017-10-02 16:00:42 -07:00
snipe
aab635154a
Default to turning CSP off until we can fix vue/CSP issues
2017-10-02 13:29:14 -07:00
snipe
e26d038589
Fixed license checkin form UI
2017-10-01 15:08:32 -07:00
snipe
afc8133acf
URL nullable validation isn’t working in Laravel 5.4?
2017-10-01 14:40:13 -07:00
snipe
abe19a6311
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-10-01 14:33:02 -07:00
snipe
07359c76ad
Fixes #4094 - more nullables
2017-10-01 14:32:47 -07:00
Daniel Meltzer
c2616412c0
Add laravel routes to javascript ( #4092 )
...
* Add laravel routes to javascript
This will clean up a lot of passing of urls. Adds a route() helper and
everything...
This commit also moves the customfield fetching to only be fetched once
and shared with each file, rather than once for each file.
* Try to fix travis unit test things.
* Downgrade doctrine/inflector for php5
* Attempt to occasional seeder issues on travis if the asset does not generate validatable data.
* Update sql dump for functional tests.
* Try to fix api tests.
2017-10-01 12:59:55 -07:00
Daniel Meltzer
23ca2d9a0b
Minor fixes ( #4091 )
...
* Fix old urls.
Still had some /admin/ urls floating around, which was causing bad
redirects in some instances. Should fix #4085
* The modal seems to be confusing license upload. be more explicit in the route we redirect to.
* Fix #4039 . Use proper methods for location assets.
This also fixes a bunch of n+1 issues in the transformer. Also: curious
to know what Location::assets() does, because it doesn't do what I want
it to :)
2017-10-01 12:57:04 -07:00
snipe
ba793355cb
Nullable crap. Again.
2017-09-29 17:50:52 -07:00
Daniel Meltzer
655ca78633
Adjust the import controller to return a url to the process path to enable processing an uploaded file without refresh. ( #4080 )
2017-09-29 17:49:35 -07:00
Daniel Meltzer
bbffde47f7
Remove conditional related to no longer existant testrun option. ( #4079 )
2017-09-29 17:31:39 -07:00
snipe
be7598b279
Fixes all assets showing as unassigned in license checkout
2017-09-29 17:14:38 -07:00
snipe
9301c56a77
Fixes #4069 - include request handler
2017-09-29 16:17:35 -07:00
snipe
e37503c734
Fixes #4075 - this is janky and should be revisited
2017-09-29 16:09:24 -07:00
snipe
43ff66e4d9
More UI tweaking for meta statuses
2017-09-29 15:24:33 -07:00
snipe
4eda2a2f96
*ahem*
2017-09-29 12:03:12 -07:00
snipe
fe1975067a
Hopefully clearer status label meta info
2017-09-29 12:03:02 -07:00
snipe
efd71f8bfe
For #3998 - Disable CSP if debug=true
...
To avoid all the nonce hell from debugbar
2017-09-29 04:53:09 -07:00
snipe
05a8ba9a8e
Fix weird url if license checkout fails
2017-09-29 04:37:33 -07:00
snipe
9ce2d1f560
Merge branch 'csp-middleware' into develop
2017-09-29 04:14:33 -07:00
snipe
2e76620cf8
More specific required check
2017-09-29 03:44:23 -07:00
snipe
a4b30279ee
Fixes #4067 - Make unrequired custom fields nullable
2017-09-29 03:30:13 -07:00
snipe
faf3802971
Fixes #4011 - do not send email to user on license checkout
2017-09-29 02:00:49 -07:00
snipe
ba8bcce8eb
Hopefully fixes #4020
2017-09-29 01:21:08 -07:00
snipe
aab409dec2
Fixes #4061 - bulk checkout error
2017-09-28 22:22:21 -07:00
snipe
4d32f2b337
Fixes #4059 - accessories view
2017-09-28 21:18:00 -07:00
snipe
0e29744ec2
Don’t try to send an email if the user doesn’t have an email address
2017-09-28 20:57:33 -07:00
snipe
51236a2ad9
Fixes #4056 - check for assets before deleting user
2017-09-28 19:57:52 -07:00
snipe
46d87849f4
Added content security middleware
2017-09-28 19:45:15 -07:00
snipe
b60febeea2
Removed space in XSS header because safari was getting angry
2017-09-28 18:45:54 -07:00
snipe
9b84a0d516
*eyeroll*
2017-09-28 17:34:47 -07:00
snipe
1775995f26
Is this space necessary? Getting weird results from netsparker
2017-09-28 17:25:04 -07:00
snipe
26a7701cda
Added referrer-policy header
2017-09-28 17:12:58 -07:00
snipe
a34085f1d9
Added mode=block to XSSProtect header
2017-09-28 16:28:27 -07:00
Daniel Meltzer
af19e5d976
Fix old route ( #4053 )
...
Looks like we missed in the v4 port. Fixes the unrelated issue in #4052
2017-09-28 16:02:50 -07:00
snipe
3d7277398c
Fixes #4057 - sig file in lightbox
2017-09-28 15:13:05 -07:00
snipe
a7ad48a02a
Make fields nullable for licenses
2017-09-27 22:11:20 -07:00
snipe
0fb4ff77f4
Restoring older SnipeModel attribute setters
...
In case needed by API - needs investigation
2017-09-27 16:39:20 -07:00
snipe
ac83dba2bb
Fixes #4034 - save login note
2017-09-27 16:35:54 -07:00
snipe
fc96fa756e
Fix redirect default on password reset
2017-09-27 16:23:21 -07:00
snipe
ea9a502152
Added empty regsitration controller
...
When using the default Laravel auth routes, it expects a registration controller, even though we don’t have a concept of registration. This blank controller just prevents route caching from throwing errors.
2017-09-27 16:23:01 -07:00
snipe
ec8a3d2e56
Fixes #4027 - proper redirect on fieldset delete
2017-09-27 16:02:29 -07:00
snipe
ecf041fa10
Fixes #4043 - standardize groups API response
2017-09-27 15:18:29 -07:00
snipe
0ab9bc1db8
Added normalization midddleware, removed
2017-09-27 15:18:05 -07:00
snipe
73e788b94b
Make min_amt fillable
2017-09-27 14:50:56 -07:00
snipe
e91a537552
Use more modern Request handler
2017-09-27 14:50:48 -07:00
snipe
ef8c1abf28
Fixes #3113 and #4040
2017-09-27 14:50:17 -07:00
snipe
bd0498aa69
Fixes #4016 - signature file missing from history tab
2017-09-27 12:58:08 -07:00
snipe
e27e1a78c3
Fix for case where a fieldset is assigned to a model, but no fields are assigned
2017-09-26 16:01:23 -07:00
snipe
4b9bfc178d
One more try on #4001
2017-09-25 22:05:57 -07:00
snipe
f2ee7dcabb
Fixes #4001 - license checkout not working
2017-09-25 21:40:43 -07:00
snipe
26203801f6
Fixes #4009 - zip not populating on locations listing page
2017-09-25 20:45:05 -07:00
snipe
c3afbc0e53
Run backups before purging and importing
2017-09-25 15:00:23 -07:00
snipe
38326314ca
Merge branch 'develop'
2017-09-25 11:53:33 -07:00
snipe
865950e766
Fixes #4000 - user_id blank
2017-09-25 11:53:10 -07:00
snipe
d49b67d033
Fix for assigned user location
...
Was breaking requestable page
2017-09-25 11:26:04 -07:00
snipe
6b63808e34
Fix for asset location null on user
2017-09-25 11:25:15 -07:00
snipe
34dfcb5add
Merge branch 'develop'
2017-09-22 17:23:38 -07:00
snipe
30019a144a
Disable login note editing on demo
2017-09-22 17:23:22 -07:00
snipe
b29d7beb3a
Merge branch 'develop'
...
# Conflicts:
# .gitignore
# Dockerfile
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/AssetsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/GroupsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/UsersController.php
# app/Http/routes.php
# app/Models/Depreciation.php
# app/Models/Location.php
# config/version.php
# resources/views/account/view-assets.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/modals.blade.php
# resources/views/reports/custom.blade.php
# snipeit.sh
2017-09-22 16:12:18 -07:00
snipe
998c4a5fe5
Make model number nullable
2017-09-22 04:43:28 -07:00
snipe
126a5671fe
Set timeout for LDAP server
2017-09-18 19:11:38 -07:00
Daniel Meltzer
a5764351f7
Migrate weird assigned_type issues, Issue #3972 ( #3973 )
...
For a while, prior to 987536930
, we did not null assigned_type on
checkin. This migration manually nulls all assigned_type fields if
assigned_to is unset. Add a test to AssetTest for this as well...kind
of. We need to extract an Asset::checkin() method for 4.1 that mirrors
Asset::checkOut() to really test this.
This also fixes a separate (but related) issue. The Asset importer did
not set assigned_type when importing and creating users. In this
instance, we assume that if assigned_to is set and assigned_type is not,
then the item was checked out to a user and update the DB accordingly.
Also add a check in ImporterTest for this issue.
2017-09-18 16:40:13 -07:00
Daniel Meltzer
922d6937ae
Custom field import repair ( #3968 )
...
* There is no notes field on accessories. Fixes Importer Test.
* Fix notification test. We should see a checkout not allowed exception when trying to check out to a location if the asset requires acceptance.
* Fix Custom field import.
Add a test for custom field import, and fix a few issues related to
importing custom fields. This will restore v3 functionality.
* Add UI support for mapping custom fields.
This still requires the field mappings to be created/assigned in
advance, but will fetch all custom field names and allow them to be
selected when setting up custom field mappings.
This commit also updates laravel-mix to v1.4.3 and other node
dependencies to fix some build issues.
* Fix some requestable asset page/assetloc issues. I'd love to know why laravel expections relationships to be in lower case... but thats a question for another day.
2017-09-18 12:29:08 -07:00
snipe
c53dae4b72
Possible fix for #3919 - allow later versions of mcrypted base64 keys
2017-09-14 16:43:41 -07:00
Iman
ed4ea7f1f4
No new feature,No bug fix, Only refactoring ( #3949 )
...
* No change in logic !
Just exchanging the if and else code blocks and negating condition.
* remove unneeded else{} block
* Re-indented the code
2017-09-12 12:28:42 -07:00
snipe
81e358a01d
Small maintenance fixes
2017-09-08 17:49:01 -07:00
snipe
6c283de60a
Check for status_id key - related to #3928
...
TODO: Fix for model number
2017-09-08 17:24:28 -07:00
snipe
47909b93f7
Fixed deleted users/restore users view
2017-09-06 17:11:43 -07:00
Daniel Meltzer
ae0573b3da
Fix asset create ( #3929 )
...
* Fix accidental commit of ImporterTest.
* Move the name() method to the presenter
This fixes some weird collisions between laravels voodoo and our
presenter voodoo that confused php. It's also probably a cleaner place
to put it. Should fix #3927
* Add missing parenthesis
* Add heading to tables on locations/view page.
2017-09-06 16:24:43 -07:00
Daniel Meltzer
987536930c
Assorted fixes ( #3923 )
...
* Fix some n+1 problems
* Use route in notification dropdown to make sure we link to correct page
* Work on better UI support for checkout to non-user. Fix links on index bootstrap table, work towards eliminating assignedUser
* Remove Asset::assigneduser() relationship. Instead add a checkedOutToUser() method and/or port to using assignedTo()
* Adjust string to fit new reality
* Fix #3780 . Move the consumables getDataView method to the ApiController. Not entirely RESTful, but it's a weird method that probably doesn't need its own controller and the functionality would be strange to stack on the userscontroller...
* Fix file uploads to assets and restore the delete route.
* Add asset maintence edit action to index.
* Suppliers asset list should link to the related asset, not to the supplier with same ID.
* Asset models page should use polymorphic formatter on assigned to to better handle assorted item types.
* Comment out more assigneduser fallacy until we figure out the query builder approach to searching for location text.
2017-09-05 17:54:58 -07:00
snipe
761371509d
Use notifiables for slack audit notification
2017-08-31 21:30:38 -07:00
snipe
3518ea7e7d
Fixes #606 - email notifications for expected checkins
2017-08-31 21:18:05 -07:00
snipe
0054ce3071
Fixes #3907
2017-08-31 13:45:48 -07:00
snipe
b0f74466bb
Removed dd
2017-08-31 11:15:52 -07:00
snipe
b4a0484295
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-08-31 11:15:03 -07:00
Daniel Meltzer
bb874012d9
Progress towards better email notifications ( #3911 )
...
Working mail from notification. Still requires testing/cleaning
Add tests around checkout notification.
This also removes the ability to check out an asset to a location|asset
that requires acceptance/a Eula. For 4.1 we may think about how to
support such a thing, but at present it seems to make sense to only alow
such assets to be checked out to users, who can be responsible for the
items.
2017-08-31 11:14:21 -07:00
snipe
bb8583eb14
Remove lower casing for LDAP array re: #3910
2017-08-31 11:00:08 -07:00
snipe
8d2c229bc3
Move LDAP validation into form request
2017-08-31 10:44:00 -07:00
snipe
48e6208214
Fixes #3907 - do not require username on user if LDAP import
2017-08-31 10:43:36 -07:00
snipe
22233e3ba6
Bulk asset audit form (needs more testing)
2017-08-29 16:00:22 -07:00
snipe
e439f15a64
Fixed some date math for auditing
2017-08-28 17:20:20 -07:00
snipe
e10cdd57a5
Removed old getassetloist method
2017-08-26 15:22:04 -07:00
snipe
bf157773c8
Also related to #3888
2017-08-26 15:21:38 -07:00
snipe
51d74ac06d
Auduting improvements
2017-08-25 18:40:20 -07:00
snipe
af835d6efc
Additional setting validation for new fields
2017-08-25 17:59:01 -07:00
snipe
16f57e16cb
Fixes #1190 - added basic audit workflow
2017-08-25 10:04:19 -07:00
snipe
52270fa4db
Derp
2017-08-25 08:30:48 -07:00
snipe
bf3731d65c
Set default min password to 10
2017-08-25 08:23:23 -07:00
snipe
19670f9dd8
Remove assigned_to constraint
2017-08-25 06:30:10 -07:00
snipe
4721cab928
Grr.
2017-08-25 06:08:19 -07:00
snipe
08f3e78d26
Merge branch 'checkout-to-location-v2' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-location-v2
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# app/Http/Transformers/LocationsTransformer.php
# resources/views/locations/view.blade.php
# routes/api.php
# tests/_data/dump.sql
2017-08-25 06:04:22 -07:00
snipe
10711245ba
Fixes #3792 - parent/child locations in API
2017-08-25 05:32:12 -07:00
snipe
29a7c8577d
Fixes #3849 - fillable for accessories
2017-08-25 03:48:07 -07:00
snipe
021e723acf
Fixed typo
2017-08-25 03:27:41 -07:00
snipe
14c0c314aa
Make sure payload is always passed, even if null
2017-08-25 03:27:31 -07:00
snipe
d23ea70b08
Added auth check back to asset store
2017-08-25 03:26:50 -07:00
snipe
1b047c768b
Added fullName() presenter for locations
2017-08-25 03:26:10 -07:00
snipe
73ce5f98bb
Removed some logging to make test debugging less verbose
2017-08-24 23:20:51 -07:00
snipe
659d953f3f
Fixed custom error message for status labels
2017-08-24 22:40:07 -07:00
Brady Wetherington
c1dcc22217
Refactor and improve Modal support for Assets ( #3884 )
2017-08-24 22:24:02 -07:00
snipe
4ba474cf73
Fixes asset test
2017-08-24 16:52:27 -07:00
snipe
fb6caa35ff
Only increment if settings table has a value
...
(This should only ever come up in the CI tests)
2017-08-23 14:07:01 -07:00
snipe
a5870c888e
Removed incrementer from non-asset event listeners
2017-08-23 13:59:59 -07:00
snipe
6e30fa6922
Fixes custom fields in asset listing where no custom fields were assigned
2017-08-23 03:28:13 -07:00
snipe
58b3f0519d
Add empty errors array
2017-08-23 00:31:37 -07:00
snipe
f119c69698
Possible fix for #3852
2017-08-22 22:46:02 -07:00
snipe
57f4c986af
Enforce password complexity rules on new account password change
2017-08-22 22:41:35 -07:00
snipe
06c5bce3c7
Fixes #3865 - employee number mislabeled in list output
2017-08-22 21:40:35 -07:00
snipe
a0cbca85bf
Fixes for API calls for password complexity stuff
2017-08-22 21:15:35 -07:00
snipe
9bda62d295
ADDED: Password rules for complexity, min length, rejecting common passwords
2017-08-22 20:32:39 -07:00