DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11762 commits 96 branches 267 tags 296 MiB
Commit graph

11762 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 0c98390eef Hide bulk actions, checkbox and checkout/in if deleted 2016-06-29 04:19:37 -07:00
Brady Wetherington 345a0da337 Add Unix Socket support to standard .env configurations for DB (#2208) 2016-06-28 20:15:03 -07:00
snipe 38a7bfecf6 Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-28 14:52:58 -07:00
snipe 6d5bc64b2b Another fix for status label types 
This is a little janky, as it breaks up the errors into multiple screens if you don't have a status label type AND don't have a name. This is because the model-level validation won't work since we transmogrify that dropdown list of status label types into  boolean values for the DB. Should eventually find a less clunky way to handle this, but needed to get a fix in now.
 2016-06-28 14:52:11 -07:00
snipe 7c4b2caadf Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-28 12:40:31 -07:00
snipe 6633366b29 Small fix for status label types 2016-06-28 12:40:20 -07:00
snipe 64dbcf7c92 Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-28 12:19:36 -07:00
snipe 483bf1b309 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-28 12:19:19 -07:00
snipe 0e96a0aa3e Updated comment 2016-06-28 12:19:14 -07:00
snipe e4275bd3d3 Fixes status label inline creation 2016-06-28 12:19:05 -07:00
Daniel Meltzer 52c89ca889 Hide Delete action if user is deleted. (#2205) 
Issue: 1493
 2016-06-28 11:50:11 -07:00
Daniel Meltzer d484636bba Add model number column to the hardware list. (#2204) 
* Add model number column to the hardware list and allow searching based on model number.   Column is hidden by default.

* Fix sorting.  Add scope to order by model number.
 2016-06-27 22:32:40 -07:00
snipe 084db22cd5 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-27 21:15:18 -07:00
snipe 081179a4fd Removed old JS libraries that aren't needed by v3 2016-06-27 21:15:11 -07:00
snipe 82d19fc704 Merge pull request #2201 from dmeltzer/fix-user-creation-values 
UserController::postCreate - Store all request information.
 2016-06-27 21:12:49 -07:00
Daniel Meltzer b1c28d7965 Move checks back into methods instead of having an extra helper method. Also remove unnecessary lock_passwords checks because there is a check at the top of the method that does this already. 2016-06-28 00:11:59 -04:00
snipe 6ea74f9fc3 Merge pull request #2203 from dmeltzer/display-error-if-import-upload-fails 
If the move of the uploaded import file fails, return an error message.
 2016-06-27 20:55:51 -07:00
Daniel Meltzer 278be52f7b Show the exception message if APP_DEBUG is enabled. 2016-06-27 23:54:45 -04:00
Daniel Meltzer ee1f983114 If the move of the uploaded import file fails, return a message. Fixes an issue reported on gitter today where bad permissions on the upload directory didn't provide any feedback. 2016-06-27 23:37:15 -04:00
snipe e3fe80e2a5 Merge pull request #2202 from dmeltzer/sqlite-fix-asset-edit 
Fix integrity constraint violation on sqlite.
 2016-06-27 20:20:01 -07:00
Daniel Meltzer d3b035cfe9 Fix integrity constraint violation on sqlite. 
If the requestable checkbox was not checked, it did not exist in the request.
Setting requestable to null in such a case would cause a violation because it should be 0/1.

Also fix a copy/paste where we reset requestable after checking for rtd_location_id.
 2016-06-27 23:16:03 -04:00
Daniel Meltzer cf29a4a319 Extract common data from UserController postCreate and postEdit into a helper method. Use this method to store data about user. Fixes #2200 2016-06-27 22:48:09 -04:00
snipe e9bb0e948b Merge pull request #2197 from dmeltzer/another-slack-fix 
Link to user on asset checkout as well as checkin.
 2016-06-23 19:23:59 -07:00
Daniel Meltzer 5bc52a9425 Link to user on asset checkout as well as checkin. 2016-06-23 09:39:50 -04:00
snipe 51a8fc1eee Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-22 17:18:16 -07:00
snipe 2867cd523d Fixes #2192 2016-06-22 17:14:49 -07:00
snipe 0cf563ae5b Show admin in maintenances 2016-06-22 17:04:47 -07:00
snipe 95beddf613 Use helper library for asset list 2016-06-22 16:58:36 -07:00
snipe e5a5de6a0d Just use inline validation instead of form request, since it's a one-off 2016-06-22 15:59:00 -07:00
snipe 0ca85f8a8a Updates to components 2016-06-22 14:55:17 -07:00
snipe 014e7ba9c4 Updated strings 2016-06-22 14:39:19 -07:00
snipe 2df3e95efc Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-22 14:19:30 -07:00
snipe 65dfd23021 Merge pull request #2191 from dmeltzer/importer-improves 
Importer: Show the name of the item with errors in the table.
 2016-06-22 14:18:30 -07:00
Daniel Meltzer 25b916afeb Show the name of the item with errors in the table. 2016-06-22 17:09:04 -04:00
snipe 6673a5afe1 Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-22 13:01:06 -07:00
snipe fdd17a2088 Fixed weird capitalisation of language strings 2016-06-22 12:58:29 -07:00
snipe 424b854e29 Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-22 12:52:00 -07:00
snipe f753783ca0 Smaller miminums for model and category name 2016-06-22 12:50:21 -07:00
snipe 5daaa24a07 Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-22 12:30:48 -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