DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-29 07:29:44 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9766 commits 102 branches 268 tags 288 MiB
Commit graph

9766 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe b29276579f Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 20:34:31 -08:00
snipe dbe0a3352b Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2023-02-28 20:34:20 -08:00
snipe 6fec3f4303
Merge pull request #12586 from snipe/assets/compiled_dev_assets 
Compiled dev assets
 2023-02-28 20:32:41 -08:00
snipe f9b5a67dc2 Compiled dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 20:32:08 -08:00
snipe 2189a74d6a Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 20:32:00 -08:00
snipe 44e2796645
Merge pull request #12579 from Godmartinz/gh12571_sidebar_adjustment 
Fixes the sidebar margin top
 2023-02-28 20:30:07 -08:00
snipe 70d0347fe9
Merge pull request #12580 from marcusmoore/feature/crowdin-source-upload 
Add GitHub Action to push translation sources to Crowdin
 2023-02-28 20:28:04 -08:00
snipe 417a1e624a Merge remote-tracking branch 'origin/develop' 2023-02-28 18:22:24 -08:00
snipe 34f13eaa8a
Merge pull request #12393 from snipe/features/make_eol_sortable 
Added EOL as de-normed and sortable on assets
 2023-02-28 18:22:00 -08:00
snipe 1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable 2023-02-28 18:05:09 -08:00
snipe 3a4e20ae82 Merge remote-tracking branch 'origin/develop' 2023-02-28 16:57:59 -08:00
snipe 2ab0abc8a1
Merge pull request #12575 from inietov/fixes/typeError_get_class_argument_must_be_object_null_given 
Fixed: TypeError: get_class(): Argument #1 ($object) must be of type object, null given
 2023-02-28 16:45:53 -08:00
snipe 373aeb26da Merge remote-tracking branch 'origin/develop' 2023-02-28 16:14:42 -08:00
snipe d838662f48
Merge pull request #12585 from marcusmoore/fixes/fix-license-seeder 
Fix license seeder
 2023-02-28 16:03:15 -08:00
snipe ff122bd07c Merge remote-tracking branch 'origin/develop' 2023-02-28 15:56:35 -08:00
snipe 5e626e75ad
Merge pull request #12584 from snipe/fixes/error_on_datepicker 
Convert string to date object for formatting
 2023-02-28 15:55:59 -08:00
Marcus Moore a7a26bb154
Fix License Factory 2023-02-28 15:55:28 -08:00
snipe af9f9d2523 Convert string to date object for formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 15:48:45 -08:00
snipe d13e1b32e7
Merge pull request #12583 from inietov/fixes/user_start_and_end_date_error 
Fixed User start and end date throws error [sc-20228]
 2023-02-28 15:30:46 -08:00
Ivan Nieto Vivanco ad598425ef Adds format to the dates cast 2023-02-28 17:24:14 -06:00
snipe ec2ce1dff8 Merge remote-tracking branch 'origin/develop' 2023-02-28 15:13:22 -08:00
snipe 5194711a6a
Merge pull request #12582 from akemidx/bug/sc-20065/license-export-does-not-show-info-of-boolean 2023-02-28 15:13:04 -08:00
Marcus Moore 4197e613b2
Fix License Factory 2023-02-28 14:50:48 -08:00
akemidx 25f3e4d41a Adding ability to see boolean values when using normal export 2023-02-28 16:01:23 -05:00
Marcus Moore 589a5d0d8b
Merge branch 'develop' into fix/test-suite 2023-02-28 09:48:48 -08:00
Godfrey M e8fbb0608f adjusts the sidebar margin top 2023-02-28 09:30:02 -08:00
Marcus Moore d707f2d391
Add GitHub Action to push translation sources to Crowdin 2023-02-28 09:07:34 -08:00
Ivan Nieto Vivanco 1be0a8d911 Declare variable as an empty array 2023-02-28 10:22:49 -06:00
Ivan Nieto Vivanco 0d860c0b72 Check if target is not null to retrieve the proper data 2023-02-27 19:01:37 -06:00
Ivan Nieto Vivanco 9d94bd6567 Validate if the license seat is not checked out, it can't be checked in 2023-02-27 18:57:38 -06:00
snipe ae35af55d1 Merge remote-tracking branch 'origin/develop' 2023-02-27 15:55:58 -08:00
snipe 23fe11c71e
Merge pull request #12574 from inietov/fixes/address_in_mailbox_not_comply_rfc 
Fixed Address in mailbox given does not comply with RFC 2822, 3.6.2. [sc-202022]
 2023-02-27 15:55:31 -08:00
Ivan Nieto Vivanco b4e578c95e Convert the alert_email setting from string to array 2023-02-27 17:34:29 -06:00
snipe c2cdf5dae1 Merge remote-tracking branch 'origin/develop' 2023-02-27 13:34:16 -08:00
snipe 23ca124e94
Merge pull request #12573 from snipe/fixes/ambiguous_model_clause 
Added table aliases to fix ambiguous SQL clause
 2023-02-27 13:33:52 -08:00
snipe c7106a1df2 Added table aliases to fix ambiguous SQL clause 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-27 13:24:09 -08:00
snipe 3f4a4e72a7 Merge remote-tracking branch 'origin/develop' 2023-02-27 12:17:33 -08:00
snipe b78aba787f
Merge pull request #12572 from snipe/fixes/add_max_results_limit_to_acitivity_report 
Added max results limit to report index
 2023-02-27 12:16:57 -08:00
snipe 96c851468c Added max results limit to report index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-27 12:04:46 -08:00
snipe a5ccef5e96
Merge pull request #12564 from uberbrady/upgrade_acorn 
Upgrade Acorn
 2023-02-26 12:12:21 -08:00
Brady Wetherington 059190f002 Upgrade Acorn 2023-02-26 11:29:10 -08:00
snipe 6428cc259f Merge remote-tracking branch 'origin/develop' 2023-02-24 10:02:43 -08:00
snipe cb0b234b80
Merge pull request #12561 from inietov/fixes/unable_to_import_purchase_date 
Fixed #12559 Unable to import Purchase Date field
 2023-02-24 10:02:25 -08:00
snipe 8caf29975f Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-02-24 09:58:19 -08:00
snipe 95501bf57c Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-24 09:57:25 -08:00
snipe 75a73d095f
Merge pull request #12560 from snipe/fixes/bulk_checkout_nulles_asset_name 
Pass the existing asset name to the bulk checkout form
 2023-02-24 09:56:13 -08:00
snipe 3e47d9e689 Pass the existing asset name to the bulk checkout form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-24 09:54:46 -08:00
Ivan Nieto Vivanco 51efd9b413 Adjust the date format for purchase_date field 2023-02-24 10:59:31 -06:00
snipe bd0b00e361
Merge pull request #12558 from inietov/fixes/non_numeric_value_in_license_seat 
Fixed ErrorException: A non-numeric value encountered in app/Models/License [sc-20187]
 2023-02-24 00:29:26 -08:00
Ivan Nieto Vivanco 6bd72125bd Deletes problematic cast 2023-02-23 22:31:41 -06:00