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
|
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 |
|
|
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 |
|