DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12049 commits 101 branches 268 tags 288 MiB
Commit graph

12049 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 10d867ccc9 Merge remote-tracking branch 'origin/develop' 2023-11-22 12:28:42 +00:00
snipe eae98d3f35
Merge pull request #13923 from snipe/bug/sc-24098 
Quick revert for #13830
 2023-11-22 12:28:25 +00:00
snipe a08dcbdfdb Quick revert for #13830 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 12:25:42 +00:00
snipe 9c4fbbe915
Merge pull request #13922 from snipe/bug/sc-24097 
Created mutator on category checkin_email
 2023-11-22 12:16:07 +00:00
snipe d6a337a584 English hard 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 11:23:17 +00:00
snipe 83ee07cca1 Created mutator on category checkin_email 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 11:14:04 +00:00
snipe f12efcf5b2 Merge remote-tracking branch 'origin/develop' 2023-11-21 15:45:13 +00:00
snipe 9502525a41
Merge pull request #13914 from snipe/bug/sc-24073 
Fixed missing translation string for `validation.two_column_unique_undeleted`
 2023-11-21 15:44:56 +00:00
snipe 68ac1aaae0 Additional comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:36:11 +00:00
snipe 6a2ab2cfb2 Removed line break 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:10:19 +00:00
snipe fb125af0df Tweaked language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:09:50 +00:00
snipe 590cd0c71f Added Validator::replace() for friendlier interpretation of validation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:03:59 +00:00
snipe 0ae91d305d Add the two_column_unique_undeleted translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:03:03 +00:00
snipe 0a1eef2e5b Merge remote-tracking branch 'origin/develop' 2023-11-21 14:12:50 +00:00
snipe 9347af0970
Merge pull request #13913 from snipe/bug/sc-24071 
Fixed #13905 - Use `unique_undeleted` instead of `unique_serial`
 2023-11-21 14:12:15 +00:00
snipe 766eee78b2 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 13:47:49 +00:00
snipe 2b9e4110bc Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 13:37:56 +00:00
snipe 4eb435e148 Use unique_undeleted instead of unique_serial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 12:36:11 +00:00
snipe 6573ea6da6 Merge remote-tracking branch 'origin/develop' 2023-11-20 15:41:55 +00:00
snipe a203189724 Add @Azooz2014 as a contributor 2023-11-20 15:41:36 +00:00
snipe b02c60c2ce
Merge pull request #13898 from Azooz2014/develop 
Fixed #13850: Too few arguments to function in App\Importer\UserImporter::fetchManager()
 2023-11-20 15:41:04 +00:00
snipe c14b3d9780
Merge pull request #13904 from snipe/fixes/redirect_to_consumable_on_invalid_category 
Redirect back to the specific consumable for correction
 2023-11-20 15:40:40 +00:00
snipe 01fec1d6bb Redirect back to the specific consumable for correction 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:39:39 +00:00
snipe 9907da0aae Merge remote-tracking branch 'origin/develop' 2023-11-20 15:32:21 +00:00
snipe 01740b7969
Merge pull request #13903 from snipe/fixes/redirect_if_category_invalid 
Redirect if category is missing or invalid
 2023-11-20 15:31:58 +00:00
snipe 7c88601066 Grab the API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:31:39 +00:00
snipe fe2cfa0d38 Redirect if category is missing or invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:28:44 +00:00
Abdelaziz Faki 2c62a7e78d
Fixing #13850 UserImporter bug 2023-11-19 19:59:01 +03:00
snipe 7baf8e36c0 Merge remote-tracking branch 'origin/develop' 2023-11-19 07:16:34 +00:00
snipe ad6822875d
Merge pull request #13892 from Godmartinz/ldap_sync_bug 
added a `empty()` around location_id to fix  ldap sync bug
 2023-11-19 06:58:38 +00:00
Godfrey Martinez 5569c2ba4a
Merge branch 'develop' into ldap_sync_bug 2023-11-16 10:02:56 -08:00
Godfrey M 2f12a9cfe2 add a conditional around location_id to fix bug 2023-11-16 09:52:44 -08:00
snipe 617f58e046 Merge remote-tracking branch 'origin/develop' 2023-11-16 15:28:13 +00:00
snipe 81583207a9
Merge pull request #13887 from spencerrlongg/bug/sc-24024 
Fix for Unique Serial
 2023-11-16 15:27:55 +00:00
spencerrlongg b1f75a3bb3 remove unused import 2023-11-15 13:20:17 -06:00
spencerrlongg c7f90ad86d tested, working 2023-11-15 12:50:40 -06:00
spencerrlongg 0924a53789 quick fix 2023-11-15 12:28:30 -06:00
snipe 0da3ef70d9 Merge remote-tracking branch 'origin/develop' 2023-11-14 16:16:30 +00:00
snipe eb87720661
Merge pull request #13878 from snipe/fixes/clearer_error_text_on_import 
Clarified upload error text
 2023-11-14 16:16:16 +00:00
snipe 9316ecb8d6 CLarified upload error text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-14 16:14:39 +00:00
snipe ec83b733f1 Merge remote-tracking branch 'origin/develop' 2023-11-14 14:40:21 +00:00
snipe a81e2be6da
Merge pull request #13876 from snipe/fixes/added_fieldmap_back_for_cli_import 
Added default map back to the importer
 2023-11-14 14:40:08 +00:00
snipe 73ebd9017f Added default map back to the importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-14 14:37:48 +00:00
snipe a48eb60f87 Merge remote-tracking branch 'origin/develop' 2023-11-13 20:40:05 +00:00
snipe 4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769 
Changed data source input to select in new label engine
 2023-11-13 20:38:42 +00:00
snipe 9dc9834bcb
Merge pull request #13859 from inietov/fixes/attempt_to_read_id_on_boolean 
Fixed ErrorExemption: Attempt to read property "id" on bool [sc-23945]
 2023-11-13 20:22:52 +00:00
snipe 4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations 
Added multi location sync for ldap
 2023-11-13 20:20:45 +00:00
snipe 000a28d648
Merge pull request #13830 from spencerrlongg/bug/sc-23921 
Resolves Exceptions When An Array is Submitted and Exception Occurs Before Validation
 2023-11-13 20:19:44 +00:00
snipe f3d6de316b Merge branch 'master' of https://github.com/snipe/snipe-it 2023-11-13 16:41:18 +00:00
snipe 1f17c6e4f4 Merge remote-tracking branch 'origin/develop' 2023-11-13 16:41:07 +00:00