lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
6134 commits 1 branch 0 tags 220 MiB
Commit graph

2650 commits

Author SHA1 Message Date
snipe
8ccc1c6515
Fixed weird merge in Bulk Users Controller 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 22:46:42 -07:00
snipe
d54acd908c
Made logo file have a better name for multiple tries in the same day 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 02:31:04 -07:00
snipe
d14ab7e3e1
Porting change from #8053 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 00:22:44 -07:00
snipe
f196b5bd94
Merge pull request #8077 from dmeltzer/more-paving 
Sync paveit command with new database tables.
 2020-05-26 21:18:22 -07:00
snipe
e0d9cc4e73
Merge pull request #8053 from CharlotteDunoisLabs/fix-gravatar 
Take gravatar email into account in presenter
 2020-05-26 19:58:45 -07:00
snipe
dee1f5ec35
Merge pull request #8078 from dmeltzer/wrong-id 
Fix incorrectly named parameter.
 2020-05-26 19:51:38 -07:00
Daniel Meltzer
b3fe47bfa7
Remove/Reorganize logic to make codacy happier. 2020-05-23 15:24:10 -04:00
Daniel Meltzer
1e5d40f32e
Clean up extra code in notifications files. 2020-05-23 15:24:10 -04:00
Daniel Meltzer
f0546bf689
Clean up Transformers and extract an isDeletable() method to models where it makes sense. 2020-05-23 15:24:10 -04:00
Daniel Meltzer
136df9418f
Deadcode-- 2020-05-23 15:24:10 -04:00
Daniel Meltzer
7ea862787c
Refactor controller to use one method that shows all modals based on name. 2020-05-23 15:24:00 -04:00
Daniel Meltzer
25d6ceee6e
Remove old code. 2020-05-23 12:18:27 -04:00
Daniel Meltzer
4fef065010
Refactor big switch to lookup in array. A bit cleaner/codacy happier. 2020-05-23 12:17:56 -04:00
Daniel Meltzer
fe74394ae6
Short circuit checkout logic to prevent iterating if we're not checking out to an asset 2020-05-23 11:48:02 -04:00
Daniel Meltzer
c70bd62a0f
Missing includes. Fix by using the request object instead of facade. 2020-05-23 11:36:16 -04:00
Daniel Meltzer
ad1db2c640
Fix incorrectly named parameter. 2020-05-23 10:26:56 -04:00
Daniel Meltzer
2e936a9883
Sync paveit command with new database tables. 2020-05-23 09:08:32 -04:00
snipe
f88683766b
Roll back previous change 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-14 00:55:47 -07:00
snipe
e4385c0f8c
Fixes #8051 regression 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-14 00:48:30 -07:00
Charlotte Dunois
7f8c6fe282
Take gravatar email into account in presenter 2020-05-13 20:30:47 +02: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
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
0550fe0ffa
Fix for session fixation vulnerability 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 10:31:54 -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
95cc48e422
Added option to disable backup in import 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:41:10 -07:00
snipe
bb42109c0c
Added a clarifying comment 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:10:45 -07:00
snipe
b9e821c0e6
Small fix for Group Functional Tests 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:07:14 -07:00
Johnson Yi
3d8fce50d0 Removed unnecessary default saml settings 2020-05-09 01:51:48 +10: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
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
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
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
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
Daniel Meltzer
05187eb27f
Fix Functional Tests. 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
snipe
412caebf69
Fixed logo uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 23:22:52 -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
snipe
e009fbe59f
Converted table heading icons in People to CSS glyphs 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 04:04:53 -07:00
snipe
5bb4f271aa
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 00:47:19 -07:00
snipe
bea3a7b982
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 00:39:32 -07:00