ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,879 Commits 84 Branches 293 Tags
710f89291f414563eccb23d3e4790d64a8b331ea
Commit Graph

5879 Commits

Author SHA1 Message Date
snipe 710f89291f Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2025-07-08 21:27:06 +01:00
snipe f2b7a3d002 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-08 21:25:31 +01:00
snipe 0d325060da Merge remote-tracking branch 'origin/develop' 2025-07-07 17:06:24 +01:00
snipe 41c4920d45 Show only assigned in license tab 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-07 16:58:36 +01:00
snipe 1a6e98e18f Merge remote-tracking branch 'origin/develop' 2025-07-07 16:24:04 +01:00
snipe d1ddd8de98 Re-add column selector 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-07 16:23:48 +01:00
snipe 97e34595f6 Merge remote-tracking branch 'origin/develop' 2025-07-07 16:00:10 +01:00
snipe 8ebbcf6e80 Removed console commands 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-07 15:55:31 +01:00
snipe 24c6e836dd Added checkbox toggle 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-07 15:51:24 +01:00
snipe 8e38b3898e Fixes #14295 - allow user to receive an email PDF upon signing 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-07 15:38:36 +01:00
snipe a179d5234b Merge remote-tracking branch 'origin/develop' 2025-07-07 14:43:28 +01:00
snipe b092779697 Fixed #17273 - switch to HTML table from markdown 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-07 14:37:38 +01:00
snipe 64c6121fdb Merge remote-tracking branch 'origin/develop' 2025-07-07 14:00:55 +01:00
snipe ab30a96d16 Merge pull request #17327 from Godmartinz/asset_model_redirect 
FIXED: #15861 adds a redirect option for asset model and previous page
 2025-07-07 14:00:31 +01:00
snipe 08d8954a85 Merge remote-tracking branch 'origin/develop' 2025-07-07 14:00:03 +01:00
snipe dab0fb16ad Merge pull request #17291 from Godmartinz/fix_bulk_checkout_focus 
Fixes #12094 - Adds focus to select2 in bulk checkout
 2025-07-07 13:57:12 +01:00
snipe ccbffa086b Merge remote-tracking branch 'origin/develop' 2025-07-07 11:36:33 +01:00
snipe 4ef0158da4 Use preview instead of image text 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-03 20:19:29 +01:00
snipe 3e9098907a Use config file for file types/mimes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-03 20:11:31 +01:00
snipe e18df250f8 Removed console debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-03 20:08:08 +01:00
Godfrey M be5c5a51da get desired behavior of select-2 2025-07-02 11:20:04 -07:00
snipe 07ee4be840 Merge remote-tracking branch 'origin/develop' 2025-07-02 18:38:12 +01:00
snipe b135c1eac2 Updated language strings in view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-02 18:15:06 +01:00
snipe 556a9039e9 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-02 17:53:55 +01:00
snipe cdfe6c21c1 Tightened HTML, added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-02 17:53:42 +01:00
snipe ad0165d085 Merge remote-tracking branch 'origin/develop' 2025-07-02 11:44:30 +01:00
snipe 6cfdb49cc3 Fixed #17326 - sorting on dashboard 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-02 11:41:21 +01:00
Godfrey M 8a9cf07063 editing controllers and edit blades for other categories 2025-07-01 12:31:55 -07:00
Godfrey M 7217d9c427 adds redirect to previous page, use match instead of switch cases 2025-07-01 11:55:46 -07:00
Godfrey M f3e49e7010 add asset model as a redirect option 2025-07-01 10:43:00 -07:00
snipe 046ce19dbb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2025-06-30 11:46:24 +01:00
snipe edcd46dd67 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-30 11:44:46 +01:00
snipe 8ef8e76300 Merge remote-tracking branch 'origin/develop' 2025-06-27 12:48:54 +01:00
snipe d8e7123576 Added uploaded files API controllers and presenters 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-27 11:37:31 +01:00
snipe 54a3e41281 Merge remote-tracking branch 'origin/develop' 2025-06-25 14:58:46 +01:00
snipe ec17c168ea Merge pull request #17222 from grokability/fixes-#17221-move-table-featueres-into-js 
Fixed #17221 - Moved common table elements to partial
 2025-06-25 14:52:17 +01:00
snipe 119b097521 More cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:43:09 +01:00
snipe c731633a84 Fixed weird formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:40:26 +01:00
snipe 6a4d6ade39 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:39:46 +01:00
snipe b3b4697fc9 More whitespace cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:38:25 +01:00
snipe 72c706d697 Aaaand one more 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:30:34 +01:00
snipe 8a7af24bd4 More whitespace 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:29:33 +01:00
snipe dd01bd3e5f Cleaned up whitespace 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:29:01 +01:00
snipe 59cade9f82 Cleaned up whitespace 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:28:20 +01:00
snipe 6bb9b79832 Tweaked dashboard 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:11:29 +01:00
snipe f8fe7b5803 Removed whitespace 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:11:19 +01:00
snipe 4d6279d61c Added JS to handle data-dash attribute overrides 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:11:04 +01:00
snipe 5ef581f328 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 14:10:51 +01:00
snipe d59ba6da84 Merge remote-tracking branch 'origin/develop' 2025-06-25 13:11:39 +01:00
snipe 20a59c343e Merge pull request #17296 from uberbrady/improve_fmcs_locations_test 
Fixed #17190 and [FD-49375]: Do FMCS testing 'async' to keep from blowing out the whole settings page
 2025-06-25 13:10:54 +01:00