b9f72a2afa
Flash errors to session on edit as well.
2016-06-22 12:55:09 -04:00
560115e758
If we survive form request validation but fail model validation, ensure that the errors are actually flashed to the session. Another thing that will be better fixed in the future when handling json nicer.
2016-06-22 12:55:09 -04:00
dcdc1a6e7b
Merge pull request #2185 from dmeltzer/slack-fixes
...
A few slack fixes
2016-06-21 15:45:22 -07:00
508e7acb54
Bump up memory for LDAP import of large number of users
2016-06-21 12:22:10 -07:00
49bf9f8b5b
Switch null to lowercase for code style adherence
2016-06-21 11:06:53 -07:00
afc3cfa16a
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-06-21 10:06:19 -07:00
37d22d6d21
Merge remote-tracking branch 'origin/v3-master' into v3
2016-06-21 10:03:45 -07:00
f004facb06
A few slack fixes
...
1) Missing $admin_user in AccessoriesController::postCheckout(). Fixes #2183
2) AssetsController::postCheckin used the hardware url for the user link, not the user url
2016-06-21 09:43:32 -04:00
d6dd449445
Only show importer progress if on command line. It broke error display from web.
2016-06-20 00:09:17 -04:00
8c00bad6d0
Add a check to ensure custom fields exist before iterating through them
2016-06-20 00:09:17 -04:00
4715cc6447
Pass user id to importer. This shows items imported through web interface as created by the appropriate user. Also save warranty_months to item, not just read it from csv. Fixes #2175
2016-06-20 00:09:17 -04:00
5a45ec708b
Use the model validation trait to validate asset maintences. Might be better to add a form request as well, but this at least makes the model validation occur. fixes #2170
2016-06-16 22:22:07 -04:00
8d03668d78
Fix reverse proxy support
...
Reintroducing trusted proxies via fideloper/proxy:
* Upgraded fideloper/proxy to 3.1
* Added fideloper/proxy to Http/Kernel.php
* Added fideloper/proxy to config/app.php
* Added environment variable APP_TRUSTED_PROXIES to env (with '*' being the default fallback)
2016-06-16 15:43:42 +02:00
973513a078
Remove unecessary log use statement
2016-06-15 21:18:40 -07:00
416cd96c94
Removed debugging loggin in middleware
2016-06-15 21:08:19 -07:00
87352470c0
Added sortable created_at to assets and users
2016-06-15 21:06:17 -07:00
27427dd26b
Additional comments to clarify permissions middleware
2016-06-15 20:57:16 -07:00
e2789b2951
Protect users routes
2016-06-15 20:45:57 -07:00
6a277a5391
Added inheritance back into users/groups
2016-06-15 20:45:45 -07:00
464ecc7cc6
Moved group sync
2016-06-15 11:51:10 -07:00
b4d6842a7c
Minor formatting changes, added DB call for custom fields
2016-06-13 21:45:52 -07:00
f3e42384c5
Hardcoded higher PHP execution limits
2016-06-13 21:41:09 -07:00
c29984d0df
Skip superuser check if the user isn't logged in
2016-06-13 19:05:29 -07:00
bfe4bc6ee5
Bypass company scoping if user is an admin
2016-06-13 11:40:22 -07:00
2df71be321
No need to update the user again
2016-06-13 11:30:47 -07:00
396446a34b
Updated namespace for collection
2016-06-13 10:54:28 -07:00
2daed3c271
Fix for custom fields not saving
2016-06-10 16:36:46 -07:00
c1a3592059
Fixes #2130
2016-06-10 08:29:43 -07:00
5904de8718
Remove asset tag requirement from form request
...
It donks the edit screen as it thinks the asset tag has already been taken
2016-06-10 05:54:20 -07:00
e9605891f3
Merge upstream and fix changes.
2016-06-10 07:44:45 -05:00
9c4c91063f
Merge branch 'v3' into Fix-Asset-Creation-with-old-data
2016-06-10 07:35:30 -05:00
4e74c553bd
Fix editing of assets. This also uses the asset form request for validation.
2016-06-10 07:33:33 -05:00
9e8b76d348
Use updated $request->input methods for 5.2
2016-06-10 05:16:27 -07:00
6fa4d1252d
Fixes purchase date if no purchase date given
2016-06-10 05:00:49 -07:00
a0901247a3
Let superadmins through companyable trait
2016-06-10 04:07:27 -07:00
02a9394cd9
Merge remote-tracking branch 'origin/v3' into v3-master
2016-06-10 03:41:03 -07:00
ec4bc6c2af
Allow superadmins to print labels
2016-06-10 03:40:49 -07:00
4e1472f66d
Merge remote-tracking branch 'origin/v3' into v3-master
2016-06-10 00:48:33 -07:00
044695cb02
Fix hardware creation error making old input disappear. This should be redone to dynamically update on the client side based on a JSON response instead of flashing and reloading, but that's a lot of change for v3 at this point.
2016-06-09 20:28:49 -05:00
f44d98924d
Removed erroneous call to nonexistent model
2016-06-09 14:42:13 -07:00
c91c1f92cd
Fixes #2132
2016-06-09 13:27:50 -07:00
bbb116f29c
Fixes #2142
2016-06-09 12:25:51 -07:00
845b182fdf
Fixes format for users in category view
2016-06-09 02:26:43 -07:00
2b5fb04ba9
Allow admin to add user on checkout screen
2016-06-09 00:36:52 -07:00
bb758d618b
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-06-08 23:28:53 -07:00
51742d66df
Removed uneeded size array
2016-06-08 23:28:21 -07:00
9648c6f1d3
Fix license Checkout.
...
A mistake in the sqlite porting led to "Please select an asset"
disappearing. This centralizes that code in Helper, and uses the code
in Licensescontroller and componentscontroller.
Also use the proper name on the components checkout page.
AssetMaintencesController reuses the same underlying code as
licensescontroller, but we don't want "Please select an asset" to be an
option there, so I'm not changing that code.
2016-06-07 07:58:08 -05:00
75eb2bbe09
Janky-ass form request stuff
2016-06-06 21:02:06 -07:00
d4e231d5d4
Save permissions on new user
2016-06-06 18:56:43 -07:00
75dfb87671
Use form request for user add/edit to handle password and password confirmation
2016-06-06 14:15:50 -07:00
