1037 commits

Author	SHA1	Message	Date
snipe	fd2a057d38	Make audit dates fillable ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 17:36:58 -08:00
snipe	3c4f254583	Enforce Y-m-d as date format for date fields ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 13:38:53 -08:00
akemidx	596846a94a	Add VIP Checkbox	2023-01-24 15:29:27 -05:00
cram42	c2c009a018	Merge branch 'develop' into develop	2023-01-24 09:53:42 +08:00
snipe	febfcd4803	Updated model with new field ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:56:19 -08:00
snipe	48c85966d7	Added gravatar and avatar as fillable ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:07:17 -08:00
snipe	dceb77d4d4	Refactored numRemaining, removed unnecessary numCheckout ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:40:20 -08:00
Marcus Moore	181f96ad33	Allow users to set a blank asset name during checkout	2023-01-19 12:35:44 -08:00
snipe	48b8cfcef9	Added byod to model, removed duplicate validation rule ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:04:36 -08:00
snipe	f08babfa8a	Just moved some stuff around - no actual meaningful code changes ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-17 17:22:03 -08:00
snipe	459c95064e	Fixed default ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 17:54:04 -08:00
snipe	0b0fdd8aa5	Small formatting fixes, fixed typo in comment ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:32:18 -08:00
snipe	b66cd313b9	Refactored itemCount() to use existing blah_count fields if they exist ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:16:25 -08:00
snipe	bef4224e14	Added notes to itemCount() ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 13:50:24 -08:00
snipe	249b188654	Refactor category API and transformer for query optimization ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 13:30:01 -08:00
Brady Wetherington	2d0ac5b48b	The cache system in getSettings() cached values "forever." That's bad.	2023-01-09 16:16:09 -08:00
Brady Wetherington	c4f900e9af	Change license_seat changing method to properly 'true up' license seats	2023-01-04 13:02:53 -08:00
snipe	d187174f00	Merge pull request #12090 from Godmartinz/deparmtnet_name_validator ... Added: validation for department names at Company locations	2022-12-22 11:29:12 -08:00
akemidx	94afe2bc6a	edits & typo fixes	2022-12-19 14:48:43 -05:00
akemidx	133d6ffa50	Commenting on a scope in Models/Company.php	2022-12-15 15:18:24 -05:00
snipe	418ddcfac3	Merge pull request #9876 from Toreg87/fixes/locations-deletable ... Fixed #9875: Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport	2022-12-14 17:46:53 -08:00
akemidx	f3e57d7dc0	fixing PR	2022-12-13 16:00:59 -05:00
akemi	07ae91b00f	Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned.	2022-12-12 15:47:53 -05:00
Ivan Nieto Vivanco	c082d8b90e	Return empty string if no MAIL_REPLYTO_ADDR var set	2022-11-23 18:22:31 -06:00
snipe	774962c122	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-17 21:14:35 +00:00
snipe	24841a75d4	Move common things into the model level validation ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-17 19:41:10 +00:00
Cram42	17e81af4cd	Add more Avery label sheets	2022-11-12 20:29:50 +08:00
Cram42	ffce6ec327	Need uppercase	2022-11-12 20:29:34 +08:00
Cram42	f849fcca89	Change the way fields are passed	2022-11-10 18:54:02 +08:00
Godfrey M	92ae271292	adds validation for department names at Company locations	2022-11-09 13:11:33 -08:00
snipe	7c37c70164	Added new field to allowed_fields so that the API can change them if needed ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-08 15:27:22 +00:00
snipe	6d5ace0458	Merge pull request #12049 from uberbrady/improve_scim_externalid_support ... Fixed writes to the `externalId` from SCIM	2022-11-02 15:43:55 -07:00
Cram42	53513d93fa	Rework TZe labels for Asset Tag support	2022-11-02 22:38:00 +08:00
Cram42	fb467d9078	Include Asset for advanced users	2022-11-02 17:20:01 +08:00
Cram42	4fee5ece43	Support Avery L7163	2022-11-02 16:08:10 +08:00
Cram42	4bb40adfce	Add Asset Tag as separate supported feature	2022-11-02 16:07:50 +08:00
Cram42	a60ee7736b	Add P-touch TZe 12mm Tape Example	2022-11-02 12:22:55 +08:00
snipe	eb81c290dc	Accessory file upload ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:50:39 -07:00
Cram42	d0eb3cfc9b	Merge branch 'feature-label2' into develop	2022-11-02 10:09:46 +08:00
snipe	3d3a4b02fc	Added helper method for uploads ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:09:34 -07:00
Cram42	19150aeb44	Add P-touch TZe 24mm Tape Example	2022-11-02 10:09:11 +08:00
snipe	25f69a7bd2	Added consumable methods for uploads ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 17:52:28 -07:00
Cram42	6b2fe582ca	Merge branch 'feature-label2' into develop	2022-11-01 20:12:28 +08:00
Cram42	4ed728d954	Add template to simulate legacy label	2022-11-01 19:54:00 +08:00
Cram42	bbecdb6768	Add QR example	2022-11-01 19:53:11 +08:00
Cram42	df89406987	Create Label model and example	2022-11-01 19:52:34 +08:00
Brady Wetherington	4e5c878b73	Needed to fix the way we write externalId from SCIM	2022-10-31 19:15:08 -07:00
snipe	a94f1c4a64	Cleaned up and added comments ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 00:15:52 -07:00
Brady Wetherington	1e3281c76c	Add externalId support to SCIM integration	2022-10-25 14:19:01 -07:00
Godfrey M	d359bcb88d	adds proper spacing	2022-10-17 13:15:10 -07:00
Godfrey M	28059c878a	gets the proper amount of months and fixes typo of the word depreciation	2022-10-17 11:16:29 -07:00
Phan Nguyen	e457b2e98d	Correct assignedusers relation setting	2022-10-17 13:10:09 +07:00
snipe	ac055c01dc	Use admin ID for audit log notification ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-12 15:59:43 -07:00
snipe	cf62761d18	Added date casting and fillable to models ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:57:59 -07:00
Katharina Drexel	4f5d536e32	Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.	2022-09-28 14:52:02 +02:00
Katharina Drexel	8316a4eb92	Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.	2022-09-26 12:06:06 +02:00
snipe	24910433a1	Fixed 500 when depreciation is set but no purchase_date ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-15 15:39:47 -07:00
snipe	ac4f91918e	Merge pull request #11771 from rnelsonee/PAT_test ... Fixed #11769: PAT Test hardcoded text	2022-09-14 20:01:18 -07:00
Godfrey M	6b6a079440	fixes current value and monthly depreciation on reports and calculations	2022-09-14 17:01:18 -07:00
Godfrey M	a0624fe179	reworks the depreciation formula, includes months passed instead of months remaining	2022-09-14 16:00:21 -07:00
Rick Nelson	6e82de2f47	Fixed #11769: PAT Test hardcoded text	2022-09-01 11:21:02 -04:00
snipe	dcbd407698	Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance ... Send notifications when Acceptance Assets actions occur [sc-9917]	2022-08-30 12:14:58 -07:00
snipe	7fa9214beb	Merge pull request #11489 from Godmartinz/bug/sc-19333/expiring-assets-report-email-content-ordering ... Fixed the order expiring assets are listed in notifications	2022-08-29 12:37:01 -07:00
Godfrey M	ea63049b4b	removed redundancy with raw query	2022-08-29 12:33:51 -07:00
snipe	9cf5f30c77	Set safeMode to true and use helper for all parsedown ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-29 11:26:47 -07:00
snipe	45f17fea8a	Merge pull request #11510 from sunflowerbofh/tmp-ldap ... Fixed #11509 allow-ldap-anonymous-bind	2022-08-22 16:32:07 -07:00
snipe	3ac84eab58	Merge pull request #11651 from inietov/fixes/activity_report_search ... Fixed Search in activity report for full name in relation	2022-08-22 16:23:50 -07:00
Ivan Nieto Vivanco	98bcd82108	Add the mail recipient from configuration in the CheckoutAcceptance model	2022-08-11 15:33:18 -05:00
Ivan Nieto Vivanco	0172fe6403	Add Notifiable trait to the CheckoutAcceptance Model	2022-08-11 13:02:25 -05:00
Ivan Nieto Vivanco	8cee5060af	Remove unused DB statement	2022-08-10 19:16:04 -05:00
Ivan Nieto Vivanco	a7de97f060	Found a better place for the where condition	2022-08-10 19:13:28 -05:00
Ivan Nieto Vivanco	c1074000f9	Add a concat to search for full name when the relationship search in the users table	2022-08-10 18:27:28 -05:00
snipe	acd666fdf5	Added notes to user consumables tab ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:34:07 -07:00
snipe	c1e5d03340	Added pivot for note ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:03:41 -07:00
snipe	9acfceba29	Added relations to report search ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 23:50:10 -07:00
snipe	20fcf7a1e9	Added configuration change to maintenance types ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 20:19:43 -07:00
Katharina Drexel	8596c54d6a	Fixing query order (otherwise you run into app_key exception before anonymous ldap applied). ... Signed-off-by: Katharina Drexel <katharina.drexel@bfh.ch>	2022-08-02 14:24:00 +02:00
snipe	0fdbd410b6	Use unique_undeleted instead of unique for custom fields ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 17:10:39 -07:00
Katharina Drexel	9d627936e6	Fixed #11509: Allow LDAP anonymous bind.	2022-07-20 17:24:20 +02:00
Godfrey M	309229619b	fixes the order expiring assets are listed in notifications	2022-07-11 12:25:38 -07:00
snipe	92d46edca3	Cleaned up logging output ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-01 13:33:58 -07:00
Brady Wetherington	f72aa2415f	Revert a change in our Linear Depreciation math; I think the old algorithm was correct	2022-06-30 18:24:45 -07:00
Brady Wetherington	2451bb9a2b	Make SCIM be more tolerant of missing fields	2022-06-29 14:48:59 -07:00
snipe	c90ed9f25f	Allow models uploads ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 15:50:07 -07:00
snipe	d8d12d4590	Merge pull request #11408 from uberbrady/add_filter_option_to_ldap_sync ... Add a new `--filter` option to Artisan ldap-sync command	2022-06-28 09:50:48 -07:00
Brady Wetherington	be3388d647	Add a new --filter option to Artisan ldap-sync command	2022-06-27 19:49:59 -07:00
snipe	baad3b9d58	Only care about the converted name when updating the custom field itself ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 14:17:07 -07:00
snipe	86d2c2b153	Small naming changes ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:11:59 -07:00
snipe	0bc3ca5c42	Fixed comments ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:44:27 -07:00
snipe	3e559044b2	Changed method and scope names ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:41:13 -07:00
snipe	23c50ea9a5	Added admihn scopes ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:18:11 -07:00
snipe	daf6c72005	Fleshed out comments on new scope ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 16:02:54 -07:00
snipe	d45d322b54	Use scoped query for asset count ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 13:43:23 -07:00
snipe	07bc2fd742	Added maintenance scope for ordering by supplier ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:11:43 -07:00
snipe	a57a6486e7	Only add http:// if the url variable isn’t blank ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:11:13 -07:00
snipe	0153a37cd7	Merge pull request #11264 from snipe/fixes/set_default_ldap_version ... Fixed default ldap version if not specified	2022-06-13 17:14:57 -07:00
snipe	728338bfa8	Merge pull request #10824 from inietov/fixes/accessories_consumables_negative_numbers_develop ... Fixes Accessories total quantity shows a negative number for develop branch	2022-06-08 10:53:57 -07:00
snipe	8337628323	Set elvis operator to ensure ldap version is 3 if null ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-06 20:57:18 -07:00
snipe	7c77e03c5a	Initial rework of locations display ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 18:08:15 -07:00
Brady Wetherington	8fdedf9441	Downgraded/Removed log statements	2022-05-24 19:30:22 -07:00
Ivan Nieto Vivanco	e0b64a4879	Fixes constraint violation when ordering some columns	2022-05-24 14:00:23 -05:00
Brady Wetherington	5130a86854	Google client-side TLS auth works better with null as context(?)	2022-05-23 20:31:43 -07:00
snipe	afb3843fad	Added sig and filename to acceptedCheckout method ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	75acb0f28a	Added sig and eula pdf to checkout_acceptance ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	adbac82c30	Removed stored_eula_file from actionlog ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
Ivan Nieto Vivanco	5d29f77d60	Initialize result variable so return don't crash	2022-05-19 12:47:12 -05:00
Brady Wetherington	6c86a28d18	Pass the password along directly instead of retrieving it from the Input or Request	2022-05-16 10:58:27 -07:00
snipe	deb2d958d8	Sets maxlength of user fields to 191 ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 04:54:12 -07:00
Godfrey M	2c1f368828	adds validation for all purchase costs variables	2022-05-10 16:26:06 -07:00
Godfrey M	33b1ab3658	prevents values for assets being negative through validation	2022-05-10 16:19:06 -07:00
snipe	9aac1cbba4	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/MoveUploadsToNewDisk.php # app/Http/Controllers/ActionlogController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Assets/AssetCheckinController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/BulkUsersController.php # app/Http/Requests/AssetCheckoutRequest.php # app/Importer/LicenseImporter.php # app/Models/Actionlog.php # app/Models/License.php # app/Models/User.php # app/Observers/AssetObserver.php # composer.lock # config/version.php # database/factories/LicenseFactory.php # database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php # database/migrations/2018_10_18_191228_add_kits_licenses_table.php # database/migrations/2018_10_19_153910_add_kits_table.php # database/migrations/2018_10_19_154013_add_kits_models_table.php # database/migrations/2019_02_07_185953_add_kits_consumables_table.php # database/migrations/2019_02_07_190030_add_kits_accessories_table.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/ar/general.php # resources/lang/ar/passwords.php # resources/lang/cs/general.php # resources/lang/cs/passwords.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/fr/admin/custom_fields/general.php # resources/lang/fr/admin/hardware/general.php # resources/lang/fr/admin/locations/table.php # resources/lang/fr/admin/settings/message.php # resources/lang/hu/admin/custom_fields/general.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/general.php # resources/lang/it/admin/settings/general.php # resources/lang/nl/admin/custom_fields/general.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/sv-SE/passwords.php # resources/lang/tr/general.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/reports/activity.blade.php # resources/views/users/print.blade.php	2022-04-28 17:49:06 +01:00
snipe	1441cf9f4f	Ports #10494 to master ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-12 21:04:57 +01:00
snipe	b73542664b	Merge pull request #10919 from Godmartinz/gh10866-checkin_time_always_show_12am ... Fixed #10866 - Checkin time always shows 12am	2022-04-07 19:40:11 +01:00
Godfrey M	3eb7a87a66	fixes action_date for check-in not including H:i:s	2022-04-07 11:24:12 -07:00
Godfrey M	6dc45c189b	removed deadspace	2022-04-07 11:10:36 -07:00
Godfrey M	5d0a1ebb7a	fixes action_date for check-in not including H:i:s	2022-04-07 11:08:43 -07:00
snipe	01342ca266	Fixed activity report ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-05 22:58:25 +01:00
Brady Wetherington	6756dd193e	SCIM integration using the 're-do-the routes' approach, which seems like a dead-end ... Cleaning up routes to match laravel-scim-server's recommended implementation Some actually *working* changes for SCIM support?! Whoops, forgot my route file Fix public SCIM routes Removed Ziggy, removed old generated file, yanked Ziggy references Resolves the first set of comments for SCIM Ensure all /api routes have baseUrl prepended Fix the parent:: call to be, uh, actually correct :P Clarify the route-ordering, as it is quite tricky This gets it so that users can actually be saved.. Work around the lack of callbacks with some inheritance Mapped a bunch more fields from SCIM into Snipe-IT's user table More baseUrl shenanigans since we yanked Ziggy :/ Properly map job title and work with some other necessary attributes Map more fields... Finalized basic mapping for core and enterprise namespaces Latest tuned settings for SCIM config to work with Azure (and others)	2022-04-05 20:26:37 +01:00
Ivan Nieto Vivanco	2d213a9c77	Make the report take the dates of pivot table instead of asset log	2022-04-05 12:57:49 -05:00
snipe	08588a2e6a	Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view ... Fixes #10898 (invalid consumable date time info in user view)	2022-04-05 18:30:23 +01:00
Achmad Fienan Rahardianto	231a34ace3	FIX: #10898 (invalid consumable date time info in user view)	2022-04-05 15:31:27 +07:00
snipe	a937bd34f6	Merge master back down into develop ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 16:28:43 +01:00
snipe	b5f3a357e2	Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync ... This looks good, thanks!	2022-03-29 12:06:01 +01:00
snipe	639409fb3f	Backporting #10829 to master ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-25 13:00:16 +00:00
Godfrey M	a1429ce86b	removed manager_name from user files	2022-03-24 11:47:13 -07:00
Godfrey M	c1f8252388	adds manager field to LDAP sync	2022-03-24 11:24:39 -07:00
Godfrey M	55680762de	Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync	2022-03-22 16:33:58 -07:00
snipe	20e65804ef	Removed comment ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-22 18:12:08 +00:00
Godfrey Martinez	fe6a6740db	Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf	2022-03-22 10:10:56 -07:00
Ivan Nieto Vivanco	98b78837e1	Validate custom fieldset only if the asset have one	2022-03-22 09:38:57 -06:00
snipe	8c92198636	Possible fix for boolean field check ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-22 13:47:43 +00:00
Ivan Nieto Vivanco	7571c0b850	Add support for boolean type customfields	2022-03-21 18:48:42 -06:00
Godfrey M	4956eb0410	WIP: needs to be tested. adds ldap_manager field to ldap sync	2022-03-21 11:15:39 -07:00
snipe	42220cc566	Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving ... Fixes Customfields with boolean format not saving [ch-9973]	2022-03-19 22:10:54 +00:00
snipe	89ddbddada	Fixed comment ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:53:18 +00:00
snipe	babf7c064b	Added ability to filter status label index endpoint by status type ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:38:45 +00:00
Ivan Nieto Vivanco	570dd09dcd	Add validation to Accessories and Consumables to not let the user update the number of items to less than they already have checked out	2022-03-15 17:52:19 -06:00
Godfrey M	b2f7262cd2	adds table structure for asset history	2022-03-14 19:38:36 -07:00
Ivan Nieto Vivanco	e104195796	Convert value of the customfield element from string to boolean	2022-03-09 18:49:39 -06:00
snipe	b6a1d245e8	Added trim to CC email as well ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 06:20:34 -08:00
snipe	43c1949092	Add remote option to user ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:35:26 -08:00
snipe	b876d0abb0	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .env.example # app/Http/Controllers/Auth/LoginController.php # app/Http/Kernel.php # app/Http/Transformers/ActionlogsTransformer.php # app/Importer/AssetImporter.php # app/Models/Accessory.php # app/Models/Consumable.php # app/Presenters/AccessoryPresenter.php # app/Presenters/ComponentPresenter.php # app/Presenters/ConsumablePresenter.php # app/Providers/AuthServiceProvider.php # composer.json # composer.lock # config/app.php # config/cors.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/build/app.js.LICENSE.txt # public/js/dist/all.js # public/mix-manifest.json # resources/views/accessories/view.blade.php # resources/views/consumables/view.blade.php # resources/views/settings/saml.blade.php # routes/api.php	2022-03-03 21:59:38 -08:00
snipe	ac8a7d0bc9	Made notes field fillable and searchable ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:29:48 -08:00
snipe	dd5f812d88	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/FixDoubleEscape.php # app/Console/Commands/LdapSync.php # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/CompaniesController.php # app/Http/Controllers/Api/DepartmentsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Models/Loggable.php # app/Providers/AuthServiceProvider.php # config/version.php # database/migrations/2014_11_04_231416_update_group_field_for_reporting.php # database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php # package-lock.json # package.json # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/forms/asset-models/fieldset-default-values.vue # resources/views/hardware/view.blade.php	2022-02-20 13:29:12 -08:00
snipe	6a91d4d19e	Check for uniqueness constraint ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:46:22 -08:00
snipe	ea8f9a6dd9	Make is_unique fillable ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:45:44 -08:00
snipe	b78f32e876	Merge pull request #10655 from inietov/fixes/trying_to_get_property_checkin_email_of_non-object_develop ... Fixes ErrorException: Trying to get property 'checkin_email' of non-object for develop[sc-17568]	2022-02-16 11:19:14 -07:00
Godfrey M	7b9a2ae909	added rounding	2022-02-14 09:34:42 -08:00
Godfrey M	6e204a20ca	fixed current value formula	2022-02-14 09:28:35 -08:00
Godfrey M	e6e68934f7	adds a months depreciated variable	2022-02-14 09:13:14 -08:00
Godfrey M	cdc402fa04	WIP formula for linear Depreciation has been corrected. still one variable left to fix.	2022-02-14 09:01:42 -08:00
Ivan Nieto Vivanco	f36de6c670	Validates if model and model->category exist before return the checkin_email property	2022-02-10 13:53:49 -06:00
Ivan Nieto Vivanco	bf4ee18123	Validates if model and model->category exist before return the checkin_email property	2022-02-10 11:58:55 -06:00
Ivan Nieto Vivanco	413e44be2f	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco	d71aa859fc	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:43:24 -06:00
snipe	5fded57ec6	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/ProfileController.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Models/Asset.php # app/Models/License.php # app/Providers/AppServiceProvider.php # app/Services/LdapAd.php # config/version.php # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/lang/ar/button.php # resources/lang/de/admin/companies/general.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/groups/titles.php # resources/lang/de/admin/hardware/form.php # resources/lang/de/admin/hardware/general.php # resources/lang/de/admin/hardware/message.php # resources/lang/de/admin/hardware/table.php # resources/lang/de/admin/kits/general.php # resources/lang/de/admin/locations/table.php # resources/lang/de/admin/reports/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/de/admin/users/general.php # resources/lang/de/general.php # resources/lang/de/mail.php # resources/lang/en/admin/asset_maintenances/message.php # resources/lang/en/admin/asset_maintenances/table.php # resources/lang/en/admin/companies/general.php # resources/lang/en/admin/companies/message.php # resources/lang/en/admin/custom_fields/general.php # resources/lang/en/admin/depreciations/general.php # resources/lang/en/admin/groups/titles.php # resources/lang/en/admin/hardware/form.php # resources/lang/en/admin/hardware/general.php # resources/lang/en/admin/hardware/table.php # resources/lang/en/admin/kits/general.php # resources/lang/en/admin/locations/table.php # resources/lang/en/admin/reports/general.php # resources/lang/en/admin/settings/general.php # resources/lang/en/admin/settings/message.php # resources/lang/en/admin/users/general.php # resources/lang/en/button.php # resources/lang/en/general.php # resources/lang/en/help.php # resources/lang/en/mail.php # resources/lang/en/passwords.php # resources/lang/hu/admin/hardware/general.php # resources/lang/hu/admin/hardware/table.php # resources/lang/hu/admin/locations/table.php # resources/lang/is/admin/locations/table.php # resources/lang/ko/admin/custom_fields/general.php # resources/lang/ko/general.php # resources/lang/nl/admin/hardware/general.php # resources/lang/nl/admin/hardware/message.php # resources/lang/nl/admin/hardware/table.php # resources/lang/nl/admin/locations/table.php # resources/lang/nl/admin/statuslabels/message.php # resources/lang/nl/admin/users/general.php # resources/lang/no/admin/companies/general.php # resources/lang/no/admin/custom_fields/general.php # resources/lang/no/admin/depreciations/general.php # resources/lang/no/admin/depreciations/table.php # resources/lang/no/admin/groups/titles.php # resources/lang/no/admin/hardware/form.php # resources/lang/no/admin/hardware/general.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/locations/table.php # resources/lang/no/admin/reports/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/admin/settings/message.php # resources/lang/no/admin/statuslabels/message.php # resources/lang/no/admin/users/general.php # resources/lang/no/button.php # resources/lang/no/general.php # resources/lang/no/mail.php # resources/lang/no/validation.php # resources/lang/pl/admin/companies/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/pl/admin/depreciations/general.php # resources/lang/pl/admin/depreciations/table.php # resources/lang/pl/admin/groups/titles.php # resources/lang/pl/admin/hardware/form.php # resources/lang/pl/admin/hardware/general.php # resources/lang/pl/admin/hardware/table.php # resources/lang/pl/admin/kits/general.php # resources/lang/pl/admin/locations/table.php # resources/lang/pl/admin/reports/general.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/admin/settings/message.php # resources/lang/pl/admin/users/general.php # resources/lang/pl/button.php # resources/lang/pl/general.php # resources/lang/pt-PT/admin/companies/general.php # resources/lang/pt-PT/admin/custom_fields/general.php # resources/lang/pt-PT/admin/depreciations/general.php # resources/lang/pt-PT/admin/depreciations/table.php # resources/lang/pt-PT/admin/groups/titles.php # resources/lang/pt-PT/admin/hardware/form.php # resources/lang/pt-PT/admin/hardware/general.php # resources/lang/pt-PT/general.php # resources/lang/pt-PT/help.php # resources/lang/pt-PT/validation.php # resources/lang/ro/admin/companies/general.php # resources/lang/ro/admin/custom_fields/general.php # resources/lang/ro/admin/groups/titles.php # resources/lang/ro/admin/hardware/form.php # resources/lang/ro/admin/hardware/general.php # resources/lang/ro/admin/hardware/message.php # resources/lang/ro/admin/hardware/table.php # resources/lang/ro/admin/locations/table.php # resources/lang/ro/admin/settings/message.php # resources/lang/ru/admin/companies/general.php # resources/lang/ru/admin/custom_fields/general.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/general.php # resources/lang/ru/validation.php # resources/lang/sk/admin/settings/general.php # resources/lang/sk/button.php # resources/lang/sk/general.php # resources/lang/tr/admin/hardware/form.php # resources/lang/tr/admin/hardware/table.php # resources/lang/tr/admin/kits/general.php # resources/lang/tr/admin/locations/table.php # resources/lang/tr/admin/reports/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/admin/settings/message.php # resources/lang/tr/admin/statuslabels/message.php # resources/lang/tr/admin/users/general.php # resources/lang/tr/button.php # resources/lang/tr/general.php # resources/lang/zh-CN/admin/companies/general.php # resources/lang/zh-CN/admin/custom_fields/general.php # resources/lang/zh-CN/admin/depreciations/general.php # resources/lang/zh-CN/admin/depreciations/table.php # resources/lang/zh-CN/admin/groups/titles.php # resources/lang/zh-CN/admin/hardware/form.php # resources/lang/zh-CN/admin/hardware/general.php # resources/lang/zh-CN/admin/hardware/message.php # resources/lang/zh-CN/admin/hardware/table.php # resources/lang/zh-CN/admin/kits/general.php # resources/lang/zh-CN/admin/locations/table.php # resources/lang/zh-CN/admin/reports/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/admin/settings/message.php # resources/lang/zh-CN/admin/statuslabels/message.php # resources/lang/zh-CN/admin/users/general.php # resources/lang/zh-CN/button.php # resources/lang/zh-CN/general.php # resources/lang/zh-CN/mail.php # resources/views/depreciations/edit.blade.php	2022-02-01 18:53:05 -08:00
Ivan Nieto Vivanco	a05795420a	Respect the default value of 60 days in expiring licenses	2022-01-18 14:34:14 -06:00
Ivan Nieto Vivanco	42d86bf57b	Adds default values if the expiring alerts threshold is null	2022-01-18 14:21:49 -06:00
Brady Wetherington	ef463a37d8	Make 'pending' assets properly requestable; use requestable scope	2022-01-14 12:48:33 -08:00
snipe	ea83567e7d	Merge pull request #10494 from exula/fix/increase_max_licenses ... Fixed #7824	2022-01-10 15:04:47 -08:00
Brad	6b6a83a525	Removing something stupid PHPStorm put in the use area	2022-01-10 14:21:19 -05:00
Brad	81084fa717	Fixed #7824 ... Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure. This commit allievates those pain points - removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index - removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that) - removed the 999 max seats limit from the License Model, - reworked how new license seats are created when increasing seats or creating licenses - Added an index the license_seats table to help speed up lookups	2022-01-10 14:03:28 -05:00
Brady Wetherington	3c7f2e89ec	Merge branch 'develop' into remove_old_ldap ... Had to re-do the composer install because the conflicts were too complicated.	2022-01-03 12:56:58 -08:00
snipe	359b22e17a	Applies #10470 to develop ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-27 13:22:47 -08:00
snipe	8588e9ebf1	Fixed #10469 - increased size of supplier address field ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-27 12:28:02 -08:00
snipe	c3d55ee27e	Merge master down into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Http/Transformers/AssetsTransformer.php # app/Models/Setting.php # config/version.php # resources/lang/af/button.php # resources/lang/ar/button.php # resources/lang/bg/button.php # resources/lang/cs/button.php # resources/lang/cy/button.php # resources/lang/da/button.php # resources/lang/de/button.php # resources/lang/el/button.php # resources/lang/en-GB/button.php # resources/lang/en-ID/button.php # resources/lang/es-CO/admin/groups/message.php # resources/lang/es-MX/button.php # resources/lang/et/admin/custom_fields/general.php # resources/lang/et/admin/hardware/table.php # resources/lang/et/admin/kits/general.php # resources/lang/et/admin/manufacturers/message.php # resources/lang/et/admin/models/general.php # resources/lang/et/admin/settings/general.php # resources/lang/et/button.php # resources/lang/et/mail.php # resources/lang/fa/button.php # resources/lang/fa/help.php # resources/lang/fi/button.php # resources/lang/fil/button.php # resources/lang/fr/button.php # resources/lang/ga-IE/button.php # resources/lang/he/button.php # resources/lang/hr/button.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/auth/message.php # resources/lang/hu/button.php # resources/lang/hu/mail.php # resources/lang/id/admin/hardware/table.php # resources/lang/id/button.php # resources/lang/it/button.php # resources/lang/iu/button.php # resources/lang/ja/button.php # resources/lang/ko/button.php # resources/lang/lt/button.php # resources/lang/lv/button.php # resources/lang/mi/button.php # resources/lang/mk/button.php # resources/lang/ml-IN/button.php # resources/lang/mn/button.php # resources/lang/ms/admin/hardware/table.php # resources/lang/ms/admin/kits/general.php # resources/lang/ms/admin/models/general.php # resources/lang/ms/admin/models/message.php # resources/lang/ms/admin/settings/general.php # resources/lang/ms/button.php # resources/lang/nl/button.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/auth/message.php # resources/lang/no/button.php # resources/lang/no/help.php # resources/lang/no/mail.php # resources/lang/pl/button.php # resources/lang/pt-BR/button.php # resources/lang/pt-PT/auth/message.php # resources/lang/pt-PT/button.php # resources/lang/pt-PT/mail.php # resources/lang/ro/button.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/help.php # resources/lang/sl/admin/custom_fields/general.php # resources/lang/sl/admin/hardware/table.php # resources/lang/sl/admin/kits/general.php # resources/lang/sl/admin/manufacturers/message.php # resources/lang/sl/admin/models/general.php # resources/lang/sl/admin/settings/general.php # resources/lang/sl/admin/users/general.php # resources/lang/sl/auth/message.php # resources/lang/sl/button.php # resources/lang/sl/help.php # resources/lang/sr-CS/button.php # resources/lang/ta/button.php # resources/lang/th/button.php # resources/lang/th/mail.php # resources/lang/tl/button.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/auth/message.php # resources/lang/tr/button.php # resources/lang/uk/button.php # resources/lang/ur-PK/button.php # resources/lang/vi/button.php # resources/lang/zh-CN/button.php # resources/lang/zh-HK/button.php # resources/lang/zh-TW/admin/hardware/table.php # resources/lang/zh-TW/button.php # resources/lang/zu/button.php # resources/views/models/custom_fields_form.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/slack.blade.php	2021-12-16 14:26:24 -08:00
snipe	ff97b359ad	Removed form request on ajax, cleaned up some other things ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:58:46 -08:00
snipe	6d84482104	Merge pull request #10388 from snipe/features/switch_to_dusk ... WIP - Fixing unit tests, switching to dusk	2021-12-06 14:19:36 -08:00
snipe	ebdbc20740	Adds stricter validation for slack endpoints ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-06 11:40:24 -08:00
snipe	00b63fe7c7	Fixed category factory methods ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 13:40:16 -08:00
snipe	f2f8f96991	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Transformers/AssetsTransformer.php # app/Importer/ConsumableImporter.php # app/Models/Consumable.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/layouts/default.blade.php # routes/web.php # routes/web/fields.php	2021-11-15 19:24:38 -08:00
Brady Wetherington	864cc4f8d5	Fix FIXME's by downgrading them to TODO's :)	2021-11-10 11:37:10 -08:00
Brady Wetherington	91f087258b	Merge branch 'develop' into remove_old_ldap	2021-11-09 18:33:41 -08:00
Brady Wetherington	a58c5ce27f	Better documentation, disable AdLdap2-based "Add domain" setting	2021-11-08 17:11:47 -08:00
Brady Wetherington	b0417e5bd7	Finish pulling out the AdLdap2-based LDAP remnants that were still in the system	2021-11-03 15:22:06 -07:00
Terrell Eaton	2c7a71a2a1	Fixes not being able to search by checked out user in advanced search	2021-11-01 22:14:19 +01:00
snipe	76cc46c419	Merge pull request #9814 from 01ste02/importMinAmt ... Improved Consumable Import: Import min_amt for consumables	2021-10-28 17:49:44 -07:00
snipe	371a39a118	Merge branch 'develop' into fixes/advanced_search_serial_v2	2021-10-28 16:42:10 -07:00
Ivan Nieto Vivanco	ee9133f722	Return the proper Asset-Components relationship	2021-10-27 16:42:51 -05:00
snipe	ae1a4bb3c9	Fixed extra braces from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:36:06 -07:00
snipe	aa8f1378c9	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Http/Controllers/Accessories/AccessoriesController.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Assets/BulkAssetsController.php # app/Http/Controllers/Components/ComponentsController.php # app/Http/Controllers/Consumables/ConsumablesController.php # app/Http/Controllers/Licenses/LicenseFilesController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/UserFilesController.php # app/Http/Transformers/AssetsTransformer.php # app/Http/Transformers/LicensesTransformer.php # app/Importer/UserImporter.php # app/Models/Asset.php # config/app.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/en/admin/users/message.php # resources/lang/is/button.php # resources/lang/ja/admin/kits/general.php # resources/lang/ro/admin/users/general.php # resources/lang/zh-HK/admin/depreciations/general.php # resources/lang/zh-HK/admin/models/general.php # resources/views/hardware/qr-view.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/users/view.blade.php # routes/web.php # routes/web/hardware.php # routes/web/models.php # routes/web/users.php	2021-10-20 17:26:41 -07:00
Ivan Nieto Vivanco	23b770fac6	Added a validation to use the same name in categories with different types	2021-10-08 15:19:16 -05:00
snipe	6e270c0ed2	Include created_at in pivot ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:23:17 -07:00
snipe	e27065fe16	Merge branch 'develop-v6-integration' into develop-v6-rc1 ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/ResetDemoSettings.php # app/Helpers/Helper.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/ComponentsController.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/DepreciationsController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Requests/ImageUploadRequest.php # app/Http/Transformers/ActionlogsTransformer.php # app/Http/Transformers/DepreciationsTransformer.php # app/Listeners/CheckoutableListener.php # app/Models/Accessory.php # app/Models/Asset.php # app/Models/Company.php # app/Models/Ldap.php # app/Models/User.php # app/Presenters/AssetPresenter.php # app/Presenters/CategoryPresenter.php # composer.json # composer.lock # config/version.php # database/factories/AssetModelFactory.php # database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php # database/seeds/AssetModelSeeder.php # package-lock.json # public/css/build/AdminLTE.css # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-black.css # public/css/dist/skins/skin-black.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-blue.css # public/css/dist/skins/skin-blue.min.css # public/css/dist/skins/skin-contrast.css # public/css/dist/skins/skin-contrast.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-green.css # public/css/dist/skins/skin-green.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-orange.css # public/css/dist/skins/skin-orange.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-purple.css # public/css/dist/skins/skin-purple.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-red.css # public/css/dist/skins/skin-red.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/css/dist/skins/skin-yellow.css # public/css/dist/skins/skin-yellow.min.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/js/vue.js # resources/lang/af/validation.php # resources/lang/ar/admin/settings/general.php # resources/lang/ar/validation.php # resources/lang/bg/admin/settings/general.php # resources/lang/bg/validation.php # resources/lang/cs/admin/settings/general.php # resources/lang/cs/validation.php # resources/lang/cy/help.php # resources/lang/cy/validation.php # resources/lang/da/admin/settings/general.php # resources/lang/da/validation.php # resources/lang/de/admin/settings/general.php # resources/lang/de/validation.php # resources/lang/el/validation.php # resources/lang/en-GB/admin/settings/general.php # resources/lang/en-GB/validation.php # resources/lang/en-ID/admin/hardware/table.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/validation.php # resources/lang/es-CO/admin/settings/general.php # resources/lang/es-CO/auth/message.php # resources/lang/es-CO/button.php # resources/lang/es-CO/help.php # resources/lang/es-CO/validation.php # resources/lang/es-ES/admin/settings/general.php # resources/lang/es-ES/auth/message.php # resources/lang/es-ES/button.php # resources/lang/es-ES/help.php # resources/lang/es-ES/validation.php # resources/lang/es-MX/admin/settings/general.php # resources/lang/es-MX/validation.php # resources/lang/es-VE/admin/settings/general.php # resources/lang/es-VE/auth/message.php # resources/lang/es-VE/button.php # resources/lang/es-VE/help.php # resources/lang/es-VE/validation.php # resources/lang/et/validation.php # resources/lang/fa/validation.php # resources/lang/fi/admin/settings/general.php # resources/lang/fi/validation.php # resources/lang/fil/validation.php # resources/lang/fr/admin/settings/general.php # resources/lang/fr/validation.php # resources/lang/ga-IE/validation.php # resources/lang/he/admin/settings/general.php # resources/lang/he/general.php # resources/lang/he/validation.php # resources/lang/hr/validation.php # resources/lang/hu/validation.php # resources/lang/id/validation.php # resources/lang/is/admin/categories/general.php # resources/lang/is/admin/companies/message.php # resources/lang/is/admin/companies/table.php # resources/lang/is/admin/components/general.php # resources/lang/is/admin/components/table.php # resources/lang/is/admin/consumables/table.php # resources/lang/is/admin/depreciations/general.php # resources/lang/is/admin/depreciations/message.php # resources/lang/is/admin/hardware/form.php # resources/lang/is/admin/hardware/general.php # resources/lang/is/admin/hardware/message.php # resources/lang/is/admin/hardware/table.php # resources/lang/is/admin/kits/general.php # resources/lang/is/admin/licenses/form.php # resources/lang/is/admin/licenses/general.php # resources/lang/is/admin/locations/table.php # resources/lang/is/admin/manufacturers/table.php # resources/lang/is/admin/reports/message.php # resources/lang/is/admin/settings/general.php # resources/lang/is/admin/settings/message.php # resources/lang/is/admin/statuslabels/message.php # resources/lang/is/admin/suppliers/message.php # resources/lang/is/admin/suppliers/table.php # resources/lang/is/admin/users/table.php # resources/lang/is/mail.php # resources/lang/is/validation.php # resources/lang/it/admin/settings/general.php # resources/lang/it/validation.php # resources/lang/iu/validation.php # resources/lang/ja/mail.php # resources/lang/ja/validation.php # resources/lang/ko/validation.php # resources/lang/lt/validation.php # resources/lang/lv/validation.php # resources/lang/mi/validation.php # resources/lang/mk/validation.php # resources/lang/ml-IN/validation.php # resources/lang/mn/validation.php # resources/lang/ms/validation.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/validation.php # resources/lang/no/validation.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/validation.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/mail.php # resources/lang/pt-BR/validation.php # resources/lang/pt-PT/validation.php # resources/lang/ro/validation.php # resources/lang/ru/validation.php # resources/lang/sl/validation.php # resources/lang/sr-CS/admin/settings/general.php # resources/lang/sr-CS/validation.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/sv-SE/auth/message.php # resources/lang/sv-SE/button.php # resources/lang/sv-SE/mail.php # resources/lang/sv-SE/validation.php # resources/lang/ta/validation.php # resources/lang/th/validation.php # resources/lang/tl/validation.php # resources/lang/tr/mail.php # resources/lang/tr/validation.php # resources/lang/uk/admin/accessories/table.php # resources/lang/uk/admin/asset_maintenances/message.php # resources/lang/uk/admin/asset_maintenances/table.php # resources/lang/uk/validation.php # resources/lang/ur-PK/validation.php # resources/lang/vi/admin/settings/general.php # resources/lang/vi/validation.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/validation.php # resources/lang/zh-HK/validation.php # resources/lang/zh-TW/validation.php # resources/lang/zu/validation.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/company-select.blade.php # routes/api.php	2021-09-21 23:46:50 -07:00
snipe	10ca7cffc3	Fixes for query scoping, ordering, and nicer readability ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 19:59:23 -07:00
snipe	f9c0eee7c9	Merge pull request #10048 from inietov/fixes/blank_results_for_non_superadmins ... Fix to PR #10009. The asset search now works as intended for normal users	2021-09-07 12:14:29 -07:00
Ivan Nieto Vivanco	b5525e6a21	Deleted additional bindings present also in the User model	2021-09-07 00:57:12 -05:00
Ivan Nieto Vivanco	c3eb7a3425	Remove aditional bindings that 'overflows' the generated queries	2021-09-07 00:15:21 -05:00
snipe	a02534b6c8	Merge pull request #10009 from inietov/fixes/blank_results_for_non_superadmins ... Fixes #9985. Error 500 when using the asset search - blank results for non super-admins	2021-08-30 13:29:18 -07:00
snipe	6d3a82aacf	Merge pull request #10008 from uberbrady/fix_unlink_error_ldap ... Fixed rb445 and rb446 - the unlink calls for the client-side certs...	2021-08-30 12:47:38 -07:00
Brady Wetherington	da0b375773	Fixed rb445 and rb446 - the unlink calls for the client-side certs ... need to be wrapped around a file-existence check	2021-08-30 12:29:16 -07:00
Ivan Nieto Vivanco	d1304cc975	Add sentence to infer the table's name according to the query passed	2021-08-30 13:44:26 -05:00
snipe	4abb9baa95	Merge remote-tracking branch 'origin/develop'	2021-08-24 15:29:41 -07:00
snipe	70f6753f50	Merge pull request #9979 from uberbrady/add_client_side_ldap_certs ... Add client side ldap certs	2021-08-23 16:30:46 -07:00
snipe	9285697611	Merge remote-tracking branch 'origin/develop'	2021-08-20 17:30:52 -07:00
snipe	9687bcb41c	Fixed issue where consumables model number was not searchable ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-20 17:30:35 -07:00
Brady Wetherington	4d4badf830	Got the client-side LDAP setup working well enough for sync!	2021-08-17 14:43:36 -07:00
Godfrey M	cef0e424e1	adds a Floor value for depreciation models	2021-08-16 18:14:10 -07:00
Tobias Regnery	eced1ab77f	Fix advanced search with serial and another field ... The advanced search in /hardware produces incorrect results if the serial is combined with another field like category. There is a typo as the fieldname 'product_key' doesn't exist. Change this to 'serial'. Also change the last If-Statement from ->orWhere() to ->where(). Now additional fields like custom fields can be combined with other searches in an And-Clause. I think this function could be simplified further, but this is the minimal bugfix.	2021-08-05 15:07:28 +02:00
Tobias Regnery	1a908e361e	Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport ... locations->isDeletable() checks via gate::allows if a locations is deletable. This calls SnipePermissionsPolicy->before() and checks for !Company::isCurrentUserHasAccess($item). This returns false because locations don't have a company_id. Check for this and return true if the item don't have a company_id.	2021-07-29 10:43:01 +02:00
snipe	9a5d9eafeb	Merge pull request #9709 from morning-bird/master ... add CompanyableTrait	2021-07-27 14:38:21 -07:00
Oskar Stenberg	5b5874499d	Added import for min_amt for consumables	2021-07-12 11:46:19 +02:00
snipe	a016f4ecd0	Applies PR #9761 to integration ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 13:11:22 -07:00
snipe	19413a63da	Make notes field searchable on status labels ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 11:53:17 -07:00
Petri Asikainen	ae2c77f97f	Allow to bulk update min_amt	2021-06-17 00:36:04 +03:00
GMS ICT 2	ea7f18d0e6	add CompanyableTrait	2021-06-15 15:32:44 +07:00
snipe	fa786e615e	Moved HasFactory ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 19:02:19 -07:00
Laravel Shift	b62d1f49e4	Shift cleanup	2021-06-10 20:19:27 +00:00
Laravel Shift	104b441e0d	Shift to class based factories	2021-06-10 20:17:44 +00:00
Laravel Shift	9f43ce97e9	Convert deprecated $dates property to $casts	2021-06-10 20:17:18 +00:00
Laravel Shift	802dc9240d	Shift bindings ... PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.	2021-06-10 20:16:56 +00:00
Laravel Shift	934afa036f	Adopt Laravel coding style ... Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions. You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started. [1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer [2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200	2021-06-10 20:15:52 +00:00
Ivan Nieto Vivanco	d9f5f1182a	Delete a couple lines that rewrites validation rules for asset tags in the model Asset.php:save() method.	2021-05-25 23:09:27 -05:00
snipe	a704614397	Bumped max for country on model ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-07 16:42:26 -07:00
Istvan Basa	b037d0efdd	fix ldap ad authentication filter query mechanism (#7441)	2021-04-20 21:25:45 -07:00
Ivan Nieto Vivanco	36bc47c61c	Handle regex format when assigned from API (#9443)	2021-04-20 14:44:47 -07:00
snipe	2986765a68	Implements #9373 ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-14 11:17:59 -07:00
Godfrey Martinez	246cc0eaa8	Feature/ch16172/adding other fields to ldap sync settings (#9416) ... * new branch, added manager as an additional field. Currently having DB issues * WIP DB Issue with eloquent * added department to LDAP sync * removed unused variables	2021-04-14 10:17:57 -07:00
Sxderp	f01c93e162	Extend #6229 to include superuser permission check (#6772)	2021-04-05 20:26:06 -07:00
Ivan Nieto Vivanco	90a24539b0	Fixes/cli importer issue (#9199) ... * Added logic to handle the CLI importer. * Fix bug introduced with the commit previous to the regression. * Adds a validation for variable when is null, add comments to clarify where the class variable came from. * Add support for when variable is an instance of User class.	2021-04-05 19:28:31 -07:00
Godfrey Martinez	5ea759f615	Fixed #7211, #9197, #7864, [ch15504] - Added additional LDAP fields to sync (#9318) ... * LDAP and Active Directory has plenty of other [ch15504] * removed department id from ldap sync * removed department id from ldap sync * Update 2021_03_18_184102_adds_several_ldap_fields.php	2021-04-05 19:26:04 -07:00
Ivan Nieto Vivanco	eb0ae74ef8	Fixes typo that doesn't accepts 'textarea' as custom field type element. (#9387)	2021-04-01 18:23:05 -07:00
snipe	a199c75f5c	Added textarea and checkbox to validation rules ... Signed-off-by: snipe <snipe@snipe.net>	2021-03-31 14:04:01 -07:00
Marc Leuser	90b7d34c69	Added #6695: add API endpoint for license seats (#8058) ... * remove miselading comment line * added dedicated API endpoint for license seats * don't display a seat name via API it makes no sense and we don't have any particular sorting order so the numbering would be inconsistent anyway * reduce amount of IFs * add sanity checks to show() * fix goofed logging logic * add tests for action log entries	2021-03-29 19:41:26 -07:00
Jo Drexl	0114373468	Fixing #9224 (#9328)	2021-03-22 12:57:26 -07:00
Brady Wetherington	44eee019d9	Add variable declaration for $result (#9168)	2021-02-19 10:19:24 -08:00
snipe	5754f0aa3f	Revert "Added logic to handle the CLI importer. (#9088)" ... This reverts commit 2e2d087639.	2021-02-18 14:21:19 -08:00
Ivan Nieto	2e2d087639	Added logic to handle the CLI importer. (#9088)	2021-02-17 13:13:17 -08:00
Ivan Nieto	f89d789832	Fixes #8918 The validation rules on Manufacturer Model 'name' attribute are malformed. (#9133) ... * Fixes the validation rules on Manufacturer Model * Fixes a little issue; if the manufacturer is active soft-deletes it, if is already deleted permanently deletes it	2021-02-16 12:52:55 -08:00
Ivan Nieto	6772835efc	Added support for radio buttons in Custom Fields. (#9053)	2021-01-27 14:41:58 -08:00
snipe	0031fab0fe	Added termination date, depreciation in license column selection [ch14505] (#9052)	2021-01-27 01:34:32 -08:00
snipe	9f7f1460e9	Simplified availableForCheckout() on asset	2021-01-26 22:12:24 -08:00
snipe	75a8639a20	Fixed weird checkbox display ... TODO: fix the 500 on the save	2021-01-12 18:16:42 -08:00
Brady Wetherington	0329028e2c	Fixed #8926, #8252 - introduce circular reference check for location parent_id - rebased from #8253 (#8927) ... * Fixed #8252 - circular references in location parents * Remove non-translated translation changes * Fix typo * Add loop limit to avoid unforseen infinite loops * Remove check against parent_id in location controllers * Remove the Location->id=null piece (no longer needed) * Fix some formatting and whitespace * Re-introduce accidentally merged-out language file Co-authored-by: Travis Miller <milletr@tulsaschools.org>	2020-12-18 17:18:04 -08:00
Brady Wetherington	93cf8d4e0a	Forward-port of the old LDAP sync system (#8801) ... * Forward-port of the old LDAP sync system * Need to rename the class to avoid classname conflicts * Make 'classic' LDAP sync not add surrounding parens to filters that already have them * Re-work Test LDAP button to return 10 sample users * Remove useless debugging code	2020-11-30 17:11:44 -08:00
snipe	6cf5426540	Removed unused validation rule	2020-11-25 11:00:28 -08:00
snipe	72fc03aa50	Adds location to searchableRelations for asset model	2020-11-24 19:49:46 -08:00
snipe	2c0b9f959b	Comment with possible alternatve to the custom undeleted validator	2020-11-24 12:01:09 -08:00
snipe	2ea805b7ed	Added search/sort by Location OU, added to listing	2020-11-17 22:17:07 -08:00
snipe	0286cf6d46	Prevent license categories from being deleted if there are licenses in that category	2020-11-17 19:22:10 -08:00
snipe	08784f9cc5	Make expected_checkin fillable	2020-11-13 03:22:26 -08:00
snipe	5ea9c31eab	Removed debugging	2020-11-12 15:14:56 -08:00
snipe	f0e04ab9e4	Fixed #8726 - disallow archived assets to be checked out	2020-11-12 15:01:13 -08:00
snipe	7f7064c835	Make last_checkout fillable	2020-11-11 13:30:11 -08:00
snipe	30d68309a9	Add ability to checkout an asset if the user it’s assigned_to isn’t valid ... This would only happen if a merge-users went wonky	2020-11-10 05:06:47 -08:00
snipe	bbd7a752a0	Minor cleanup	2020-11-02 23:58:49 -08:00
Brady Wetherington	0eda53c484	Add a new custom validator for Users to prevent someone from managing themselves	2020-10-23 16:55:10 -07:00
snipe	2aa8e1e76b	Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes ... Fixes #8462 - move accessory notes into pivot table	2020-10-23 14:19:51 -07:00
snipe	d03d4deef9	Temp fix for #8561 - manager_id validation error	2020-10-23 11:55:53 -07:00
snipe	21ceea0aed	Removed extra debugging	2020-10-23 08:19:04 -07:00