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

5296 commits

Author SHA1 Message Date
snipe
3e62a6ea2d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-07-31 11:01:35 -07:00
snipe
e955c983a3
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer 
Added address, city, state and country to importer and city to bulk editor
 2020-07-22 13:43:29 -07:00
Godfrey Martinez
3b1e46f72b
Update general.php 2020-07-22 11:25:57 -07:00
Godfrey Martinez
0c1a1de2a2
Update general.php 
fixed typo
 2020-07-22 11:24:36 -07:00
Godfrey M
20c9ae5818 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats 2020-07-22 10:21:19 -07:00
snipe
eed41e4549
Moved address down further, fixed broken HTML 2020-07-21 16:57:32 -07:00
snipe
b750f4754f
Added city to bulk user importer 2020-07-21 16:49:54 -07:00
snipe
c17a06792a
Added address, city, state, country to user importer 2020-07-21 16:49:38 -07:00
snipe
b905154373
Fixed #8247 - added notes field to user details display 2020-07-20 14:29:32 -07:00
Brady Wetherington
68263ff806 Changed selectlist results to be 'items' for internal consistency 2020-07-16 15:33:38 -07:00
snipe
81a6332889
Removed license ID from seats table cookie info 
This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses
 2020-07-14 13:55:38 -07:00
Brady Wetherington
17f6fbabfa Switch to 'items' to maintain compatbility with other internal API's 2020-07-13 21:12:03 -07:00
Brady Wetherington
318da67230 Fix Select2 'infinite scroll' drop-downs for Snipe-IT v5 2020-07-13 17:43:15 -07:00
Brady Wetherington
e7a820f7c9 Changes how we do AJAX calls via Select2 for dynamic drop-down menus 2020-07-13 17:14:31 -07:00
Ivan Nieto
8fd4529fad Change the form input name for serials in the view 2020-07-13 13:49:21 -05:00
snipe
12c92e30b7
Show whether or not the user was imported via LDAP in the view page 2020-07-10 16:21:27 -07:00
snipe
fd10b755b0
Removed the sr-only tag in table headers 
It was breaking Bootstrap Tables column selector :(
 2020-07-10 11:30:01 -07:00
Sean Borg
567a9639f4 Enhanced #5762 Able to bulk edit expected checkin date 
In light of the need to edit 500+ devices #5762 (comment)
I added the expected checkin date to the bulk edit page for assets
 2020-07-10 19:21:34 +01:00
Sean Borg
7a433f8598 Updated purchase date format in hardware/bulkedit 
The Purchase date box in hardware/bulkedit was a different style
to the normal hardware/{id}/edit

It also prevents a strange bug I see in firefox when clicking the old datepicker
it presented 2 datepicker boxes
 2020-07-10 19:21:22 +01:00
snipe
b941ef1e08
Pulled CSS font awesome styles out of the blade and into overrides.css 2020-06-22 20:41:40 -07:00
snipe
d1aa11ec89
Fix for weird padlock display in asset listing with encrypted custom fields 2020-06-22 20:29:19 -07:00
Godfrey M
b10076b015 corrected an error where font-size for labels were static in settings. 2020-06-22 17:04:39 -07:00
snipe
a7eb89f6b6
Misc fixes for flysystem paths 2020-06-16 16:06:25 -07:00
snipe
7a785b4952
Updated a few flysystem settings 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-28 01:54:29 -07:00
Godfrey M
9839e5e566 adjusted for all label text, removed local variable 2020-05-27 12:27:40 -07:00
snipe
5b4e4c8dcd
Merge pull request #8061 from Godmartinz/develop 
fixed a table header error
 2020-05-26 19:52:14 -07:00
Godfrey M
e7f74d94c1 Label_Woes 2020-05-26 17:22:45 -07:00
Godfrey M
e97cf011b6 Label_Woes 2020-05-26 17:15:39 -07:00
Godfrey M
ed23505054 Label_Woes 2020-05-26 17:10:45 -07: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
7a76cb08a0
We accept xlsx in uploads 2020-05-23 11:36:47 -04:00
Daniel Meltzer
8210da6e82
Fix Missing Category selection in Asset Model Modal dialog. 
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
 2020-05-20 10:29:27 -04:00
Daniel Meltzer
6a80f95769
Fix Missing Category selection in Asset Model Modal dialog. 
A select html tag needs a full closing tag.  <select /> is not valid.
This was causing the select2 js to barf and eat additional information.
 2020-05-20 10:23:04 -04:00
Godfrey M
edd4797178 fixed a table header error 2020-05-19 16:59:09 -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
snipe
730632e2eb
Apply PR #8043 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 22:57:55 -07:00
snipe
f43df5f041
Fixed form label 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:44:46 -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
9a2ed804ca
Fixed mismatched HTML header tags 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:28:42 -07:00
snipe
d20fad28e5
Use more modern request helper 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:28:24 -07:00
snipe
9ee28c7513
Switched to use info instead of danger on undeployable statuses 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:07:02 -07:00
Johnson Yi
572185ac96 Revised how saml sp info is displayed 2020-05-09 09:44:51 +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
31c5350941
Fixed incorrect route for groups edit 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-01 01:05:48 -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
8bb3c01f78
Addressed merge issue for reset password for #7997 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-30 17:45:05 -07:00
Daniel Meltzer
bfba30058c
Fix incorrect routing. 2020-04-30 10:35:26 -04:00