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
2684 commits 97 branches 266 tags 291 MiB
Commit graph

2684 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe c18220069d Bumped version 2017-10-23 21:17:23 -07:00
snipe fbf516284c One more time… 2017-10-23 21:13:39 -07:00
snipe 3db25dca7a Downgrade doctrine for php5.6 2017-10-23 20:54:52 -07:00
snipe 47c7061af5 Merge branch 'develop' 2017-10-23 20:11:01 -07:00
snipe 3799ab87ed Fixed search query for default sorting 2017-10-23 20:10:37 -07:00
snipe 6232a1f941 Merge branch 'develop' 2017-10-23 19:51:29 -07:00
snipe f5ce580593 Bumped version 2017-10-23 19:51:14 -07:00
snipe 3afa5f7cda Merge branch 'develop' 2017-10-23 19:50:09 -07:00
snipe 17b271918f Fix date picker for custom fields 2017-10-23 19:47:43 -07:00
snipe 3922569d7f Merge branch 'develop' 2017-10-23 19:14:13 -07:00
Nicolai Essig 3a302fe2d7 ref #2737 prevent assets with "rtd_location_id" null values to be removed on location sort (#4283) 2017-10-23 18:28:06 -07:00
snipe 249f86bb21 Merge branch 'develop' 2017-10-23 17:50:58 -07:00
snipe 0951a756cc Updated passport to 3.0 
Re: https://stackoverflow.com/a/45029309/200021
via @robertpearce
 2017-10-23 17:35:31 -07:00
snipe fc644925ea Fixes #4291 - adds phone to user listing 2017-10-23 14:21:51 -07:00
snipe 59c0b63ad0 Merge branch 'develop' 2017-10-20 20:22:42 -07:00
snipe c0f8b3773c Temp fix for markdown stuff 2017-10-20 20:22:14 -07:00
snipe fd210c6439 Fixes #4267 - email notifications showing model name as number 2017-10-20 18:58:11 -07:00
snipe f7e23cf7c8 Fixes #4272 - adds serial to assigned assets view 2017-10-20 18:51:14 -07:00
snipe 387351d7ed Merge branch 'master' of github.com:snipe/snipe-it 2017-10-20 17:44:35 -07:00
snipe 6438d30afc Merge branch 'develop' 2017-10-20 17:44:28 -07:00
snipe b4e1d37b16 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-10-20 17:44:04 -07:00
Brady Wetherington 8ac57d0121 Need to prefix status_id with assets. for uniqueness (#4279) 2017-10-20 17:37:46 -07:00
Kasey d3b51715dc adding --force to php artistan snipeit:legacy-recrypt (#4232) 2017-10-20 17:21:21 -07:00
snipe b215924b1a Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-10-20 17:18:13 -07:00
Brady Wetherington 25d3d66880 Add performance-improving indexes (#4278) 2017-10-20 17:17:11 -07:00
Brady Wetherington 189574377a Add 'where' clause to hasManyThrough relationship. (#4276) 2017-10-20 16:58:39 -07:00
snipe 341ddec9d8 Adds built-in mail notification vendor templates 2017-10-20 16:52:12 -07:00
Nicolai Essig abcce78944 use translation for "All" in sidebar menu (#4268) 2017-10-20 00:20:33 -07:00
snipe 22e13cd4d2 Allow sorting on asset counts, disable delete button if the user has items checked out to them 2017-10-19 17:15:21 -07:00
snipe 5c105b52b6 Merge branch 'develop' 2017-10-19 16:45:22 -07:00
snipe f757da1a98 Bumped hash 2017-10-19 16:45:04 -07:00
snipe c1f8db37d9 Added note about saving before testing LDAP 2017-10-19 16:35:59 -07:00
snipe cfc215a013 Merge branch 'develop' 2017-10-19 16:28:26 -07:00
snipe 4215a3257b Fixes #1044 - adds suppliers and image to accessories (#4266) 
* Ignore accesories uploads

* API: Allow searching accessories by supplier id

* Adds suppliers and image upload to accessories

* Allow sorting by counts for suppliers

* Validate supplier image uploads

* Remove purchase_date from protected accessory array, it was converting it to datetime in datepicker
 2017-10-19 16:25:24 -07:00
snipe 1f247ff541 Don’t let the user checkout an asset to itself 
(We should consolidate that AssetCheckoutRequest for the API)
 2017-10-19 15:51:55 -07:00
snipe 2fc46746e2 Adds translation string placeholders for new LDAP functionality 2017-10-19 12:22:54 -07:00
snipe e185dc68af Fixes #4240 - allows admins to use custom password reset URL 2017-10-19 12:22:27 -07:00
snipe 54000ff69f Allows sorting by number of assets, etc in category 2017-10-19 11:48:09 -07:00
snipe f6a38e848a Allows sorting by whether or not the category requires acceptance 2017-10-19 11:44:42 -07:00
snipe 7e8d670f81 Disable delete buttons if there are assets, etc 2017-10-19 11:41:35 -07:00
snipe 287b150b7f Show disabled delete button if thing can’t be deleted 2017-10-19 11:29:58 -07:00
snipe b379656d55 Adds more consistent visual display of status label types 2017-10-19 11:06:55 -07:00
snipe 2e11a983c8 Nicer card display of status type explanations 2017-10-19 10:52:30 -07:00
snipe a9753eb646 Include asset count in status labels overview 2017-10-19 10:48:15 -07:00
snipe 707c4db881 API: Check there are no assets associated before allowing delete 2017-10-19 10:39:08 -07:00
snipe d1de34394e Removed stupid count method 2017-10-19 10:37:30 -07:00
snipe e5719441bc Merge branch 'develop' 2017-10-19 08:36:05 -07:00
snipe 7153013fb0 Fake sending the test email if the app is in demo mode 2017-10-19 08:33:46 -07:00
snipe 55500f77fb Merge branch 'develop' 2017-10-19 08:20:44 -07:00
snipe 2b826c3adc Merge branch 'features/mail_test_button' into develop 2017-10-19 08:19:24 -07:00