DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
4200 commits 97 branches 266 tags 291 MiB
Commit graph

4200 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 9a25cb3ee7 Set default labels in seeders 2018-03-05 22:16:36 -08:00
snipe 1e22b8e567 Fixed #5138 - added default_label flag to status labels 2018-03-05 22:04:16 -08:00
snipe d05dfb18a7 Fixed #5150 - added lastname first initial as username format 2018-03-05 21:39:05 -08:00
snipe a5c6ddb8ac Change gate for updating assets via the API to edit 2018-03-05 21:27:17 -08:00
snipe 90bff709a4 Merge branch 'develop' 2018-03-05 20:58:08 -08:00
snipe 052132ec37 Remove pyrchase cost from accessory search 2018-03-05 20:57:50 -08:00
snipe d42361bac1 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-05 20:27:50 -08:00
snipe 2df19bcbb4 Only pull category matches for accessory category 2018-03-05 20:22:44 -08:00
snipe 0ef4251462 Include new icons in stalebot 2018-03-05 19:06:39 -08:00
snipe a4af81563a Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-03-05 16:26:49 -08:00
snipe 36cd63836e Fixed #5151 - added asset tag to maintenances 2018-03-05 16:26:40 -08:00
tiagom62 48f9959fcd snipeit.sh improvements (#4708) 
* snipeit.sh improvements

* Missing dependency for upgrade.php #4726

* Upgrade noninteractively
 2018-03-04 21:48:44 -08:00
snipe 9effa3d2ab Fixed manufacturer restore 2018-03-03 19:14:27 -08:00
snipe 0782222c6b Removed commenting 
This restore() is still not working, though not sure why. Seems like it should be pretty straghtforward, and yet…

Additonally, manually setting the deleted)at date to null or blank isn’t working either. I’m sure I’m just missing something obvious.
 2018-03-03 18:49:02 -08:00
