akemidx
|
596846a94a
|
Add VIP Checkbox
|
2023-01-24 15:29:27 -05: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 |
|
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 |
|
|
snipe
|
eb81c290dc
|
Accessory file upload
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 19:50:39 -07:00 |
|
|
snipe
|
3d3a4b02fc
|
Added helper method for uploads
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 19:09:34 -07:00 |
|
|
snipe
|
25f69a7bd2
|
Added consumable methods for uploads
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 17:52:28 -07: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 |
|