DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
14045 commits 96 branches 267 tags 295 MiB
Commit graph

14045 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe e03614d91b Added withtrashed back in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 16:40:32 +01:00
snipe b82770d0a8 One more small fix 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 16:38:29 +01:00
snipe 55e1326164 Fixed #14935 - user does not exist 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 16:24:18 +01:00
snipe 30c1e1e86a Merge remote-tracking branch 'origin/develop' 2024-06-20 14:32:46 +01:00
snipe 9a90813877
Merge pull request #14923 from snipe/localizations/updated_strings 
Updated language strings
 2024-06-20 14:29:13 +01:00
snipe 1113218c6c Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:23:15 +01:00
snipe 2556c80250
Merge pull request #14922 from snipe/fixes/incorrect_translation_path 
Fixed incorrect translation path
 2024-06-20 14:10:32 +01:00
snipe 8f8a5c639b Updated profile translation string path 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:09:25 +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 6dfedac7a7
Merge pull request #14912 from bryanlopezinc/addIsWritableTest 
Add storage path permissions test
 2024-06-20 13:38:56 +01:00
snipe 83794eaf33
Merge pull request #14921 from snipe/fixes/14918_added_lastname_dot_firstname 
Added lastname.firstname as email format
 2024-06-20 13:38:30 +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 f2e86b7d30
Merge pull request #14920 from snipe/fixes/backup_notifications 
Fixed backup notification translations
 2024-06-20 13:09:26 +01:00
snipe 5251e6787d Use two-letter fallback code 
Ugh, I hate this

Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 12:58:00 +01:00
snipe 856aee0a72 Updated laravel-backup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 12:57:35 +01:00
snipe 6b4c71f966 Updated config 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 12:57:25 +01:00
snipe dd6d040da5 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 12:56:43 +01:00
bryanlopezinc 203b60383f Added storage path permissions test for SettingsController@getSetupIndex 2024-06-19 17:46:59 +01:00
snipe 61ced0b221 Merge remote-tracking branch 'origin/develop' 2024-06-19 11:41:11 +01:00
snipe ae7675fee0 Added audit date validation back in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:37:15 +01:00
snipe 66ed26fbf9 Merge remote-tracking branch 'origin/develop' 2024-06-19 11:13:47 +01:00
snipe 98662c2a77
Merge pull request #14908 from snipe/fixes/importer_audit_date 
Fixes/importer audit date
 2024-06-19 11:12:12 +01:00
snipe 7099358985 Added accessor/mutator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:11:50 +01:00
snipe 9a706b3e3e Removed datetime validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:05:31 +01:00
snipe 71c9b03779 Fixed incorrect field name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:05:22 +01:00
snipe dc7b9315b5 Merge remote-tracking branch 'origin/develop' 2024-06-19 10:35:54 +01:00
snipe 6c17b141db Removed duplicate locations_id search 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 10:35:21 +01:00
snipe 5d2cca855e Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-06-19 10:31:04 +01:00
snipe 61e10be04d Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 10:29:50 +01:00
snipe 20d5587851 Merge remote-tracking branch 'origin/develop' 2024-06-19 10:23:18 +01:00
snipe d8eccf03f1
Merge pull request #14896 from snipe/fixes/tls_loading 
Possible fix for proxy/reverse proxy
 2024-06-19 10:22:36 +01:00
snipe 6e40b58dc5 Merge remote-tracking branch 'origin/develop' 2024-06-19 01:21:52 +01:00
snipe b8882fa00e
Merge pull request #14900 from marcusmoore/fixes/81-install 
Fixed unable to install on PHP 8.1
 2024-06-18 21:53:30 +01:00
Marcus Moore af337b7018
Move debugbar back to dev dependencies but without updating other packages 2024-06-18 09:46:08 -07:00
Marcus Moore f60267d208
Revert "Reverted debugbar back into require vs require-dev" 
This reverts commit ce338c632d.
 2024-06-18 09:42:21 -07:00
snipe a0c844f4f6 Merge remote-tracking branch 'origin/develop' 2024-06-18 16:12:20 +01:00
snipe 7b84b92e72
Merge pull request #14899 from snipe/fixes/revert_debugbar_dev 
Fixed #14898 - (regression) Reverted debugbar back into require vs require-dev
 2024-06-18 16:09:51 +01:00
snipe ce338c632d Reverted debugbar back into require vs require-dev 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 16:06:38 +01:00
snipe d9f70c16f7 Possible fix proxy/reverse proxy 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 14:44:35 +01:00
snipe d0299de898 Merge remote-tracking branch 'origin/develop' 2024-06-18 11:25:55 +01:00
snipe 9380c9ec81
Merge pull request #14894 from snipe/fixes/14882_archived_scoping_on_models 
Fixed #14882 - Properly scope archived based on settings
 2024-06-18 11:24:55 +01:00
snipe 941582ac2a Properly scope archived based on settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 10:27:11 +01:00
snipe 04560b4475 Merge remote-tracking branch 'origin/develop' 2024-06-18 10:13:57 +01:00
snipe 0b30ad0da2 Removed test file - #14890 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 10:12:57 +01:00
snipe cb6ea2c6fb Merge remote-tracking branch 'origin/develop' 2024-06-18 09:59:43 +01:00
snipe 89a5bbb10e
Merge pull request #14893 from snipe/fixes/rb_3792_ambiguous_query 
Prefaced fields with “users” for clarity
 2024-06-18 09:58:44 +01:00
snipe 2f59bb74cd Prefaced fields with “users” for clarity 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 09:52:41 +01:00