DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
5032 commits 101 branches 268 tags 320 MiB
Commit graph

5032 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe c5560e466e
Removed fieldset from test 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 20:17:35 -07:00
snipe 157a2ee869
Merge pull request #8048 from dmeltzer/license-importer-checkout-fix 
License importer checkout fixes
 2020-05-12 13:51:36 -07:00
snipe de7ee40863
Fixed failing test 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 11:52:08 -07:00
Daniel Meltzer a6f90cb3fc
Assorted licenses UI fixes while testing. 
* Rename licenses route checkin parameter to clarify it's purpose and
fix incorrect route in users view page.
* Checkin note can be nullable for checking in a license.
* License Seat view was only showing 20 license seats due to faulty
transformer logic.
 2020-05-12 14:38:21 -04:00
Daniel Meltzer 1321304720
Importer UI: Removed misleading checked out to field. Add full name and asset tag fields to licenses. 2020-05-12 14:38:21 -04:00
Daniel Meltzer e4888b23e2
Save User ID when checking out a license. Also buff up importing tests to confirm license can be checked out. 2020-05-12 14:38:20 -04:00
snipe 274f82893f
Regenerate session ID on logout 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 10:38:00 -07:00
snipe 730632e2eb
Apply PR #8043 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 22:57:55 -07:00
snipe d22be8ee0e
Merge pull request #8036 from johnson-yi/features/saml_auth 
Additional updates/fixes for saml
 2020-05-11 17:04:37 -07:00
Johnson Yi 572185ac96 Revised how saml sp info is displayed 2020-05-09 09:44:51 +10:00
Johnson Yi 3d8fce50d0 Removed unnecessary default saml settings 2020-05-09 01:51:48 +10:00
snipe 6018a9c6ee
Add @johnson-yi as a contributor 2020-05-06 19:21:56 -07:00
snipe c3d8024e1f
Merge pull request #8023 from johnson-yi/features/saml_auth 
Added #542: add saml authentication
 2020-05-06 17:28:30 -07:00
Johnson Yi c1c37d521c Allow downloading sp metadata without idp 2020-05-06 19:50:50 +10:00
Johnson Yi b2930d6069 Added #542: add saml authentication 2020-05-06 00:06:19 +10:00
snipe 8ecb7969df
Fixed incorrect route for saving groups 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-01 01:26:15 -07:00
snipe 85712a1960
Only override fieldset_id with custom_fieldset_id if it’s present 
This is mostly to support prior versions. I have NFC why we did this in the first place. I’m sure I had a stellar reason, but couldn’t tell you what it is today.

Signed-off-by: snipe <snipe@snipe.net>
 2020-04-30 20:59:42 -07:00
snipe e9cb17394c
Small validation fix on reset password 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-30 19:10:07 -07:00
snipe 8507bcd16b
Merge pull request #8008 from dmeltzer/component-checkinout-fixes 
Component checkout/checkin fixes.
 2020-04-30 17:49:22 -07:00
snipe e47c44d055
Merge pull request #8007 from dmeltzer/permissions-form-cleanup 
Permissions edit cleanups.
 2020-04-30 17:48:24 -07:00
snipe b488cffc7e
Merge pull request #8006 from dmeltzer/api-test-fixes 
Test fixes pt 2.
 2020-04-30 17:46:25 -07:00
snipe 8bb3c01f78
Addressed merge issue for reset password for #7997 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-30 17:45:05 -07:00
snipe 82e02490fd
Removed duplicate update method (per #7997) 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-30 17:23:56 -07:00
Daniel Meltzer bfba30058c
Fix incorrect routing. 2020-04-30 10:35:26 -04:00
Daniel Meltzer debdccf5f1
Remove old help text translation that doesn't exist any more 2020-04-30 10:35:11 -04:00
Daniel Meltzer 441049d8ac
Sort license seats by their number only, making the sort order more logical 2020-04-30 10:34:30 -04:00
Daniel Meltzer b28a4f3108
Add component unit test and unify some validation. 2020-04-30 09:50:12 -04:00
Daniel Meltzer 68224757f4
Validate when editing the quantity of a component that the new quantity is > the amount checked out 2020-04-29 13:25:04 -04:00
Daniel Meltzer 358609720a
Component checkout/checkin fixes. 
- Provide proper translated messages for checkin vs checkout
- Pass appropriate methods to the Checkout event, fixes an error on
checkin.
- Default to a value of 1 on checkin in UI to save a click sometimes.
 2020-04-29 12:50:09 -04:00
Daniel Meltzer 42e1e9a0bd
Permissions edit cleanups. 
- Make each section of permissions it's own tbody for better styling
- Remove extra separators when theres nothing to separate
- Vertically center radio buttons in header rows.

Still on the ideal list:
 - Unify code between users and groups into one partial with
conditionals.
 - Sticky header row or put the header row in each section.
 2020-04-29 12:33:50 -04:00
Daniel Meltzer 1f8c3cc670
Test fixes. 2020-04-29 11:03:07 -04:00
Daniel Meltzer f8d18a8eb0
Revert asset-checkout-different validation. 
This was causing issues when trying to check an item out to a user or a
location because of the way laravel handles validation.

Instead, rely on the exception check we had in the controller.  I moved
this exception up to the model checkout method so that it would work
for anywhere that that method was called, even if it avoided the
controller.
 2020-04-29 10:59:00 -04:00
snipe c34650458f
Merge pull request #8003 from dmeltzer/test-fixes 
Test fixes
 2020-04-28 16:33:51 -07:00
Daniel Meltzer c65b8f97bb
Laravel 6 drops support for php7.1, add php7.4 instead. 2020-04-28 12:16:37 -04:00
Daniel Meltzer 61a216a531
Rearrange seeder order so that users validate properly on first seed run. This hopefully fixes the actionlog seeder error. 2020-04-28 12:14:23 -04:00
Daniel Meltzer 3e7fbb02b7
Notes and style cleanups 2020-04-28 11:44:17 -04:00
Daniel Meltzer 9520ccae47
Unit test fix. Cleaner this way. 2020-04-28 11:39:53 -04:00
Daniel Meltzer 05187eb27f
Fix Functional Tests. 2020-04-28 11:39:53 -04:00
Daniel Meltzer bb50828ca0
Remove General serial field now that the serial is part of the multi asset creation. 2020-04-28 11:39:53 -04:00
Daniel Meltzer c74b904f14
Fix Location parent different validation on new location creation. 2020-04-28 11:39:52 -04:00
Daniel Meltzer 82de51f23e
Some unittest fixes for local running adapting to various factory changes. 2020-04-28 11:39:52 -04:00
snipe c2f1fd4942
Make user form a little nicer looking 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-28 00:01:47 -07:00
snipe 412caebf69
Fixed logo uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 23:22:52 -07:00
snipe 3613da3685
Fixed dashboard boxes 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 23:05:04 -07:00
snipe b433b49469
Ficing webpack, CSS and JS (*whew* that sucked) 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 22:41:33 -07:00
snipe 72a1616b3c
Removed wonky assets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 21:02:42 -07:00
snipe f172747495
Handle parse error in custom fields edit per #7997 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 19:36:07 -07:00
snipe 6427f46a6b
Removed mix (switched to url()) for now until assets are fixed 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 19:35:21 -07:00
snipe b76b97d89b
Fix path in seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 18:17:44 -07:00
snipe 6847a331a7
Backport the column icon fix from master 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 05:55:38 -07:00