DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-26 10:47:42 -07:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
1283 commits 90 branches 265 tags 295 MiB
Commit graph

1283 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 820d37cabb Custom logging to only show debug info if the app is in debug mode 
or if the user has overridden the APP_LOG_LEVEL in their env
 2016-11-30 20:38:46 -08:00
snipe b614470b21 Updated serial text to product key 2016-11-29 21:45:49 -08:00
snipe ce056c39e5 Removed requirement for serial number 
Some folks will use a license file instead
 2016-11-29 14:06:33 -08:00
snipe b6ffb8b3df Protect edit route as well 2016-11-29 13:40:00 -08:00
snipe f5e100a6a5 Only allow asset files to be deleted, maintenances to be added if user has assets.edit permission 2016-11-29 13:37:45 -08:00
snipe abcc01f5e0 More language string corrections 2016-11-29 12:48:00 -08:00
snipe 4dbe8fad30 More language string fixes 2016-11-29 08:46:33 -08:00
snipe 7bf1664b8f Allow XML mimetypes 2016-11-29 08:01:08 -08:00
snipe 92ace8582d Fixed notes column header language string 2016-11-29 07:57:02 -08:00
snipe 507040976a Fixed incorrect license field text strings 2016-11-29 07:52:00 -08:00
snipe b0d8711002 Add .lic as possible license file type 2016-11-29 07:22:45 -08:00
snipe 227ac94aa2 Bumped version hash 2016-11-29 06:21:37 -08:00
snipe 53404f3d1c Fixes asset model clone 2016-11-29 06:16:52 -08:00
snipe f605821143 Remove unneeded use statements 2016-11-29 06:14:33 -08:00
snipe cab331f3f8 Link model name in category view 2016-11-29 06:14:20 -08:00
snipe eb340b0fa9 Add fieldset to asset model listing 2016-11-29 06:06:52 -08:00
snipe 3acc4065ce Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-11-29 05:19:24 -08:00
snipe 2ce67e9443 Derp. 2016-11-29 05:19:18 -08:00
Daniel Meltzer 263f19bdad Fix error in partializing with creating an asset maintenance. (#2987) 2016-11-29 05:02:48 -08:00
snipe 4fc88f673d Only check if table exists if there is not a value for the static cache yet 2016-11-29 05:02:14 -08:00
snipe c72954b671 Fixes #2959 - fixed error with custom fields not populating correctly 2016-11-29 01:59:18 -08:00
snipe dbb2b62223 Fixed cranky Codacy result 2016-11-29 01:44:24 -08:00
snipe 7393f0bbea Fixes snipeSettings error if the user was created but the settings table isn’t populated yet 2016-11-29 01:20:51 -08:00
snipe 2603488bd6 Removed settings middlware 
(Already handled via AppServiceProvider)
 2016-11-29 01:19:52 -08:00
snipe 81a0e06c40 Automatically log the user in after user creation 2016-11-29 01:19:25 -08:00
snipe 0d6b160b61 Fix mail test script 2016-11-29 01:19:05 -08:00
snipe 16a24b7fb8 Use getSettings() to check for locale to take advantage of cached value 2016-11-29 00:21:58 -08:00
snipe ba23952852 Add red banner if app is in production mode and debugging is turned on 2016-11-29 00:08:20 -08:00
snipe 4c08331c9d Get settings in middleware, makr available in views 2016-11-28 22:53:16 -08:00
snipe cc943e22db Fixes #2970 
Should probably override this later using the global settings variable
 2016-11-28 22:38:11 -08:00
snipe 6bb5555a73 Fixes #2980 - enable MySQL SSL settings 2016-11-28 19:25:26 -08:00
Daniel Meltzer 3592bdb2e1 Assocate a locations asset with User, not log. (#2973) 
This fixes an issue where locations could not be deleted if at any point
they had an associated log entry.  Fixes #2916
 2016-11-24 12:48:22 -08:00
Daniel Meltzer b8cbf0022e Log fixes (#2972) 
* Make sure we set target_type when creating an accept asset log, and add a migration to fix older ones.

* On a declined log, we don't have an assigned user.

 Guard against this conditional (which realistically should never be hit?)
Should fix #2940

* Fix codacy issues with migration.
 2016-11-24 12:48:14 -08:00
Brady Wetherington dd3718489a Attempt to fix #2961. Also inadvertently added the ability to rename (#2974) 
and delete custom fields, as well. Bonus!
 2016-11-24 12:48:03 -08:00
Daniel Meltzer 7214920563 Update index.blade.php (#2963) 
Asset maintences should be searchable.
 2016-11-23 06:15:40 -08:00
Daniel Meltzer 8c549c47e4 Update bootstrap-table.blade.php (#2964) 
Fix error when search is not passed through.
 2016-11-23 05:56:08 -08:00
snipe 45c789021e Add employee number option to custom report 2016-11-23 05:17:54 -08:00
snipe 1d2ae84572 Fixes #2953 - re-adding the CoC 2016-11-21 18:51:42 -08:00
snipe 54dec2147c Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-11-21 18:40:38 -08:00
snipe bc84f80e20 Check if sig_filename exists 2016-11-21 18:40:26 -08:00
Daniel Meltzer ac9fd3b3bb Update LicensesController.php (#2948) 
* Update LicensesController.php

Should fix #2939.  Cannot test at the moment, so please check :)

* Add delete tests.  Improve test item generation.

* Add relationship here.

* Fix some issues with seeding.
 2016-11-20 19:59:57 -08:00
snipe d8eb68af83 Merge branch 'hotfixes/accessory_model_number' into develop 
# Conflicts:
#	resources/views/accessories/edit.blade.php
 2016-11-17 20:01:01 -08:00
snipe dcc000284f Add accessory model to accessories 2016-11-17 20:00:08 -08:00
snipe d0d9d82579 Add model number to accessories 2016-11-17 19:57:53 -08:00
snipe 54848b5edf Added enum conversion 2016-11-17 16:56:08 -08:00
snipe eb4562a28b Add enum conversation 
Tho I don’t know why we need this. I don’t see any enums left in the DB structure.
 2016-11-17 16:55:22 -08:00
snipe e8f45555ff Make length match validation 2016-11-17 16:18:39 -08:00
snipe 554a6e4fd6 Make length match validation 2016-11-17 16:18:15 -08:00
snipe 7efe3a3207 Merge branch 'hotfixes/state_length' into develop 2016-11-17 16:16:47 -08:00
snipe f77cb3d0f5 Increase DB size of state field in locations 2016-11-17 16:16:33 -08:00