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
|
62227ec27d
|
Link to location in user view
|
2017-08-25 05:48:32 -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
|
dfb1ff81e6
|
Fixes settings problem in unit tests
|
2017-08-25 03:40:56 -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
|
e6323e0a1b
|
Version bump for beta 2
|
2017-08-24 23:32:33 -07:00 |
|
snipe
|
73ce5f98bb
|
Removed some logging to make test debugging less verbose
|
2017-08-24 23:20:51 -07:00 |
|
Brady Wetherington
|
a37cb616eb
|
Add Error DIV's to all modals (#3886)
|
2017-08-24 22:43:05 -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
|
6a67426140
|
Create travis user? I don’t know wqhy it’s still looking for a travis user
|
2017-08-24 17:21:50 -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
|
f35f8477d3
|
Maybe the travis user isn’t created automatically anymore?
|
2017-08-23 13:42:17 -07:00 |
|
snipe
|
d0637d38f3
|
More travis fixes
|
2017-08-23 13:32:30 -07:00 |
|
snipe
|
7141968d64
|
Trying to fix travis. Again. Always.
|
2017-08-23 13:22:01 -07:00 |
|
snipe
|
0f7b7d8e6a
|
Add @zwerch as a contributor
|
2017-08-23 13:13:50 -07:00 |
|
snipe
|
ca78b3ed7c
|
Fixes models on create asset
|
2017-08-23 13:08:42 -07:00 |
|
snipe
|
2d2cae10b9
|
Fixed wonky “maintained” badge
|
2017-08-23 12:07:00 -07:00 |
|
snipe
|
5e9331f5ae
|
Fixed typo. (English is hard. Let’s go shopping!)
|
2017-08-23 04:00:10 -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
|
2958630923
|
Fixed some settings text
|
2017-08-22 22:11:26 -07:00 |
|
snipe
|
72dacda4f9
|
Trying again to resolve doctrine/php7 issue
|
2017-08-22 21:58:42 -07:00 |
|
snipe
|
9c2b986bb0
|
Fixes doctrine/etc compatibility issue
See: https://github.com/laravel/framework/issues/20490
|
2017-08-22 21:51:50 -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 |
|
snipe
|
1d7e243d0a
|
Fixes #3790 - parent display on locations index
|
2017-08-22 15:02:31 -07:00 |
|
snipe
|
63bc2ec09f
|
Fixes #3802 - make id an (int) in API repsonse
|
2017-08-22 14:53:48 -07:00 |
|
snipe
|
d5cadeab1a
|
Fixes #3854 - more fillable fields for supplier API
|
2017-08-22 14:30:39 -07:00 |
|
snipe
|
31516abef9
|
Fixes #3858 - use transformer for single listing categories
|
2017-08-22 14:26:08 -07:00 |
|
snipe
|
d2535582f3
|
Fixes #3853 - added notes/zip to suppliers API response
|
2017-08-22 14:18:21 -07:00 |
|
snipe
|
eaaea303f4
|
Fixes #3860 - return JSON instead of redirect in API delete dept call
|
2017-08-22 14:15:13 -07:00 |
|
snipe
|
8c5312b931
|
Fixes #3866 - weird API behavior in status label types
|
2017-08-22 14:10:54 -07:00 |
|
snipe
|
4ef6e292d1
|
Fixes #3868 - model_number/notes in models API call
|
2017-08-22 13:56:51 -07:00 |
|
snipe
|
6310670835
|
Fixes #3869 - asset maintenances API endpoints
|
2017-08-22 13:52:06 -07:00 |
|
snipe
|
15bb30acd6
|
Fixes #3873 - show groups correctly on user listing page
|
2017-08-22 12:29:46 -07:00 |
|
snipe
|
148d41d8dc
|
Removes erroneous else
|
2017-08-22 12:22:32 -07:00 |
|
snipe
|
71c1c74164
|
Fixes #3085 - adds “change password” functionality back to user accounts
|
2017-08-22 12:09:04 -07:00 |
|
snipe
|
9c02526a37
|
Make fields nullable in settings
|
2017-08-22 10:41:59 -07:00 |
|
snipe
|
25dc26aac3
|
Added 30 as page selector value for label printing
|
2017-08-21 22:31:37 -07:00 |
|
snipe
|
afc763ebac
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
|
2017-08-21 22:31:04 -07:00 |
|