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
dd1241f964
Fix in case crated_at is blank
2016-06-21 17:19:46 -07: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
e9227f77b6
Fixes #2163 - put model image in view if no asset image
2016-06-21 12:20:22 -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
c9bdc7da8e
Merge pull request #2176 from dmeltzer/fix-importer-user
...
Assorted Importer Fixes
2016-06-21 10:04:06 -07:00
37d22d6d21
Merge remote-tracking branch 'origin/v3-master' into v3
2016-06-21 10:03:45 -07:00
b152927dd0
Merge pull request #2164 from rassie/v3-master
...
Fix reverse proxy support
2016-06-21 10:03:10 -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
6165d804f9
Merge pull request #2145 from dmeltzer/disable-select2-on-ios
...
Disable select2 on ios.
2016-06-17 17:15:47 -07:00
161c6fe2e6
Merge pull request #2173 from twistedR/fix-password-login
...
Use app.url for password reset instead of hard coded one.
2016-06-17 17:15:05 -07:00
1c51db876c
Merge pull request #2172 from ddreier/v3-label-changes
...
Center 1D Barcode and include Custom CSS in barcodes view
2016-06-17 17:14:28 -07:00
f26c24ea35
Merge pull request #2171 from dmeltzer/fix-asset-maintence-validation
...
Use the model validation trait to validate asset maintences
2016-06-17 17:14:00 -07:00
48595e3d76
Merge pull request #2135 from YetAnotherCodeMonkey/v3
...
Swap bgutter and sgutter as they seem to be reversed.
2016-06-17 17:12:47 -07:00
bb3d88cce5
Use the full app.url for the password link
2016-06-17 17:52:14 -04:00
52084a2c24
Add CSS to center the 1D barcode and add PHP to include the custom CSS from Settings.
2016-06-17 14:38:50 -05: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
4a148ac069
Codacity badge
2016-06-15 21:23:58 -07:00
973513a078
Remove unecessary log use statement
2016-06-15 21:18:40 -07:00
412756b651
Fix link to view manufacturer in hardware view
2016-06-15 21:14:26 -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
1efa69e51f
Fixes #2158
2016-06-15 11:50:57 -07:00
6253d41231
Merge pull request #2151 from dmeltzer/pull-from-v3-master
...
Change v3 installer to fetch v3 master.
2016-06-13 22:55:41 -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
77f6fe161e
Change install.sh in v3 to pull the v3 script
2016-06-13 21:58:06 -04:00
9b08d99fa4
Fetch the current v3-master zip file, not the alpha2 one.
2016-06-13 21:54:32 -04:00
0fd43c0a5d
Updated language strings
2016-06-13 12:16:43 -07:00
3ca81f4d73
Fixes #2140
2016-06-13 12:07:01 -07:00
bfe4bc6ee5
Bypass company scoping if user is an admin
2016-06-13 11:40:22 -07:00
dec95c3e06
Updated blade for box panel
2016-06-13 11:39:57 -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
57c9d506b8
Fix namespacing for actionlog
2016-06-10 07:57:54 -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
