Daniel Meltzer
25b916afeb
Show the name of the item with errors in the table.
2016-06-22 17:09:04 -04:00
snipe
fdd17a2088
Fixed weird capitalisation of language strings
2016-06-22 12:58:29 -07:00
snipe
f753783ca0
Smaller miminums for model and category name
2016-06-22 12:50:21 -07:00
snipe
4ed8ff5576
Formatting fixes for coding standards
2016-06-22 12:27:41 -07:00
snipe
70aefdc9c0
Merge pull request #2190 from dmeltzer/fix-asset-creation
...
Flash input on model validation errors when creating/editing assets.
2016-06-22 12:23:13 -07:00
Daniel Meltzer
f6d47887c4
Flash input on model validation errors when creating/editing assets.
2016-06-22 15:20:49 -04:00
snipe
8942e085c3
Merge pull request #2189 from dmeltzer/importer-improvements
...
Two more importer fixes.
2016-06-22 12:20:13 -07:00
snipe
3470fd57ef
Merge pull request #2188 from dmeltzer/paveit-syntax-fix
...
Add a space to the signature to make the --soft option work.
2016-06-22 12:16:25 -07:00
Daniel Meltzer
eba6574047
Add a space to the signature to make the --soft option work.
2016-06-22 15:13:43 -04:00
Daniel Meltzer
43e64a5f8c
Store a list of errors associated with each field instead of overwriting the error if multiple occur. Also Adjust the importer to extract the asset tag earlier in the process so all asset related errors are associated with the asset tag rather than some being tied to the name.
2016-06-22 15:13:01 -04:00
snipe
71b82fee03
Merge pull request #2187 from dmeltzer/fix-asset-creation
...
Fix asset creation errors when asset tag already exists
2016-06-22 11:31:48 -07:00
Daniel Meltzer
b9f72a2afa
Flash errors to session on edit as well.
2016-06-22 12:55:09 -04:00
Daniel Meltzer
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
snipe
dd1241f964
Fix in case crated_at is blank
2016-06-21 17:19:46 -07:00
snipe
dcdc1a6e7b
Merge pull request #2185 from dmeltzer/slack-fixes
...
A few slack fixes
2016-06-21 15:45:22 -07:00
snipe
508e7acb54
Bump up memory for LDAP import of large number of users
2016-06-21 12:22:10 -07:00
snipe
e9227f77b6
Fixes #2163 - put model image in view if no asset image
2016-06-21 12:20:22 -07:00
snipe
49bf9f8b5b
Switch null to lowercase for code style adherence
2016-06-21 11:06:53 -07:00
snipe
afc3cfa16a
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-06-21 10:06:19 -07:00
snipe
c9bdc7da8e
Merge pull request #2176 from dmeltzer/fix-importer-user
...
Assorted Importer Fixes
2016-06-21 10:04:06 -07:00
snipe
37d22d6d21
Merge remote-tracking branch 'origin/v3-master' into v3
2016-06-21 10:03:45 -07:00
snipe
b152927dd0
Merge pull request #2164 from rassie/v3-master
...
Fix reverse proxy support
2016-06-21 10:03:10 -07:00
Daniel Meltzer
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
Daniel Meltzer
d6dd449445
Only show importer progress if on command line. It broke error display from web.
2016-06-20 00:09:17 -04:00
Daniel Meltzer
8c00bad6d0
Add a check to ensure custom fields exist before iterating through them
2016-06-20 00:09:17 -04:00
Daniel Meltzer
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
snipe
6165d804f9
Merge pull request #2145 from dmeltzer/disable-select2-on-ios
...
Disable select2 on ios.
2016-06-17 17:15:47 -07:00
snipe
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
snipe
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
snipe
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
snipe
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
Raveesh
bb3d88cce5
Use the full app.url for the password link
2016-06-17 17:52:14 -04:00
Daniel Dreier
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
Daniel Meltzer
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
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
4a148ac069
Codacity badge
2016-06-15 21:23:58 -07:00
snipe
973513a078
Remove unecessary log use statement
2016-06-15 21:18:40 -07:00
snipe
412756b651
Fix link to view manufacturer in hardware view
2016-06-15 21:14:26 -07: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
1efa69e51f
Fixes #2158
2016-06-15 11:50:57 -07:00
snipe
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
snipe
b4d6842a7c
Minor formatting changes, added DB call for custom fields
2016-06-13 21:45:52 -07:00
snipe
f3e42384c5
Hardcoded higher PHP execution limits
2016-06-13 21:41:09 -07:00
snipe
c29984d0df
Skip superuser check if the user isn't logged in
2016-06-13 19:05:29 -07:00
Daniel Meltzer
77f6fe161e
Change install.sh in v3 to pull the v3 script
2016-06-13 21:58:06 -04:00