snipe f7784b6543 Fixed #2402 - add ability to restore manufacturers 2018-03-03 18:46:19 -08:00
snipe fabc9e5d1c Bumped hash 2018-03-03 17:15:59 -08:00
snipe 06805d70fe Fixed incorrect settings HTML 2018-03-03 17:07:28 -08:00
snipe 123e317e52 Check for an array (for PHP7.2 support) 2018-03-03 17:07:07 -08:00
fordster78 68a9855506 New First Admin Notification (#5147) 
* New First Admin Notification

* Include Last name in Welcome and First admin Notifications
 2018-03-03 14:37:42 -08:00
fordster78 688a3251a9 New Welcome Notification (#5146) 
* New Test Notification

Created Test Notification.
Updated Vendor Mail message.blade files.
Updated api settings controller to use Notification Façade.

* Add show URL in Emails condition

* New Welcome Notification
 2018-03-03 12:44:41 -08:00
snipe 30c5cc1dc4 Additional dark themes 2018-03-02 20:01:41 -08:00
snipe 4ab1d5ca7f Fixed #5110 - crash on accessory checkin missing last_name 2018-03-02 19:26:41 -08:00
snipe 5a808a0f91 Fix for header color in green skin 2018-03-02 19:17:12 -08:00
snipe a6cc31944a Added package-lock 2018-03-02 19:17:01 -08:00
snipe 41a9e5f710 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-03-02 18:01:41 -08:00
snipe 31790e0bb7 Tweaks to theme settings 2018-03-02 18:01:36 -08:00
fordster78 4e0c8e218d New Test Notification (#5137) 
Created Test Notification.
Updated Vendor Mail message.blade files.
Updated api settings controller to use Notification Façade.
 2018-03-02 18:01:20 -08:00
Geoff Young 4fe4c0c72a Add viewKeys permission check on Asset page (#5141) 2018-03-02 18:00:22 -08:00
snipe f171357e36 Removed unused skin files, added skin setting option 2018-03-02 17:50:40 -08:00
snipe ef91cc992e Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-03-02 16:52:00 -08:00
snipe 04b92f2ad2 Added info on third-party libraries 2018-03-02 16:51:56 -08:00
Tim F 4f049112de Patch for dark-green.css to include more in template. (#5122) 
* Update dark-green.css

Added several new rules, to include little bits that weren't previously. Mostly centered around the new 'form' page and the various settings pages.

* Update dark-green.css

Fixed buttons for "View All" on main page. Missed those previously. Well, the buttons were included, but not the hover effects.
 2018-03-01 20:45:22 -08:00
Tim F 86242b322c Create dark-green.css (#5118) 2018-02-27 14:10:08 -08:00
Tim F 14af95001e Create dark-green.css (#5117) 2018-02-27 13:37:12 -08:00
snipe 2dd56f5bda Backup the .env if BACKUP_ENV is set to true 2018-02-26 18:12:48 -08:00
snipe c250c632f3 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-26 15:46:49 -08:00
snipe e3fb4f8799 Bumped hash 2018-02-26 15:44:36 -08:00
snipe b4f704d7f1 Fixed 2FA reset button 2018-02-26 15:43:49 -08:00
Daniel Meltzer 9ee2c6be57 Api tests2 (#5098) 
* Cleanup

* API tests for asset models and related cleanup/improvements

* Api license test.  Tests incomplete because create/update/destroy are not implemented yet in the controller

* API Category tests.

* Manufacturers API Test.

* Implement License Create/Update/Delete Methods for API and enable test.

* Add missing gate for api.  Fixes only superadmins being able to generate Personal Access Toekns
 2018-02-25 12:10:02 -08:00
Daniel Meltzer 7de8f71f58 Api tests (#5096) 
* Use the formated date helper to clean up verifications.

* Add Checkin/Checkout api tests.

* Accessories api test

* Add Companies API Test.

* Return ModelNotFound as a 404.

* Cleanups/simplficiations/updates.

* Locations api test.

* currency and image should be fillable on location.

* Update components api test.

* Use findOrFail so we return a 404 instead of a 200.  Matches other item types.

* order_number should be fillable in component.

* Add updated_at and permissions to information returned from api for a user.

* Add users test and flesh out factory and fillable fields.

* Add test for assets method

* API status label test.

* Disable php7.2 for now on travis until the count(null) issues are remedied

* Add serial to update.

* API model not found should return a 200
 2018-02-24 19:01:34 -08:00
snipe b6a75093b7 Removed duplicate location_id assignment 2018-02-24 14:06:10 -08:00
Daniel Meltzer d54dda40d3 Functional Tests Improvements (#5095) 
* Rely on laravel transactions instead of refreshing the database dump between functional test runs.  Cuts functional test runtime by 75%.  Also use mysql to seed directly.

* Split functional tests into two groups on travis to reduce overall memory usage.  Any new tests will need to be added to one of these two files before they are run on travis.  running all functional tests simultaneously still works locally.

* Fix name of test in group.
 2018-02-24 12:03:33 -08:00
snipe a705c714ab Merge branch 'develop' 2018-02-23 05:53:44 -08:00
snipe 0e48837eec Fixed assets checked out to assets listing table 2018-02-23 05:53:00 -08:00
snipe 5e5ba54c3e Disallow checkout asset to itself 2018-02-23 05:52:19 -08:00
snipe 4403b139d5 Merge branch 'develop' 2018-02-23 05:12:49 -08:00
snipe 103974cae4 Fixed statuslabel detail view table 2018-02-23 05:09:14 -08:00
snipe aea37467d8 Attempt to add codeclimate test coverage 2018-02-22 22:34:08 -08:00
snipe 9d2ed7bc5f Merge branch 'develop' 2018-02-22 21:49:37 -08:00
snipe bfb11d249e Tweaked slack test UI 2018-02-22 21:47:48 -08:00