Marcus Moore
|
b2b6f0cf96
|
Use new dynamic scope where possible
|
2023-05-23 13:38:50 -07:00 |
|
|
Marcus Moore
|
2d86c8f030
|
Update advancedTextSearch methods in Asset and User models
|
2023-05-18 17:06:41 -07:00 |
|
|
Marcus Moore
|
85974c7f65
|
Apply formatting
|
2023-05-18 13:16:52 -07:00 |
|
|
Marcus Moore
|
d8d672c4c1
|
Move multiple column search function to Searchable trait
|
2023-05-18 13:05:40 -07:00 |
|
|
Marcus Moore
|
9cb0decf35
|
Adapt multiple column search based on database driver
|
2023-05-18 12:54:00 -07:00 |
|
snipe
|
f1d85c67f1
|
Make validation match database fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 14:12:54 -07:00 |
|
|
Marcus Moore
|
15280c435e
|
Merge branch 'develop' into bug/sc-15034
|
2023-04-19 11:45:16 -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 |
|
|
snipe
|
99cecee4b5
|
Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui
|
2023-04-17 14:54:30 -07:00 |
|
|
snipe
|
e0c53d8d09
|
Remove start/end dates form casts array
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 09:33:31 -07:00 |
|
|
snipe
|
6acce098c9
|
Added autoassign_licenses on user model
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 15:24:56 -07:00 |
|
|
Marcus Moore
|
6df8f0f35c
|
Merge branch 'develop' into bug/sc-15034
|
2023-04-05 11:49:53 -07:00 |
|
slong753
|
e126a75f7a
|
pretty sure this was it
|
2023-03-29 21:37:26 -05:00 |
|
|
Marcus Moore
|
2dcf4e3d16
|
Standardize on sending anonymous notifications for asset checkouts
|
2023-03-23 16:31:40 -07:00 |
|
|
Marcus Moore
|
fe6295a5e4
|
Update slack_* properties to webhook_*
|
2023-03-22 14:43:00 -07:00 |
|
Ivan Nieto Vivanco
|
ad598425ef
|
Adds format to the dates cast
|
2023-02-28 17:24:14 -06:00 |
|
|
snipe
|
8e72da42e8
|
Merge pull request #12406 from akemidx/vip_tag
Added a checkbox to notate VIP status
|
2023-02-23 12:23:29 -08:00 |
|
|
snipe
|
81cb29db5e
|
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report
Added images to emailed user inventory report [sc-19801]
|
2023-02-22 10:38:07 -08:00 |
|
|
snipe
|
0c3115553e
|
Merge branch 'develop' into vip_tag
|
2023-02-21 20:03:49 -08:00 |
|
|
Ivan Nieto Vivanco
|
d494afcf01
|
Add order by clause, to ensure assets and accessories are in order in the report
|
2023-02-21 21:24:19 -06:00 |
|
|
snipe
|
de4f7bd274
|
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation
Enforce Y-m-d as date format for date fields
|
2023-02-15 12:54:22 -08:00 |
|
|
snipe
|
d52d32fed9
|
Fixed visibility for constants and methods
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-06 12:44:02 -08:00 |
|
|
snipe
|
2da4578aa5
|
Merge branch 'develop' into slack_message
|
2023-02-01 13:43:09 -08:00 |
|
akemidx
|
90c1bfe03d
|
fixing pr
|
2023-02-01 16:12:39 -05:00 |
|
|
akemidx
|
4e5b8fa213
|
fixing pr
|
2023-02-01 16:05:50 -05:00 |
|
|
akemidx
|
df31a76906
|
fixed apostraphe
|
2023-01-26 15:02:39 -05:00 |
|
|
akemidx
|
53d8008a5f
|
Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag
|
2023-01-25 17:14:29 -05:00 |
|
|
akemidx
|
b363524305
|
vipuser label updated to vip
|
2023-01-25 15:58:44 -05:00 |
|
|
snipe
|
4c3354b778
|
Merge branch 'develop' into vip_tag
|
2023-01-24 20:29:43 -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 |
|
|
snipe
|
48c85966d7
|
Added gravatar and avatar as fillable
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 18:07:17 -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 |
|
|
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 |
|
Brady Wetherington
|
4e5c878b73
|
Needed to fix the way we write externalId from SCIM
|
2022-10-31 19:15:08 -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 |
|
|
snipe
|
acd666fdf5
|
Added notes to user consumables tab
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:34: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
|
deb2d958d8
|
Sets maxlength of user fields to 191
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 04:54:12 -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 |
|
|
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
|
20e65804ef
|
Removed comment
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-22 18:12:08 +00:00 |
|
|
snipe
|
43c1949092
|
Add remote option to user
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 05:35:26 -08:00 |
|