ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,255 Commits 84 Branches 293 Tags
f7dfb09a4db39150f89e1b0908fa4e055ba002ab
Commit Graph

4903 Commits

Author SHA1 Message Date
snipe f7dfb09a4d Merge remote-tracking branch 'origin/develop' 2025-08-08 09:56:23 +01:00
snipe 12be088c4f Merge pull request #17523 from Godmartinz/fix-create-new-rediret 
Fixes #17457 Previous Page redirect option
 2025-08-08 09:50:40 +01:00
snipe 6737ba80cd Merge pull request #17489 from grokability/fixes/#17485-handle-alert-menu-better-if-no-alerts 
Fixed #17485: nicer alert menu if no items are below qty
 2025-08-08 09:50:14 +01:00
Godfrey M e47972731b fixed target name for checkouts with licenses and assets 2025-08-07 15:12:23 -07:00
snipe 67c931f196 Merge pull request #17080 from marcusmoore/allow-id-on-location-select 
Allowed setting `id` on location-select component
 2025-08-07 18:16:58 +01:00
snipe 3135917127 Merge remote-tracking branch 'origin/develop' 2025-08-07 17:03:01 +01:00
snipe 7bccb7718b Added partial and enctype="multipart/form-data for upload 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-07 15:38:22 +01:00
snipe f6b63b5e44 Added image to view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-07 15:38:04 +01:00
snipe 2afc595452 Don’t show license key formatter if no value 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-06 16:47:47 +01:00
snipe 52afa3d36d Merge remote-tracking branch 'origin/develop' 2025-08-06 16:35:59 +01:00
snipe 8662aa2277 Put remaining seats back on license view for now 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-06 16:33:02 +01:00
snipe 242aa60e04 Merge remote-tracking branch 'origin/develop' 2025-08-06 16:26:14 +01:00
snipe 8095e0ab72 Normalize consumables user response 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-06 16:25:51 +01:00
snipe 7a3c2c27ff Merge remote-tracking branch 'origin/develop' 2025-08-05 23:19:38 +01:00
snipe be3c8ddd5c Hotfix for FD-50160 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-05 23:19:27 +01:00
Godfrey M bd2acefecc rethought, keeping previous page as an option 2025-08-05 12:29:59 -07:00
Godfrey M 18e49e9067 only redirect to previous page if not creating 2025-08-05 12:05:22 -07:00
snipe 5d124360c2 Merge remote-tracking branch 'origin/develop' 2025-08-05 19:35:12 +01:00
snipe a0d65520a3 Use count() instead of ->count() for user count in print view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-05 19:34:59 +01:00
snipe 9a0102c723 Merge remote-tracking branch 'origin/develop' 2025-08-05 19:03:00 +01:00
snipe 2fe08a721f Do not break the page if it’s the last entry 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-05 19:00:57 +01:00
snipe d4a34f1a3c Adds printer line break after signatures 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-05 18:50:47 +01:00
snipe 032a664d4c Merge remote-tracking branch 'origin/develop' 2025-08-04 22:27:59 +01:00
snipe d2a2c63070 Added dropdown menu for users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-04 22:25:23 +01:00
snipe aac1864c9b Merge remote-tracking branch 'origin/develop' 2025-08-04 21:23:41 +01:00
snipe 1d8493d388 Improved messaging for cloning/editing assets that inherit images 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-04 20:51:24 +01:00
snipe f1dd84edba Added option to clone original images 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-04 18:47:26 +01:00
snipe e3477f3306 Merge remote-tracking branch 'origin/develop' 2025-08-02 18:41:39 +01:00
snipe 06b040a337 Nicer padding 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-02 18:41:26 +01:00
snipe 6620a4f87b Merge remote-tracking branch 'origin/develop' 2025-08-02 14:47:09 +01:00
snipe f811352c79 Cleaned up HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-02 14:46:34 +01:00
snipe 7ed8963b9f Fixed #17498 - added serial to user acceptance 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-02 14:38:57 +01:00
snipe c0e9dff5bf Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/dist/all.js
#	public/js/dist/all.js.map
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2025-08-01 23:13:22 +01:00
snipe afd794b4c7 Fixed HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 22:20:17 +01:00
snipe c4a28f0ec4 Use consistent icon for adding people 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 22:18:02 +01:00
snipe db343bf795 Tweaked bootstrap admin indicators 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 22:15:13 +01:00
snipe 0157043dc5 Added table buttons to user view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 21:58:48 +01:00
snipe a947f9bd32 Fixed delete modal 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 21:30:18 +01:00
snipe 2a4181c7c3 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 21:19:18 +01:00
snipe 30192f5b14 Removed extra modal code 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 21:11:54 +01:00
snipe b27928807b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 20:44:44 +01:00
snipe 16f1b5e23e Added a few more buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 19:31:25 +01:00
snipe ed651b6869 Use translations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 18:55:15 +01:00
snipe b9d925c7aa Carry admin/superadmin into the API request 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 18:49:58 +01:00
snipe 3650a29381 Added superadmin/admin formatter 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 18:49:37 +01:00
snipe de84ee3693 Cleaned up asset view table 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 18:47:51 +01:00
snipe 1353837584 More buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 15:58:15 +01:00
snipe 7cb5a89523 Added access keys 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 15:58:07 +01:00
snipe bc6aa12dd0 Added buttons to table 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 15:20:55 +01:00
snipe c3bea88979 Added table button JS 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 15:20:39 +01:00