Nikolai Prokoschenko
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
snipe
416cd96c94
Removed debugging loggin in middleware
2016-06-15 21:08:19 -07:00
snipe
87352470c0
Added sortable created_at to assets and users
2016-06-15 21:06:17 -07:00
snipe
27427dd26b
Additional comments to clarify permissions middleware
2016-06-15 20:57:16 -07:00
snipe
e2789b2951
Protect users routes
2016-06-15 20:45:57 -07:00
snipe
6a277a5391
Added inheritance back into users/groups
2016-06-15 20:45:45 -07:00
snipe
464ecc7cc6
Moved group sync
2016-06-15 11:51:10 -07:00
snipe
2df71be321
No need to update the user again
2016-06-13 11:30:47 -07:00
snipe
2daed3c271
Fix for custom fields not saving
2016-06-10 16:36:46 -07:00
snipe
c1a3592059
Fixes #2130
2016-06-10 08:29:43 -07:00
snipe
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
Daniel Meltzer
e9605891f3
Merge upstream and fix changes.
2016-06-10 07:44:45 -05:00
Daniel Meltzer
9c4c91063f
Merge branch 'v3' into Fix-Asset-Creation-with-old-data
2016-06-10 07:35:30 -05:00
Daniel Meltzer
4e74c553bd
Fix editing of assets. This also uses the asset form request for validation.
2016-06-10 07:33:33 -05:00
snipe
9e8b76d348
Use updated $request->input methods for 5.2
2016-06-10 05:16:27 -07:00
snipe
a0901247a3
Let superadmins through companyable trait
2016-06-10 04:07:27 -07:00
snipe
02a9394cd9
Merge remote-tracking branch 'origin/v3' into v3-master
2016-06-10 03:41:03 -07:00
snipe
ec4bc6c2af
Allow superadmins to print labels
2016-06-10 03:40:49 -07:00
snipe
4e1472f66d
Merge remote-tracking branch 'origin/v3' into v3-master
2016-06-10 00:48:33 -07:00
Daniel Meltzer
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
snipe
f44d98924d
Removed erroneous call to nonexistent model
2016-06-09 14:42:13 -07:00
snipe
c91c1f92cd
Fixes #2132
2016-06-09 13:27:50 -07:00
snipe
845b182fdf
Fixes format for users in category view
2016-06-09 02:26:43 -07:00
snipe
2b5fb04ba9
Allow admin to add user on checkout screen
2016-06-09 00:36:52 -07:00
snipe
bb758d618b
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-06-08 23:28:53 -07:00
snipe
51742d66df
Removed uneeded size array
2016-06-08 23:28:21 -07:00
Daniel Meltzer
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
snipe
75eb2bbe09
Janky-ass form request stuff
2016-06-06 21:02:06 -07:00
snipe
d4e231d5d4
Save permissions on new user
2016-06-06 18:56:43 -07:00
snipe
75dfb87671
Use form request for user add/edit to handle password and password confirmation
2016-06-06 14:15:50 -07:00
snipe
23936e465d
Merge pull request #2123 from dmeltzer/fix-setup-on-windows
...
Fix missing posix_getpwuid on windows.
2016-06-06 12:31:30 -07:00
snipe
21506f4101
Merge pull request #2120 from dmeltzer/add-clone-to-models-index
...
Add clone action to Assetmodels index page.
2016-06-06 12:29:54 -07:00
Daniel Meltzer
ea3e11e011
Fix missing posix_getpwuid on windows.
...
This isn't a perfect solution. It basically just nullifies the check on
windows. I'm not sure if IIS can run as a nonelevated user though, so
perhaps thats the best choice. Regardless, this fixes the setup.
2016-06-06 07:43:05 -05:00
Daniel Meltzer
a89511674b
Add clone icon to Assetmodels index page.
2016-06-05 10:00:31 -05:00
Daniel Meltzer
cd9cca9c6b
Modify Helper::categoryList() to take a category type parameter.
...
This allows for centralizing the category fetching code more and fixes
an error in asset model viewing (#2118 ). Also add a few translated
strings and standardize on a base of 'Select a *' for the default value
in our lists.
2016-06-05 09:47:44 -05:00
snipe
f8ac9a3f77
Fixes #2110
2016-06-03 11:48:20 -07:00
snipe
c5d96812f3
Fixed erronerously removed save methods
2016-06-02 17:22:23 -07:00
snipe
2d5a0deb31
Eager loading for requestable assets account page
2016-06-02 02:57:22 -07:00
snipe
7d2ea36997
Use permission gates on routes
2016-06-02 02:50:00 -07:00
snipe
049e13e365
Switch to gate for permission check
2016-06-02 02:48:52 -07:00
snipe
dddb0f7267
Fixed group error message
2016-06-02 02:46:49 -07:00
snipe
46d3a784a2
Fixes groups for cloning users
2016-06-02 00:41:10 -07:00
snipe
04610e7864
Just use model validation for new user
2016-06-01 18:04:11 -07:00
snipe
cffa76e627
Find first record, instead of hardcoded id 1
2016-06-01 15:50:50 -07:00
snipe
9c4cd9c3ce
Save email/username format in settings controller
2016-06-01 15:45:26 -07:00
snipe
eacf70ee3f
Updated validation
2016-06-01 15:45:05 -07:00
snipe
f3c6275f8d
Removed settings form request
2016-06-01 15:43:12 -07:00
Daniel Meltzer
3ddaa88694
Fix image processing when editing an existing asset. Also reenable the image scaling on the server, but boost limit to 800x800
2016-05-31 19:50:58 -05:00
Daniel Meltzer
fcc79456fd
Play with a mobile friendly capture-image-from device when adding an asset. This also involved rewriting the upload to be all ajaxy and stuff
2016-05-31 19:50:58 -05:00
Daniel Meltzer
4af5cdd64f
asset_id is not allowed to be null in asset_log according to db schema. 0 it out here to make sqlite happy.
2016-05-31 19:41:14 -05:00