DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 15:09:40 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14238 commits 101 branches 268 tags 288 MiB
Commit graph

4395 commits

Author SHA1 Message Date
snipe 86c0a3ecad Added localization for bootstrap-tables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:12:37 +01:00
snipe 3f20e29901 Moved gthe settings for remote loading to the branding section 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 16:55:47 +01:00
snipe 44bcc157e5 Updated icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:23:46 +01:00
snipe 278bf3da13 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:23:38 +01:00
snipe e372527d13 Added default_avatar to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:22:36 +01:00
snipe 96be1e1275 Removed duplicate locale directive 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 02:14:10 +01:00
snipe 708d7b5fc5 Use icons for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:43:44 +01:00
snipe 62b5a159a9 Added files column 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:31:09 +01:00
snipe a6d04509a5
Merge pull request #15016 from snipe/improved_user_merge 
Fixed #15005 - Improvements  on user merge
 2024-07-03 23:19:50 +01:00
snipe 0071596274 Added upload count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:18:43 +01:00
spencerrlongg a6690493b0 resolved 2024-07-03 16:12:55 -05:00
snipe 00fc392a12 Added missing traslations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 12:41:04 +01:00
snipe f22e99aec8
Merge pull request #14983 from snipe/fixes/use_more_modern_request_syntax_in_blades 
Use more modern reference for input text
 2024-07-02 08:43:34 +01:00
Marcus Moore 3a8f825de5
Link user table counts to section in user show 2024-07-01 14:06:05 -07:00
Marcus Moore d481850d4c
Add @can around Edit Your Profile button on view assets page 2024-07-01 10:11:27 -07:00
snipe d687b20467 Use more modern reference for input text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 15:05:47 +01:00
snipe 7dbcedad40
Merge pull request #14981 from uberbrady/fix_backup_translations 
Fixed #14976, #14975, #14973 - Translation strings aren't always working
 2024-06-27 14:36:52 +01:00
snipe 54fb91c03b
Merge pull request #14831 from marcusmoore/chore/sc-23725/livewire3 
Updated Livewire to v3
 2024-06-27 13:21:52 +01:00
Brady Wetherington 6df9742664 Built a workaround for backup notification translations 2024-06-27 13:17:16 +01:00
snipe f23a221750
Merge pull request #14942 from snipe/updates/start_moving_from_collective_forms 
WIP - First start at switching to regular html labels
 2024-06-27 13:12:29 +01:00
snipe 43773954cd
Merge pull request #14966 from Godmartinz/css_issue 
Fixed importer table background color
 2024-06-26 13:33:14 +01:00
snipe 251f2d82b3 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 12:53:03 +01:00
snipe adee99db34 Fixes #14968 - translate forbidden page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 11:21:56 +01:00
Godfrey M eda2eb2283 fixes all dark modes 2024-06-25 10:24:35 -07:00
Godfrey M a7123a04ba fixes importer background color 2024-06-25 10:19:18 -07:00
Marcus Moore d4861a74df
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-25 10:15:50 -07:00
snipe bca6dd41d2 Added avif to translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-25 13:39:36 +01:00
snipe 4d55765e28 Added checkbox to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:02:53 +01:00
snipe aa5fe52e89 Added gate in blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:56 +01:00
snipe ce107dd688 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:39 +01:00
snipe ba4c51dd68 Removed duplicate key 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:25 +01:00
snipe 294fb1f774
Merge pull request #14925 from snipe/fixes/added_2fa_string 
Additional translation strings
 2024-06-24 12:11:45 +01:00
snipe 5fb3cea0bb Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 11:41:20 +01:00
snipe f47bc5ea7d Updated hardware checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 19:40:52 +01:00
snipe 427615f627 Fiest start at switching to regular html labels 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 18:24:23 +01:00
snipe 9a0db72eb4 More strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:40:38 +01:00
snipe e11a42cf68 Re-use login string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:32:00 +01:00
snipe 114769c2d9 Made requestable items more generic in translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:26:45 +01:00
snipe 9594596b8a Fixed another hard-coded string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:22:27 +01:00
snipe 69cf697aa3 Added 2fa translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:20:52 +01:00
snipe 30c1e1e86a Merge remote-tracking branch 'origin/develop' 2024-06-20 14:32:46 +01:00
snipe 1113218c6c Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:23:15 +01:00
snipe 9e9c37c1e8 Fixed weird linebreaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:09:11 +01:00
snipe 6cbdbcb1f1
Merge pull request #14791 from Godmartinz/label-option-limit 
Added some  style changes in label field selector for the `DefaultLabel` template
 2024-06-20 13:51:49 +01:00
snipe c8835bf5db Merge remote-tracking branch 'origin/develop' 2024-06-20 13:40:37 +01:00
snipe bd1f43f9ee Added lastname.firstname as email format 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 13:36:48 +01:00
snipe 66ffe21ce2 Merge remote-tracking branch 'origin/develop' 2024-06-20 13:09:54 +01:00
snipe dd6d040da5 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 12:56:43 +01:00
Marcus Moore f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-18 15:10:46 -07:00
snipe d0299de898 Merge remote-tracking branch 'origin/develop' 2024-06-18 11:25:55 +01:00