akemidx
|
497d17835f
|
requested edits
|
2023-04-26 17:06:08 -04:00 |
|
akemidx
|
aab53cf683
|
remove regex, add in starts_with
|
2023-04-26 15:18:13 -04:00 |
|
snipe
|
8f0b823fb3
|
Applies #12868
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 23:39:32 -07:00 |
|
snipe
|
22d73f503a
|
Merge pull request #12756 from dboth/develop
Fixed #8208, #8896, #8985 and #9789: Currency issues when using non-english locales (resubmission)
|
2023-04-25 22:32:13 -07:00 |
|
snipe
|
970b5e556c
|
Merge pull request #12903 from marcusmoore/bug/sc-15034
Fixes sending webhook notifications for checkout and checkin
|
2023-04-25 22:22:58 -07:00 |
|
snipe
|
17275cbeb8
|
Merge pull request #12905 from marcusmoore/fixes/checkout-via-artisan
Fixes where clause operator in artisan checkout command
|
2023-04-25 22:21:59 -07:00 |
|
snipe
|
d6ea5de5b8
|
Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset
|
2023-04-25 22:20:50 -07:00 |
|
snipe
|
c8c6f879d4
|
Merge pull request #12912 from Godmartinz/ldap_location_sync
added ldap_location to settings
|
2023-04-25 21:54:28 -07:00 |
|
snipe
|
27477085fe
|
Merge branch 'develop' into features/auto_add_to_fieldset
|
2023-04-25 21:31:50 -07:00 |
|
snipe
|
45f22e7561
|
Updated the sync to disassociate if all boxed are unchecked
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:31:23 -07:00 |
|
snipe
|
5759d2c948
|
Added a check to fail validation if the associated fieldsets are not value
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:30:47 -07:00 |
|
snipe
|
15dc4e4779
|
Added fieldset sync
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:29:57 -07:00 |
|
snipe
|
5eeca937cb
|
Added logic for syncing fieldset info
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:08:26 -07:00 |
|
snipe
|
662b7787a1
|
Updated redirect return
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:07:50 -07:00 |
|
snipe
|
28d9cec1e3
|
Added auto_add_to_fieldsets to API response
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 20:59:48 -07:00 |
|
snipe
|
07336bbc6a
|
Added auto_add_to_fieldsets field
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 15:51:36 -07:00 |
|
Brady Wetherington
|
3da5df0127
|
Change from a standard Eloquent mapping for ID to a custom setRead
|
2023-04-25 11:50:55 -07:00 |
|
Godfrey M
|
20d8ff2a4f
|
removed a typo
|
2023-04-25 11:49:33 -07:00 |
|
Godfrey M
|
cb68f41d9c
|
added ldap_location to settings
|
2023-04-25 11:44:04 -07:00 |
|
snipe
|
66ce02fc48
|
Added permission on restore
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 08:09:16 -07:00 |
|
snipe
|
6e7f0728fd
|
Added more granular permissions on bulk actions for assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 08:06:45 -07:00 |
|
Marcus Moore
|
b4f162f316
|
Fix operator in where clause
|
2023-04-24 17:26:06 -07:00 |
|
akemidx
|
9cd2783185
|
Regex added for link instead
|
2023-04-24 20:07:21 -04:00 |
|
Marcus Moore
|
2aba8252f3
|
Ensure users editing themselves do not deactivate their account
|
2023-04-20 21:59:55 -07:00 |
|
akemidx
|
16a5a883e5
|
new request, preparing support_url for validation
|
2023-04-20 16:34:25 -04:00 |
|
Ivan Nieto Vivanco
|
747d6cfdb4
|
Change the flow of the condition using an early return
|
2023-04-20 10:37:26 -06:00 |
|
Ivan Nieto Vivanco
|
ae53609b1b
|
Declare variables only if license is found
|
2023-04-20 10:16:11 -06:00 |
|
Marcus Moore
|
dd40798c43
|
Remove unneeded comments
|
2023-04-19 17:49:31 -07:00 |
|
Marcus Moore
|
e92c1e7bea
|
Minor docblock update
|
2023-04-19 17:22:56 -07:00 |
|
Godfrey M
|
bd212b3108
|
adds component costs to asset view
|
2023-04-19 16:35:06 -07:00 |
|
Marcus Moore
|
144382e57a
|
Update docblock types
|
2023-04-19 12:31:12 -07:00 |
|
Marcus Moore
|
835f8876c4
|
Move notification sending into try catch block
|
2023-04-19 12:26:48 -07:00 |
|
Marcus Moore
|
15280c435e
|
Merge branch 'develop' into bug/sc-15034
|
2023-04-19 11:45:16 -07:00 |
|
Godfrey M
|
bdd1045272
|
adds a checkout range for custom asset reports
|
2023-04-19 09:11:44 -07:00 |
|
snipe
|
fd5cb32dd9
|
Honor the “update” flag
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 16:34:47 -07:00 |
|
snipe
|
345662c5c2
|
Rearrange some of the user creation logic
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 16:34:10 -07:00 |
|
snipe
|
aedfef78d3
|
Update app/Importer/LocationImporter.php
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
|
2023-04-18 13:26:23 -07:00 |
|
Marcus Moore
|
508660b1df
|
Skip notifications for component checkouts and checkins
|
2023-04-18 13:07:55 -07:00 |
|
snipe
|
3a808aa806
|
Updated method for available seat count
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:44:33 -07:00 |
|
snipe
|
41490f1e3a
|
Use “name” instead of “license” for consistency
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:43:59 -07:00 |
|
snipe
|
9da36833be
|
Removed unused method
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:43:44 -07:00 |
|
snipe
|
dc6eb6f104
|
Throw a warning if there were no users affected
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:07:17 -07:00 |
|
snipe
|
a8a3ca3624
|
Use count on availSeats
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:06:42 -07:00 |
|
snipe
|
e84ba0c7a0
|
Revert back to old method name
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:06:32 -07:00 |
|
snipe
|
f21d9c27e6
|
Use new translations for logs
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 01:07:26 -07:00 |
|
snipe
|
bfcbd9628a
|
Refactored license controller with new counts
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 01:02:58 -07:00 |
|
snipe
|
de78f8d41f
|
Renamed/refactorered licenses method
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 01:01:44 -07:00 |
|
snipe
|
6ab4314221
|
Removed unused method
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 01:01:13 -07:00 |
|
snipe
|
087f0e596a
|
Fixed has to where
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 22:44:05 -07:00 |
|
Marcus Moore
|
2d56675ade
|
Merge branch 'develop' into bug/sc-15034
# Conflicts:
# database/factories/SettingFactory.php
|
2023-04-17 17:22:55 -07:00 |
|